6 files changed, 39 insertions, 31 deletions

diff --git a/www/cgiwrap/Makefile b/www/cgiwrap/Makefile
index 79a4c4725833..14d04fa4f9be 100644
--- a/www/cgiwrap/Makefile
+++ b/www/cgiwrap/Makefile
@@ -6,54 +6,55 @@
 #
 
 PORTNAME=	cgiwrap
-PORTVERSION=	3.6.3
-CATEGORIES=	www
-MASTER_SITES=	http://www.unixtools.org/cgiwrap/dist/ \
-		ftp://ftp.umr.edu/pub/cgi/cgiwrap/ \
-		ftp://concert.cert.dfn.de/pub/tools/net/cgiwrap/
+PORTVERSION=	3.6.4
+CATEGORIES=	www security
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	petef@databits.net
 
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	${HTTPDUSER} ${WITHOUTCHECK} --with-install-dir=${INSTALLDIR} \
-		--with-install-group=${BINGRP} --with-cgi-dir=${CGIDIR}
+CONFIGURE_ARGS=	--with-httpd-user=${HTTPDUSER} \
+		--with-install-dir=${MAINCGIDIR} \
+		--with-install-group=${BINGRP} \
+		--with-cgi-dir=${CGIDIR} \
+		${WITHOUTCHECK}
 
 ###
 # Set this to the directory (relative to each user's home) where CGI
 # scripts will be found.  (Another common value is "www/cgi-bin".)
 ###
-CGIDIR=		public_html/cgi-bin
-
+CGIDIR?=		public_html/cgi-bin
 ###
 # The default security settings are very tight; enable one or more
 # of these to loosen them.  Run "configure -help" for information on
 # these and other options.
 ###
-#WITHOUTCHECK=	--without-check-owner --without-check-setuid \
+#WITHOUTCHECK?=	--without-check-owner --without-check-setuid \
 #		--without-check-group --without-check-setgid \
 #		--without-check-group-writable \
 #		--without-check-world-writable
-
 ###
 # Use these options for Apache:
 ###
-INSTALLDIR=	${PREFIX}/share/apache/cgi-bin
-HTTPDUSER=	--with-httpd-user=nobody
+MAINCGIDIR?=	${PREFIX}/www/cgi-bin
+HTTPDUSER?=	nobody
 
 pre-install:
-	${MKDIR} ${INSTALLDIR}
+	@${MKDIR} ${MAINCGIDIR}
 
 post-install:
-	strip ${INSTALLDIR}/cgiwrap
+	strip ${MAINCGIDIR}/cgiwrap
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/cgiwrap
+	@${MKDIR} ${PREFIX}/share/doc/cgiwrap
 .for file in accesscontrol.html afs.html changes.html comments.html \
 		download.html faq.html index.html install.html intro.html \
 		maillist.html notes.html pubs.html quickref.html setup.html \
 		thanks.html todo.html tricks.html y2k.html
-	@${INSTALL_MAN} ${WRKSRC}/htdocs/${file} ${PREFIX}/share/doc/cgiwrap
+	@${INSTALL_DATA} ${WRKSRC}/htdocs/${file} ${PREFIX}/share/doc/cgiwrap
 .endfor
 	@${ECHO} "Documentation installed in ${PREFIX}/share/doc/cgiwrap"
 .endif
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/cgiwrap/distinfo b/www/cgiwrap/distinfo
index 1d596590c839..92093ef6dc7d 100644
--- a/www/cgiwrap/distinfo
+++ b/www/cgiwrap/distinfo
@@ -1 +1 @@
-MD5 (cgiwrap-3.6.3.tar.gz) = 583179e252608967bc5e83a17d3bd1d2
+MD5 (cgiwrap-3.6.4.tar.gz) = 10e5a74a3a32ca8c032a0a5bbd147c56
diff --git a/www/cgiwrap/pkg-comment b/www/cgiwrap/pkg-comment
index e7edafa7b7ec..551e3aed84fd 100644
--- a/www/cgiwrap/pkg-comment
+++ b/www/cgiwrap/pkg-comment
@@ -1 +1 @@
-Make certain that CGI scripts run with the user's permissions
+Securely execute ~user CGI scripts
diff --git a/www/cgiwrap/pkg-descr b/www/cgiwrap/pkg-descr
index a14e5a79591b..0f90507c89de 100644
--- a/www/cgiwrap/pkg-descr
+++ b/www/cgiwrap/pkg-descr
@@ -8,11 +8,7 @@ CGIWrap works with NCSA httpd, Apache, CERN httpd, NetSite Commerce
 and Communications servers, and probably any other Unix based web
 server software that supports CGI.
 
-CGIWrap was written by Nathan Neulinger <nneul@umr.edu>.  More
-information is available at the website
+WWW: http://cgiwrap.unixtools.org/
 
-WWW: http://wwwcgi.umr.edu/~cgiwrap
-
-Port to FreeBSD by
-Brent J. Nordquist <bjn@visi.com>
-Thu Jul 30 1998
+- Pete
+petef@databits.net
diff --git a/www/cgiwrap/pkg-message b/www/cgiwrap/pkg-message
new file mode 100644
index 000000000000..0d03ca526678
--- /dev/null
+++ b/www/cgiwrap/pkg-message
@@ -0,0 +1,11 @@
+-----------------------------------------------------------------
+You have installed cgiwrap, a wrapper to securely execute user
+CGI programs.  cgiwrap is reported to work with most web servers
+that support CGI, so no one specific server has been included as
+a depend.  If you are unsure of which webserver to use, it is
+recommended to try the Apache web server package.
+
+The cgiwrap scripts have been installed in:
+    ${PREFIX}/www/cgi-bin
+...the default location for Apache's cgi-bin directory.
+-----------------------------------------------------------------
diff --git a/www/cgiwrap/pkg-plist b/www/cgiwrap/pkg-plist
index 7d224e6b764a..1438d8bdc04d 100644
--- a/www/cgiwrap/pkg-plist
+++ b/www/cgiwrap/pkg-plist
@@ -16,8 +16,8 @@
 %%PORTDOCS%%share/doc/cgiwrap/todo.html
 %%PORTDOCS%%share/doc/cgiwrap/tricks.html
 %%PORTDOCS%%share/doc/cgiwrap/y2k.html
+www/cgi-bin/cgiwrap
+www/cgi-bin/cgiwrapd
+www/cgi-bin/nph-cgiwrap
+www/cgi-bin/nph-cgiwrapd
 %%PORTDOCS%%@dirrm share/doc/cgiwrap
-share/apache/cgi-bin/cgiwrap
-share/apache/cgi-bin/cgiwrapd
-share/apache/cgi-bin/nph-cgiwrap
-share/apache/cgi-bin/nph-cgiwrapd