- Modify lighttpd to use www/spawn-fcgi port.

- Bump PORTREVISION

PR:		133707
Submitted by:	Aragon Gouveia <aragon___phat.za.net>

4 files changed, 84 insertions, 2 deletions

diff --git a/www/lighttpd/Makefile b/www/lighttpd/Makefile
index e7b8153d722b..60f264eb0ef6 100644
--- a/www/lighttpd/Makefile
+++ b/www/lighttpd/Makefile
@@ -7,6 +7,7 @@
 
 PORTNAME=	lighttpd
 PORTVERSION=	1.4.22
+PORTREVISION=	1
 CATEGORIES=	www
 MASTER_SITES=	http://www.lighttpd.net/download/ \
 		http://mirrors.cat.pdx.edu/lighttpd/
@@ -26,7 +27,7 @@ CONFIGURE_ARGS=	--libdir=${PREFIX}/lib/lighttpd
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-MAN1=		lighttpd.1 spawn-fcgi.1
+MAN1=		lighttpd.1
 
 OPTIONS=	BZIP2		"Enable Bzip2 support" off \
 		CML		"Enable Cache Meta Language support" off \
@@ -38,6 +39,7 @@ OPTIONS=	BZIP2		"Enable Bzip2 support" off \
 		MYSQL		"Enable MYSQL support" off \
 		OPENLDAP	"Enable LDAP support" off \
 		OPENSSL		"Enable SSL support" on \
+		SPAWNFCGI	"Enable spawn-fcgi utility" on \
 		VALGRIND	"Enable valgrind support" off \
 		WEBDAV		"Enable WebDAV support"	off
 
@@ -101,6 +103,10 @@ CONFIGURE_ARGS+=	--with-ldap
 _REQUIRE+=		slapd
 .endif
 
+.if defined(WITH_SPAWNFCGI)
+RUN_DEPENDS+=		spawn-fcgi:${PORTSDIR}/www/spawn-fcgi
+.endif
+
 .if defined(WITH_VALGRIND)
 BUILD_DEPENDS+=		valgrind:${PORTSDIR}/devel/valgrind
 RUN_DEPENDS+=		valgrind:${PORTSDIR}/devel/valgrind
