5 files changed, 16 insertions, 9 deletions

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 0429a8db5a54..8a5480449b8f 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -6,16 +6,19 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	1.90
+PORTVERSION=	${REV_ZELLER}.${REV_KNU}
 CATEGORIES=	devel www
-MASTER_SITES=	http://stud.fh-heilbronn.de/~zeller/download/ \
-		${MASTER_SITE_LOCAL}
+MASTER_SITES=	${MASTER_SITE_LOCAL}
 MASTER_SITE_SUBDIR=	knu
 
 MAINTAINER=	knu@FreeBSD.org
 
 NO_BUILD=	yes
 
+# This version of cvsweb is Zeller's version + knu's enhancements.
+REV_ZELLER=	1.93
+REV_KNU=	1.9
+
 # Specify where your repository belongs.
 # (You can reconfigure it after installation anyway)
 .if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT)
@@ -35,9 +38,9 @@ WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-configure:
 	cd ${WRKSRC} && ${PERL} -i -pe "\
-		s;!!PREFIX!!;${PREFIX};g; \
-		s;!!CVSROOT!!;${CVSROOT};g; \
-		s;!!TITLE!!;${TITLE};g; \
+		s;/usr/local;${PREFIX};g; \
+		s;/home/cvs;${CVSROOT};g; \
+		s;'Local Repository';'${TITLE}';g; \
 		" cvsweb.cgi cvsweb.conf
 
 do-install:
@@ -48,7 +51,7 @@ do-install:
 	cd ${WRKSRC}/icons && ${INSTALL_DATA} * ${PREFIX}/${ICONSDIR}/cvsweb/
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${PREFIX}/share/doc/cvsweb
-	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README TODO ${PREFIX}/share/doc/cvsweb/
+	cd ${WRKSRC} && ${INSTALL_DATA} INSTALL README README.knu TODO ${PREFIX}/share/doc/cvsweb/
 .endif
 
 post-install:
diff --git a/devel/cvsweb/distinfo b/devel/cvsweb/distinfo
index 18818fac0d67..c3a4c8f8cdad 100644
--- a/devel/cvsweb/distinfo
+++ b/devel/cvsweb/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-1.90.tar.gz) = 7e2793a4c1ef99ae7905d511509329f7
+MD5 (cvsweb-1.93.1.9.tar.gz) = d2dac48b0fba5c456df5d66e2beb89b6
diff --git a/devel/cvsweb/pkg-comment b/devel/cvsweb/pkg-comment
index 343cffaaf5cf..ce1447b54b72 100644
--- a/devel/cvsweb/pkg-comment
+++ b/devel/cvsweb/pkg-comment
@@ -1 +1 @@
-WWW CGI script to browse CVS repository trees (Zeller's version)
+WWW CGI script to browse CVS repository trees (Zeller's version + enhancements)
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index ec6d89517c41..a67c7277f214 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -8,6 +8,9 @@ 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.
 
+Akinori MUSHA <knu@FreeBSD.org> is adding more enhancements and doing
+some cleanups over Zeller's version.
+
 As space is lacking to list all the improvements over the original,
 please refer to the documents after the installation.
 
diff --git a/devel/cvsweb/pkg-plist b/devel/cvsweb/pkg-plist
index 08b0e14c4b08..41ecbfcf0ebd 100644
--- a/devel/cvsweb/pkg-plist
+++ b/devel/cvsweb/pkg-plist
@@ -1,6 +1,7 @@
 etc/cvsweb.conf.sample
 share/doc/cvsweb/INSTALL
 share/doc/cvsweb/README
+share/doc/cvsweb/README.knu
 share/doc/cvsweb/TODO
 @dirrm share/doc/cvsweb
 %%CGIDIR%%/cvsweb.cgi