General cleanup. The biggest change is to only install the core C

development kit ant not the (now out-of-date) other language bindings.

PR:		19168
Submitted by:	maintainer

4 files changed, 80 insertions, 203 deletions

diff --git a/www/fcgi/Makefile b/www/fcgi/Makefile
index 92b8b2278479..5b8c6abfb73d 100644
--- a/www/fcgi/Makefile
+++ b/www/fcgi/Makefile
@@ -8,18 +8,28 @@
 PORTNAME=	fcgi-devkit
 PORTVERSION= 	2.1
 CATEGORIES=	www
-MASTER_SITES=	http://fastcgi.idle.com/dist/
+MASTER_SITES=	http://www.fastcgi.com/dist/
 
 MAINTAINER=	kbyanc@posi.net
 
 MAN1=		cgi-fcgi.1
-MAN3=		FCGI_Accept.3 FCGI_Finish.3 FCGI_SetExitStatus.3 FCGI_StartFilterData.3
+MAN3=		FCGI_Accept.3 FCGI_Finish.3 FCGI_SetExitStatus.3 \
+		FCGI_StartFilterData.3
 
 USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
+.if !defined(NOPORTDOCS)
 post-install:
-	@${RM} -f ${PREFIX}/fcgi-devkit/libfcgi/os_unix.c.orig \
-	       ${PREFIX}/fcgi-devkit/Makefile.in.orig
+	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+.for i in fastcgi-prog-guide fastcgi-whitepaper
+	    ${MKDIR} ${PREFIX}/share/doc/${PORTNAME}/$i
+	    cd ${WRKSRC}/doc/$i && \
+                ${INSTALL_DATA} * ${PREFIX}/share/doc/${PORTNAME}/$i
+	    @if [ -f ${PREFIX}/share/doc/${PORTNAME}/$i/Makefile ]; then \
+		${RM} ${PREFIX}/share/doc/${PORTNAME}/$i/Makefile; \
+	    fi
+.endfor
+.endif
 
 .include <bsd.port.mk>
diff --git a/www/fcgi/files/patch-aa b/www/fcgi/files/patch-aa
index d994c745057a..c091e0a15447 100644
--- a/www/fcgi/files/patch-aa
+++ b/www/fcgi/files/patch-aa
@@ -1,36 +1,45 @@
-*** Makefile.in.orig	Thu May 13 17:22:24 1999
---- Makefile.in	Thu May 13 17:31:56 1999
-***************
-*** 14,20 ****
-  prefix        = @prefix@
-  common_prefix = @common_prefix@
-  CVS_TAG =       @CVS_TAG@
-! EXPORT_DIR = $(prefix)/build
-  PROTO_DIR = ../proto
-  BIN_DIR       = $(exec_prefix)/bin
-  LIB_DIR       = $(prefix)/lib
---- 14,20 ----
-  prefix        = @prefix@
-  common_prefix = @common_prefix@
-  CVS_TAG =       @CVS_TAG@
-! EXPORT_DIR = $(prefix)/fcgi-devkit
-  PROTO_DIR = ../proto
-  BIN_DIR       = $(exec_prefix)/bin
-  LIB_DIR       = $(prefix)/lib
-***************
-*** 41,47 ****
-  	(cd cgi-fcgi; make all)
-  	(cd examples; make all)
-  
-! export:
-  	@ for i in $(TARGET_DIRS); \
-  	  do \
-  	  if test ! -d $$i; then \
---- 41,47 ----
-  	(cd cgi-fcgi; make all)
-  	(cd examples; make all)
-  
-! install: all
-  	@ for i in $(TARGET_DIRS); \
-  	  do \
-  	  if test ! -d $$i; then \
+--- Makefile.in.orig	Tue Sep 16 08:36:24 1997
++++ Makefile.in	Sun May 28 17:48:01 2000
+@@ -14,8 +14,7 @@
+ prefix        = @prefix@
+ common_prefix = @common_prefix@
+ CVS_TAG =       @CVS_TAG@
+-EXPORT_DIR = $(prefix)/build
+-PROTO_DIR = ../proto
++EXPORT_DIR = $(prefix)/fcgi-devkit
+ BIN_DIR       = $(exec_prefix)/bin
+ LIB_DIR       = $(prefix)/lib
+ LINC_DIR      = $(prefix)/include
+@@ -39,9 +38,8 @@
+ all:
+ 	(cd libfcgi; make all)
+ 	(cd cgi-fcgi; make all)
+-	(cd examples; make all)
+ 
+-export:
++install: all
+ 	@ for i in $(TARGET_DIRS); \
+ 	  do \
+ 	  if test ! -d $$i; then \
+@@ -64,14 +62,6 @@
+ 	$(INSTALL_DATA)    doc/FCGI_Finish.3 $(MAN3_DIR)
+ 	$(INSTALL_DATA)    doc/FCGI_SetExitStatus.3 $(MAN3_DIR)
+ 	$(INSTALL_DATA)    doc/FCGI_StartFilterData.3 $(MAN3_DIR)
+-	rm -rf $(PROTO_DIR)
+-	for i in $(LINKS); do  if  test ! -r $$i; then rm -f $$i; fi; done; 
+-	cp -R . $(PROTO_DIR) 
+-	(cd $(PROTO_DIR); make clean)
+-	find $(PROTO_DIR) -name CVS -exec rm -rf {} \;
+-	rm -rf $(EXPORT_DIR)
+-	cp -R $(PROTO_DIR) $(EXPORT_DIR)
+-	rm -rf $(PROTO_DIR)
+ 
+ reconfig: clean
+ 	uname -rs >config.uname
+@@ -83,6 +73,5 @@
+ 	rm -f config.cache config.log config.status config.uname
+ 	(cd libfcgi; make clean)
+ 	(cd cgi-fcgi; make clean)
+-	(cd examples; make clean)
+ 
+ # ----------------------------------------------------------------------------
diff --git a/www/fcgi/pkg-descr b/www/fcgi/pkg-descr
index dba8a572eb01..63bbb8fc9489 100644
--- a/www/fcgi/pkg-descr
+++ b/www/fcgi/pkg-descr
@@ -19,6 +19,7 @@ See http://www.fastcgi.com/ for more information about the benefits of
 FastCGI, for developer documentation, and for the Apache FastCGI module (to
 enable FastCGI support for the popular Apache web server).
 
