Mostly minor changes.

Changes:
  - get to install README
  - change the maintainter

And because Apache isn't the only web server and the configurations may vary;
  - stop trying to check if any web server is installed
  - allow a user to specify a cgi-bin directory to install
  - stop using icons that Apache installs by default
  - rename the script from cvsweb to cvsweb.cgi

Approved by:	sada

10 files changed, 92 insertions, 64 deletions

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index e23ebd873ac4..fc729a06fd4d 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -10,28 +10,38 @@ DISTNAME=	cvsweb-1.0
 CATEGORIES=	devel www
 MASTER_SITES=	http://people.FreeBSD.org/~fenner/cvsweb/
 
-MAINTAINER=	sada@FreeBSD.org
+MAINTAINER=	knu@idaemons.org
 
 NO_BUILD=	yes
 
-# could be overridden.
-CVSROOT?=	'/home/ncvs'
-CVSWEB_CVSROOT?= ${CVSROOT}
-CVSWEB_TITLE?=	'My CVS Tree'
-.if defined(PACKAGE_BUILDING)
-CVSWEB_CVSROOT=	/home/ncvs
+# Specify where your repository belongs.
+# (You can reconfigure it after installation anyway)
+.if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT)
+CVSROOT=	/home/ncvs
 .endif
 
+# Specify the title of your cvsweb site.
+TITLE?=		My CVS Repository
+
+# Specify the cgi-bin directory in relative paths to ${PREFIX}.
+CGIDIR?=	share/apache/cgi-bin
+
+PLIST_SUB=	CGIDIR="${CGIDIR}"
+
 do-configure:
-	@${SED} -e "s;@@CVSROOT@@;${CVSWEB_CVSROOT};g" \
-		-e "s;@@TITLE@@;${CVSWEB_TITLE};g" \
-		${WRKSRC}/cvsweb > ${WRKDIR}/cvsweb
+	${SED}	-e "s;!!CVSROOT!!;${CVSROOT};g" \
+		-e "s;!!TITLE!!;${TITLE};g" \
+		${WRKSRC}/cvsweb > ${WRKSRC}/cvsweb.cgi
 
 do-install:
-.if !defined(PACKAGE_BUILDING)
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+	${MKDIR} ${PREFIX}/${CGIDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/${CGIDIR}/
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/cvsweb
+	cd ${WRKSRC} && ${INSTALL_DATA} README ${PREFIX}/share/doc/cvsweb/
 .endif
-	@${MKDIR} ${PREFIX}/share/apache/cgi-bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/cvsweb ${PREFIX}/share/apache/cgi-bin/
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/cvsweb/pkg-comment b/devel/cvsweb/pkg-comment
index 4dc93e3732a0..4a8d068fcc9a 100644
--- a/devel/cvsweb/pkg-comment
+++ b/devel/cvsweb/pkg-comment
@@ -1 +1 @@
-WWW CGI script that allows remote access to a CVS tree
+WWW CGI script to browse a CVS repository tree
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index 7db7a6ccbbad..a4e7e38311e5 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -1,17 +1,7 @@
-cvsweb is a WWW CGI script that allows remote access to a CVS tree.  It
-allows browsing of the full tree; no access controls are implemented.
-It can display the revision history of a file, as well as diffs between
-revisions and downloading the whole file.
+The cvsweb.cgi is a WWW CGI script that allows remote users to browse
+a CVS repository tree via web.  It can display the revision history of
+a file, as well as diffs between revisions and downloading the whole
+file.
 
-The configuration should be easy; edit the variable definitions at the
-top, above the line that says "End configuration section".  Then install
-it in your web server's cgi-bin directory and you should be all set.
-
-Several people have approached me about modifying cvsweb for their own
-needs.  I would ask that if you make a useful modification, that you send
-it back to me for inclusion in the next release.
-
-AUTHOR: Bill Fenner <fenner@freebsd.org>
-WWW: http://people.FreeBSD.org/~fenner/cvsweb/
-
-- from README
+AUTHOR:	Bill Fenner <fenner@FreeBSD.org>
+WWW:	http://people.FreeBSD.org/~fenner/cvsweb/
diff --git a/devel/cvsweb/pkg-message b/devel/cvsweb/pkg-message
new file mode 100644
index 000000000000..53f53b176e25
--- /dev/null
+++ b/devel/cvsweb/pkg-message
@@ -0,0 +1,12 @@
+************************************************************
+  Now you can browse your CVS repository via web if you set
+up your web server correctly.  The URL to get to the cvsweb
+will be like `http://localhost/cgi-bin/cvsweb.cgi'.
+
+  To configure its appearance and/or change the repository
+entry to browse, try editing the configuration section of
+cvsweb.cgi as you like.
+
+  For further information, please look into the directory
+`/usr/local/share/doc/cvsweb/'.
+************************************************************
diff --git a/devel/cvsweb/pkg-plist b/devel/cvsweb/pkg-plist
index c2c0802a32d8..a9af8b1fc8e8 100644
--- a/devel/cvsweb/pkg-plist
+++ b/devel/cvsweb/pkg-plist
@@ -1 +1,3 @@
-share/apache/cgi-bin/cvsweb
+%%CGIDIR%%/cvsweb.cgi
+share/doc/cvsweb/README
+@dirrm share/doc/cvsweb
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index e23ebd873ac4..fc729a06fd4d 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -10,28 +10,38 @@ DISTNAME=	cvsweb-1.0
 CATEGORIES=	devel www
 MASTER_SITES=	http://people.FreeBSD.org/~fenner/cvsweb/
 
-MAINTAINER=	sada@FreeBSD.org
+MAINTAINER=	knu@idaemons.org
 
 NO_BUILD=	yes
 
-# could be overridden.
-CVSROOT?=	'/home/ncvs'
-CVSWEB_CVSROOT?= ${CVSROOT}
-CVSWEB_TITLE?=	'My CVS Tree'
-.if defined(PACKAGE_BUILDING)
-CVSWEB_CVSROOT=	/home/ncvs
+# Specify where your repository belongs.
+# (You can reconfigure it after installation anyway)
+.if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT)
+CVSROOT=	/home/ncvs
 .endif
 
