6 files changed, 47 insertions, 19 deletions
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index fc729a06fd4d..b61866d0237b 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,14 +1,14 @@
 # New ports collection makefile for:	cvsweb
-# Version required:	1.0
+# Version required:	1.80
 # Date created:		27 Jun 1999
 # Whom:			SADA Kenji <sada@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
-DISTNAME=	cvsweb-1.0
+DISTNAME=	cvsweb-1.80
 CATEGORIES=	devel www
-MASTER_SITES=	http://people.FreeBSD.org/~fenner/cvsweb/
+MASTER_SITES=	http://stud.fh-heilbronn.de/~zeller/download/
 
 MAINTAINER=	knu@idaemons.org
 
@@ -23,22 +23,30 @@ CVSROOT=	/home/ncvs
 # Specify the title of your cvsweb site.
 TITLE?=		My CVS Repository
 
-# Specify the cgi-bin directory in relative paths to ${PREFIX}.
+# Specify these directories in relative paths to ${PREFIX}.
 CGIDIR?=	share/apache/cgi-bin
+ICONSDIR?=	share/apache/icons
 
-PLIST_SUB=	CGIDIR="${CGIDIR}"
+PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}"
+
+WRKSRC=		${WRKDIR}/cvsweb
 
 do-configure:
-	${SED}	-e "s;!!CVSROOT!!;${CVSROOT};g" \
-		-e "s;!!TITLE!!;${TITLE};g" \
-		${WRKSRC}/cvsweb > ${WRKSRC}/cvsweb.cgi
+	cd ${WRKSRC} && ${PERL} -i -pe "\
+		s;!!PREFIX!!;${PREFIX};g; \
+		s;!!CVSROOT!!;${CVSROOT};g; \
+		s;!!TITLE!!;${TITLE};g; \
+		" cvsweb.cgi cvsweb.conf
 
 do-install:
 	${MKDIR} ${PREFIX}/${CGIDIR}
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsweb.cgi ${PREFIX}/${CGIDIR}/
+	${INSTALL_DATA} ${WRKSRC}/cvsweb.conf ${PREFIX}/etc/cvsweb.conf.sample
+	${MKDIR} ${PREFIX}/${ICONSDIR}/cvsweb
+	cd ${WRKSRC}/icons && ${INSTALL_DATA} * ${PREFIX}/${ICONSDIR}/cvsweb/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/cvsweb
-	cd ${WRKSRC} && ${INSTALL_DATA} README ${PREFIX}/share/doc/cvsweb/
+	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README TODO ${PREFIX}/share/doc/cvsweb/
 .endif
 
 post-install:
diff --git a/devel/cvsweb/distinfo b/devel/cvsweb/distinfo
index 121f56fbacea..096c2391eb1f 100644
--- a/devel/cvsweb/distinfo
+++ b/devel/cvsweb/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-1.0.tar.gz) = 43302bfa9ae88d0ed7f60bfb2bb53de2
+MD5 (cvsweb-1.80.tar.gz) = 689e19e1cd1aa7dda4eaeb457a6fa156
diff --git a/devel/cvsweb/pkg-comment b/devel/cvsweb/pkg-comment
index 4a8d068fcc9a..343cffaaf5cf 100644
--- a/devel/cvsweb/pkg-comment
+++ b/devel/cvsweb/pkg-comment
@@ -1 +1 @@
-WWW CGI script to browse a CVS repository tree
+WWW CGI script to browse CVS repository trees (Zeller's version)
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index a4e7e38311e5..ec6d89517c41 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -3,5 +3,12 @@ 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.
 
-AUTHOR:	Bill Fenner <fenner@FreeBSD.org>
-WWW:	http://people.FreeBSD.org/~fenner/cvsweb/
+The cvsweb script has been written by Bill Fenner <fenner@FreeBSD.org>
+for the FreeBSD project, improved visually and functionally by Henner
+Zeller <zeller@think.de>, Henrik Nordstrom <hno@hem.passagen.se>, and
+Ken Coar <Ken.Coar@Golux.Com>, to be adopted by the NetBSD project.
+
+As space is lacking to list all the improvements over the original,
+please refer to the documents after the installation.
+
+WWW:	http://stud.fh-heilbronn.de/~zeller/cgi/cvsweb.cgi/
diff --git a/devel/cvsweb/pkg-message b/devel/cvsweb/pkg-message
index 53f53b176e25..68c4eb088e3f 100644
--- a/devel/cvsweb/pkg-message
+++ b/devel/cvsweb/pkg-message
@@ -1,11 +1,14 @@
 ************************************************************
-  Now you can browse your CVS repository via web if you set
-up your web server correctly.  The URL to get to the cvsweb
+Quickstart:
+	cd /usr/local/etc
+	cp cvsweb.conf.sample cvsweb.conf
+
+and 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.
+  To configure its appearance and repository entries to
+browse, try editing cvsweb.conf 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 a9af8b1fc8e8..08b0e14c4b08 100644
--- a/devel/cvsweb/pkg-plist
+++ b/devel/cvsweb/pkg-plist
@@ -1,3 +1,13 @@
-%%CGIDIR%%/cvsweb.cgi
+etc/cvsweb.conf.sample
+share/doc/cvsweb/INSTALL
 share/doc/cvsweb/README
+share/doc/cvsweb/TODO
 @dirrm share/doc/cvsweb
+%%CGIDIR%%/cvsweb.cgi
+%%ICONSDIR%%/cvsweb/back.gif
+%%ICONSDIR%%/cvsweb/dir.gif
+%%ICONSDIR%%/cvsweb/miniback.gif
+%%ICONSDIR%%/cvsweb/minidir.gif
+%%ICONSDIR%%/cvsweb/minitext.gif
+%%ICONSDIR%%/cvsweb/text.gif
+@dirrm %%ICONSDIR%%/cvsweb