-- Kelly
-	kbyanc@posi.net
 WWW: http://www.fastcgi.com/
+
+  -Kelly
+   kbyanc@posi.net
diff --git a/www/fcgi/pkg-plist b/www/fcgi/pkg-plist
index d5954fce4698..c6f5b98e0717 100644
--- a/www/fcgi/pkg-plist
+++ b/www/fcgi/pkg-plist
@@ -1,146 +1,4 @@
 bin/cgi-fcgi
-fcgi-devkit/FastCGI.mak
-fcgi-devkit/FastCGI.mak.in
-fcgi-devkit/FastCGI.mb
-fcgi-devkit/LICENSE.TERMS
-fcgi-devkit/Makefile
-fcgi-devkit/Makefile.in
-fcgi-devkit/Perl/ChangeLog
-fcgi-devkit/Perl/FCGI.PL
-fcgi-devkit/Perl/FCGI.pm
-fcgi-devkit/Perl/Makefile.PL
-fcgi-devkit/Perl/README
-fcgi-devkit/Perl/configure
-fcgi-devkit/Perl/configure.in
-fcgi-devkit/Perl/configure.readme
-fcgi-devkit/Perl/echo.PL
-fcgi-devkit/Perl/typemap
-fcgi-devkit/README
-fcgi-devkit/README_NT.txt
-fcgi-devkit/acconfig.h
-fcgi-devkit/build.bat
-fcgi-devkit/build_no_shell.bat
-fcgi-devkit/cgi-fcgi/Makefile
-fcgi-devkit/cgi-fcgi/Makefile.in
-fcgi-devkit/cgi-fcgi/cgi-fcgi.c
-fcgi-devkit/cgi-fcgi/cgi-fcgi.mak
-fcgi-devkit/cgi-fcgi/cgi-fcgi.mak.in
-fcgi-devkit/cgi-fcgi/cgi-fcgi.mdp
-fcgi-devkit/cgi-fcgi/descrip.dfc
-fcgi-devkit/configure
-fcgi-devkit/configure.in
-fcgi-devkit/dependencies.in
-fcgi-devkit/descrip.dfc
-fcgi-devkit/doc/FCGI_Accept.3
-fcgi-devkit/doc/FCGI_Finish.3
-fcgi-devkit/doc/FCGI_SetExitStatus.3
-fcgi-devkit/doc/FCGI_StartFilterData.3
-fcgi-devkit/doc/Makefile
-fcgi-devkit/doc/cgi-fcgi.1
-fcgi-devkit/doc/fastcgi-prog-guide/ap_guida.htm
-fcgi-devkit/doc/fastcgi-prog-guide/ap_guide.htm
-fcgi-devkit/doc/fastcgi-prog-guide/apaman.htm
-fcgi-devkit/doc/fastcgi-prog-guide/ch1inta1.gif
-fcgi-devkit/doc/fastcgi-prog-guide/ch1intra.gif
-fcgi-devkit/doc/fastcgi-prog-guide/ch1intro.htm
-fcgi-devkit/doc/fastcgi-prog-guide/ch2c.htm
-fcgi-devkit/doc/fastcgi-prog-guide/ch3perl.htm
-fcgi-devkit/doc/fastcgi-prog-guide/ch4tcl.htm
-fcgi-devkit/doc/fastcgi-prog-guide/cover.htm
-fcgi-devkit/doc/fastcgi-prog-guide/covera.gif
-fcgi-devkit/doc/fastcgi-whitepaper/Makefile
-fcgi-devkit/doc/fastcgi-whitepaper/fastcgi.htm
-fcgi-devkit/doc/fastcgi-whitepaper/img00001.gif
-fcgi-devkit/doc/fastcgi-whitepaper/img00002.gif
-fcgi-devkit/doc/fastcgi-whitepaper/img00003.gif
-fcgi-devkit/doc/fcgi-devel-kit.htm
-fcgi-devkit/doc/fcgi-java.htm
-fcgi-devkit/doc/fcgi-perf.htm
-fcgi-devkit/doc/fcgi-perl.htm
-fcgi-devkit/doc/fcgi-spec.html
-fcgi-devkit/doc/fcgi-tcl.htm
-fcgi-devkit/doc/omi-logo.gif
-fcgi-devkit/doc/www5-api-workshop.html
-fcgi-devkit/examples/Makefile
-fcgi-devkit/examples/Makefile.in
-fcgi-devkit/examples/SampleStore/Images/cart-hd.gif
-fcgi-devkit/examples/SampleStore/Images/main-hd.gif
-fcgi-devkit/examples/SampleStore/Images/offer-hd.gif
-fcgi-devkit/examples/SampleStore/Images/purch-hd.gif
-fcgi-devkit/examples/SampleStore/Images/thank-hd.gif
-fcgi-devkit/examples/SampleStore/Protected/RMSTitanic.html
-fcgi-devkit/examples/SampleStore/Unprotected/Purchase.html
-fcgi-devkit/examples/SampleStore/Unprotected/ThankYou.html
-fcgi-devkit/examples/conf/om-httpd.config
-fcgi-devkit/examples/echo-perl
-fcgi-devkit/examples/echo-tcl
-fcgi-devkit/examples/echo.c
-fcgi-devkit/examples/echo.cgi
-fcgi-devkit/examples/echo.html
-fcgi-devkit/examples/echo.mak
-fcgi-devkit/examples/echo2.c
-fcgi-devkit/examples/echo2.html
-fcgi-devkit/examples/echo2.mak
-fcgi-devkit/examples/echo2_nt.fcgi
-fcgi-devkit/examples/echo_nt.fcgi
-fcgi-devkit/examples/log-dump.c
-fcgi-devkit/examples/sample-store.c
-fcgi-devkit/examples/tclHash.c
-fcgi-devkit/examples/tiny-authorizer.c
-fcgi-devkit/examples/tiny-cgi.c
-fcgi-devkit/examples/tiny-fcgi.c
-fcgi-devkit/examples/tiny-fcgi.cgi
-fcgi-devkit/examples/tiny-fcgi.mak
-fcgi-devkit/examples/tiny-fcgi2.c
-fcgi-devkit/examples/tiny-fcgi2.cgi
-fcgi-devkit/examples/tiny-fcgi2.mak
-fcgi-devkit/examples/tiny-fcgi2_nt.fcgi
-fcgi-devkit/examples/tiny-fcgi_nt.fcgi
-fcgi-devkit/examples/tiny-perl-fcgi
-fcgi-devkit/examples/tiny-tcl-fcgi
-fcgi-devkit/images/aplib-hd.gif
-fcgi-devkit/images/divider.gif
-fcgi-devkit/images/fcgi-hd.gif
-fcgi-devkit/images/mail-hd.gif
-fcgi-devkit/images/navbar.gif
-fcgi-devkit/images/serv-hd.gif
-fcgi-devkit/images/words-hd.gif
-fcgi-devkit/include/fastcgi.h
-fcgi-devkit/include/fcgi_config.h
-fcgi-devkit/include/fcgi_config.h.in
-fcgi-devkit/include/fcgi_config_x86.h
-fcgi-devkit/include/fcgi_stdio.h
-fcgi-devkit/include/fcgiapp.h
-fcgi-devkit/include/fcgiappmisc.h
-fcgi-devkit/include/fcgimisc.h
-fcgi-devkit/include/fcgios.h
-fcgi-devkit/include/tcl.h
-fcgi-devkit/include/tclInt.h
-fcgi-devkit/include/tclRegexp.h
-fcgi-devkit/index.html
-fcgi-devkit/install.sh
-fcgi-devkit/java/FCGIGlobalDefs.java
-fcgi-devkit/java/FCGIInputStream.java
-fcgi-devkit/java/FCGIInterface.java
-fcgi-devkit/java/FCGIMessage.java
-fcgi-devkit/java/FCGIOutputStream.java
-fcgi-devkit/java/FCGIRequest.java
-fcgi-devkit/libfcgi/Makefile
-fcgi-devkit/libfcgi/Makefile.in
-fcgi-devkit/libfcgi/descrip.dfc
-fcgi-devkit/libfcgi/fcgi_stdio.c
-fcgi-devkit/libfcgi/fcgiapp.c
-fcgi-devkit/libfcgi/libfcgi.mak
-fcgi-devkit/libfcgi/libfcgi.mak.in
-fcgi-devkit/libfcgi/os_unix.c
-fcgi-devkit/libfcgi/os_win32.c
-fcgi-devkit/libfcgi/strerror.c
-fcgi-devkit/tcl/common/tclAppInit.c
-fcgi-devkit/tcl/common/tclFCGI.c
-fcgi-devkit/tcl/tcl7.4/Makefile.in
-fcgi-devkit/tcl/tcl7.4/configure.in
-fcgi-devkit/version.conf
-fcgi-devkit/version.in
 include/fastcgi.h
 include/fcgi_config.h
 include/fcgi_stdio.h