+# Specify the title of your cvsweb site.
+TITLE?=		My CVS Repository
+
+# Specify the cgi-bin directory in relative paths to ${PREFIX}.
+CGIDIR?=	share/apache/cgi-bin
+
+PLIST_SUB=	CGIDIR="${CGIDIR}"
+
 do-configure:
-	@${SED} -e "s;@@CVSROOT@@;${CVSWEB_CVSROOT};g" \
-		-e "s;@@TITLE@@;${CVSWEB_TITLE};g" \
-		${WRKSRC}/cvsweb > ${WRKDIR}/cvsweb
+	${SED}	-e "s;!!CVSROOT!!;${CVSROOT};g" \
+		-e "s;!!TITLE!!;${TITLE};g" \
+		${WRKSRC}/cvsweb > ${WRKSRC}/cvsweb.cgi
 
 do-install:
-.if !defined(PACKAGE_BUILDING)
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGREQ} ${PKGNAME} INSTALL
+	${MKDIR} ${PREFIX}/${CGIDIR}
+	${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/${CGIDIR}/
+.if !defined(NOPORTDOCS)
+	${MKDIR} ${PREFIX}/share/doc/cvsweb
+	cd ${WRKSRC} && ${INSTALL_DATA} README ${PREFIX}/share/doc/cvsweb/
 .endif
-	@${MKDIR} ${PREFIX}/share/apache/cgi-bin
-	@${INSTALL_SCRIPT} ${WRKDIR}/cvsweb ${PREFIX}/share/apache/cgi-bin/
+
+post-install:
+	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/devel/cvsweb3/pkg-comment b/devel/cvsweb3/pkg-comment
index 4dc93e3732a0..4a8d068fcc9a 100644
--- a/devel/cvsweb3/pkg-comment
+++ b/devel/cvsweb3/pkg-comment
@@ -1 +1 @@
-WWW CGI script that allows remote access to a CVS tree
+WWW CGI script to browse a CVS repository tree
diff --git a/devel/cvsweb3/pkg-descr b/devel/cvsweb3/pkg-descr
index 7db7a6ccbbad..a4e7e38311e5 100644
--- a/devel/cvsweb3/pkg-descr
+++ b/devel/cvsweb3/pkg-descr
@@ -1,17 +1,7 @@
-cvsweb is a WWW CGI script that allows remote access to a CVS tree.  It
-allows browsing of the full tree; no access controls are implemented.
-It can display the revision history of a file, as well as diffs between
-revisions and downloading the whole file.
+The cvsweb.cgi is a WWW CGI script that allows remote users to browse
+a CVS repository tree via web.  It can display the revision history of
+a file, as well as diffs between revisions and downloading the whole
+file.
 
-The configuration should be easy; edit the variable definitions at the
-top, above the line that says "End configuration section".  Then install
-it in your web server's cgi-bin directory and you should be all set.
-
-Several people have approached me about modifying cvsweb for their own
-needs.  I would ask that if you make a useful modification, that you send
-it back to me for inclusion in the next release.
-
-AUTHOR: Bill Fenner <fenner@freebsd.org>
-WWW: http://people.FreeBSD.org/~fenner/cvsweb/
-
-- from README
+AUTHOR:	Bill Fenner <fenner@FreeBSD.org>
+WWW:	http://people.FreeBSD.org/~fenner/cvsweb/
diff --git a/devel/cvsweb3/pkg-message b/devel/cvsweb3/pkg-message
new file mode 100644
index 000000000000..53f53b176e25
--- /dev/null
+++ b/devel/cvsweb3/pkg-message
@@ -0,0 +1,12 @@
+************************************************************
+  Now you can browse your CVS repository via web if you set
+up your web server correctly.  The URL to get to the cvsweb
+will be like `http://localhost/cgi-bin/cvsweb.cgi'.
+
+  To configure its appearance and/or change the repository
+entry to browse, try editing the configuration section of
+cvsweb.cgi as you like.
+
+  For further information, please look into the directory
+`/usr/local/share/doc/cvsweb/'.
+************************************************************
diff --git a/devel/cvsweb3/pkg-plist b/devel/cvsweb3/pkg-plist
index c2c0802a32d8..a9af8b1fc8e8 100644
--- a/devel/cvsweb3/pkg-plist
+++ b/devel/cvsweb3/pkg-plist
@@ -1 +1,3 @@
-share/apache/cgi-bin/cvsweb
+%%CGIDIR%%/cvsweb.cgi
+share/doc/cvsweb/README
+@dirrm share/doc/cvsweb