diff --git a/www/lighttpd/files/patch-doc_Makefile.in b/www/lighttpd/files/patch-doc_Makefile.in
new file mode 100644
index 000000000000..be2c9bf1296c
--- /dev/null
+++ b/www/lighttpd/files/patch-doc_Makefile.in
@@ -0,0 +1,11 @@
+--- doc/Makefile.in.orig	2009-04-25 00:55:41.000000000 -0300
++++ doc/Makefile.in	2009-04-25 00:56:00.000000000 -0300
+@@ -189,7 +189,7 @@
+ target_vendor = @target_vendor@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-dist_man1_MANS = lighttpd.1 spawn-fcgi.1
++dist_man1_MANS = lighttpd.1
+ DOCS = accesslog.txt \
+ authentication.txt \
+ cgi.txt \
diff --git a/www/lighttpd/files/patch-src_Makefile.in b/www/lighttpd/files/patch-src_Makefile.in
new file mode 100644
index 000000000000..0a57a603c783
--- /dev/null
+++ b/www/lighttpd/files/patch-src_Makefile.in
@@ -0,0 +1,66 @@
+--- src/Makefile.in.orig	2009-04-25 00:52:47.000000000 -0300
++++ src/Makefile.in	2009-04-25 00:54:11.000000000 -0300
+@@ -37,7 +37,6 @@
+ target_triplet = @target@
+ noinst_PROGRAMS = proc_open$(EXEEXT) lemon$(EXEEXT)
+ sbin_PROGRAMS = lighttpd$(EXEEXT) lighttpd-angel$(EXEEXT)
+-bin_PROGRAMS = spawn-fcgi$(EXEEXT)
+ 
+ # if the linker doesn't allow referencing symbols of the binary
+ # we have to put everything into a shared-lib and link it into
+@@ -380,9 +379,6 @@
+ 	proc_open-buffer.$(OBJEXT)
+ proc_open_OBJECTS = $(am_proc_open_OBJECTS)
+ proc_open_LDADD = $(LDADD)
+-am_spawn_fcgi_OBJECTS = spawn-fcgi.$(OBJEXT)
+-spawn_fcgi_OBJECTS = $(am_spawn_fcgi_OBJECTS)
+-spawn_fcgi_LDADD = $(LDADD)
+ DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+@@ -412,8 +408,7 @@
+ 	$(mod_status_la_SOURCES) $(mod_trigger_b4_dl_la_SOURCES) \
+ 	$(mod_userdir_la_SOURCES) $(mod_usertrack_la_SOURCES) \
+ 	$(mod_webdav_la_SOURCES) $(lemon_SOURCES) $(lighttpd_SOURCES) \
+-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+-	$(spawn_fcgi_SOURCES)
++	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+ DIST_SOURCES = $(am__liblightcomp_la_SOURCES_DIST) \
+ 	$(mod_access_la_SOURCES) $(mod_accesslog_la_SOURCES) \
+ 	$(mod_alias_la_SOURCES) $(mod_auth_la_SOURCES) \
+@@ -432,8 +427,7 @@
+ 	$(mod_trigger_b4_dl_la_SOURCES) $(mod_userdir_la_SOURCES) \
+ 	$(mod_usertrack_la_SOURCES) $(mod_webdav_la_SOURCES) \
+ 	$(lemon_SOURCES) $(am__lighttpd_SOURCES_DIST) \
+-	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES) \
+-	$(spawn_fcgi_SOURCES)
++	$(lighttpd_angel_SOURCES) $(proc_open_SOURCES)
+ HEADERS = $(noinst_HEADERS)
+ ETAGS = etags
+ CTAGS = ctags
+@@ -605,7 +599,6 @@
+ 
+ src = server.c response.c connections.c network.c configfile.c \
+ 	configparser.c request.c proc_open.c $(am__append_2)
+-spawn_fcgi_SOURCES = spawn-fcgi.c
+ 
+ #lib_LTLIBRARIES += mod_httptls.la
+ #mod_httptls_la_SOURCES = mod_httptls.c
+@@ -963,9 +956,6 @@
+ proc_open$(EXEEXT): $(proc_open_OBJECTS) $(proc_open_DEPENDENCIES) 
+ 	@rm -f proc_open$(EXEEXT)
+ 	$(LINK) $(proc_open_OBJECTS) $(proc_open_LDADD) $(LIBS)
+-spawn-fcgi$(EXEEXT): $(spawn_fcgi_OBJECTS) $(spawn_fcgi_DEPENDENCIES) 
+-	@rm -f spawn-fcgi$(EXEEXT)
+-	$(LINK) $(spawn_fcgi_OBJECTS) $(spawn_fcgi_LDADD) $(LIBS)
+ 
+ mostlyclean-compile:
+ 	-rm -f *.$(OBJEXT)
+@@ -1098,7 +1088,6 @@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/request.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/response.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/server.Po@am__quote@
+-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/spawn-fcgi.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/splaytree.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/stat_cache.Po@am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/status_counter.Po@am__quote@
diff --git a/www/lighttpd/pkg-plist b/www/lighttpd/pkg-plist
index c6be65aceebc..4964d3b4810d 100644
--- a/www/lighttpd/pkg-plist
+++ b/www/lighttpd/pkg-plist
@@ -1,5 +1,4 @@
 @comment $FreeBSD$
-bin/spawn-fcgi
 @unexec if cmp -s %D/etc/lighttpd.conf %D/etc/lighttpd.conf.sample; then rm -f %D/etc/lighttpd.conf; fi
 etc/lighttpd.conf.sample
 @exec [ -f %B/lighttpd.conf ] || cp %B/%f %B/lighttpd.conf