@@ -148,22 +6,21 @@ include/fcgiapp.h
 include/fcgiappmisc.h
 include/fcgimisc.h
 lib/libfcgi.a
-@dirrm fcgi-devkit/Perl
-@dirrm fcgi-devkit/cgi-fcgi
-@dirrm fcgi-devkit/doc/fastcgi-prog-guide
-@dirrm fcgi-devkit/doc/fastcgi-whitepaper
-@dirrm fcgi-devkit/doc
-@dirrm fcgi-devkit/examples/SampleStore/Images
-@dirrm fcgi-devkit/examples/SampleStore/Protected
-@dirrm fcgi-devkit/examples/SampleStore/Unprotected
-@dirrm fcgi-devkit/examples/SampleStore
-@dirrm fcgi-devkit/examples/conf
-@dirrm fcgi-devkit/examples
-@dirrm fcgi-devkit/images
-@dirrm fcgi-devkit/include
-@dirrm fcgi-devkit/java
-@dirrm fcgi-devkit/libfcgi
-@dirrm fcgi-devkit/tcl/common
-@dirrm fcgi-devkit/tcl/tcl7.4
-@dirrm fcgi-devkit/tcl
-@dirrm fcgi-devkit
+share/doc/fcgi-devkit/fastcgi-prog-guide/ap_guida.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/ap_guide.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/apaman.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/ch1inta1.gif
+share/doc/fcgi-devkit/fastcgi-prog-guide/ch1intra.gif
+share/doc/fcgi-devkit/fastcgi-prog-guide/ch1intro.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/ch2c.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/ch3perl.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/ch4tcl.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/cover.htm
+share/doc/fcgi-devkit/fastcgi-prog-guide/covera.gif
+share/doc/fcgi-devkit/fastcgi-whitepaper/fastcgi.htm
+share/doc/fcgi-devkit/fastcgi-whitepaper/img00001.gif
+share/doc/fcgi-devkit/fastcgi-whitepaper/img00002.gif
+share/doc/fcgi-devkit/fastcgi-whitepaper/img00003.gif
+@dirrm share/doc/fcgi-devkit/fastcgi-prog-guide
+@dirrm share/doc/fcgi-devkit/fastcgi-whitepaper
+@dirrm share/doc/fcgi-devkit