Update to FreeBSD-cvsweb 2.0.0.

* cvsweb.conf-freebsd: Allow downloading a tarball of a project
  directory as well as a port directory.

* cvsweb.cgi, cvsweb.conf: Introduce optional output filter.
  [Requested by: Shigeyuki Fukushima <shige@FreeBSD.org>]

* cvsweb.cgi: Fix a bug where it produces wrong download links when
  cvsweb.cgi is placed right under the document root.
  [Reported by: Arnaud on EFnet]

6 files changed, 14 insertions, 34 deletions

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 09af83d..d0ace68 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	${REV_ZELLER}.${REV_KNU}
+PORTVERSION=	2.0.0
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -18,10 +18,6 @@ NO_BUILD=	yes
 
 USE_PERL5=	yes
 
-# This version of cvsweb is Zeller's version + knu's enhancements.
-REV_ZELLER=	1.112
-REV_KNU=	1.82
-
 # Specify where your repository belongs.
 # (You can reconfigure it after installation anyway)
 .if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT)
@@ -48,8 +44,6 @@ CONFFILES=	cvsweb.conf \
 
 PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}"
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 post-patch:
 	${PERL} -i -pe "\
 		s'!!PERL!!'${PERL}'g; \
diff --git a/devel/cvsweb/distinfo b/devel/cvsweb/distinfo
index 46d80fe..89324e0 100644
--- a/devel/cvsweb/distinfo
+++ b/devel/cvsweb/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-1.112.1.82.tar.gz) = 848b43261c4a6e3be4db7ed656c5b3cc
+MD5 (cvsweb-2.0.0.tar.gz) = c2bdbee6a53bdf4837f1a238a2b62722
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index b5f45a4..398405c 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -6,13 +6,9 @@ file.
 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.
+Ken Coar <Ken.Coar@Golux.Com>, then Akinori MUSHA <knu@FreeBSD.org>
+brought it back to the FreeBSD community and made further
+improvements.
 
-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.
-
-WWW:	http://www.idaemons.org/~knu/cvsweb/
-Author:	Akinori MUSHA <knu@FreeBSD.org>
+WWW:	http://www.FreeBSD.org/cgi/cvsweb.cgi/projects/cvsweb/
+Author:	the FreeBSD Project
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 09af83d..d0ace68 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	${REV_ZELLER}.${REV_KNU}
+PORTVERSION=	2.0.0
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://www.iDaemons.org/distfiles/
@@ -18,10 +18,6 @@ NO_BUILD=	yes
 
 USE_PERL5=	yes
 
-# This version of cvsweb is Zeller's version + knu's enhancements.
-REV_ZELLER=	1.112
-REV_KNU=	1.82
-
 # Specify where your repository belongs.
 # (You can reconfigure it after installation anyway)
 .if defined(PACKAGE_BUILDING) || !defined(CVSROOT) || empty(CVSROOT)
@@ -48,8 +44,6 @@ CONFFILES=	cvsweb.conf \
 
 PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}"
 
-WRKSRC=		${WRKDIR}/${PORTNAME}
-
 post-patch:
 	${PERL} -i -pe "\
 		s'!!PERL!!'${PERL}'g; \
diff --git a/devel/cvsweb3/distinfo b/devel/cvsweb3/distinfo
index 46d80fe..89324e0 100644
--- a/devel/cvsweb3/distinfo
+++ b/devel/cvsweb3/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-1.112.1.82.tar.gz) = 848b43261c4a6e3be4db7ed656c5b3cc
+MD5 (cvsweb-2.0.0.tar.gz) = c2bdbee6a53bdf4837f1a238a2b62722
diff --git a/devel/cvsweb3/pkg-descr b/devel/cvsweb3/pkg-descr
index b5f45a4..398405c 100644
--- a/devel/cvsweb3/pkg-descr
+++ b/devel/cvsweb3/pkg-descr
@@ -6,13 +6,9 @@ file.
 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.
+Ken Coar <Ken.Coar@Golux.Com>, then Akinori MUSHA <knu@FreeBSD.org>
+brought it back to the FreeBSD community and made further
+improvements.
 
-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.
-
-WWW:	http://www.idaemons.org/~knu/cvsweb/
-Author:	Akinori MUSHA <knu@FreeBSD.org>
+WWW:	http://www.FreeBSD.org/cgi/cvsweb.cgi/projects/cvsweb/
+Author:	the FreeBSD Project