Update to CVSweb 3.0.1.

Many improvements; see the installed file /usr/pkg/share/doc/cvsweb/NEWS or
  http://www.freebsd.org/cgi/cvsweb.cgi/projects/cvsweb/NEWS?rev=1.26&content-type=text/x-cvsweb-markup
for more info.

Note: whilst (optional) support for CvsGraph 1.4.0, enscript 1.6.3
and CVSHistory 2.0 exists in this version, this package does
not specifically depend upon those products as the features that use
them are optional...

5 files changed, 51 insertions, 25 deletions

diff --git a/www/cvsweb/MESSAGE b/www/cvsweb/MESSAGE
new file mode 100644
index 00000000000..5ebcbd97282
--- /dev/null
+++ b/www/cvsweb/MESSAGE
@@ -0,0 +1,10 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2004/05/28 01:47:26 lukem Exp $
+
+  cvsweb has now been installed.
+
+  If you are upgrading from a previous version, please follow the
+  `Upgrading from ...' instructions in:
+	${PREFIX}/share/doc/cvsweb/INSTALL
+
+===========================================================================
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index d1e8f1cfb16..ea3815b7295 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,8 +1,8 @@
 #
-# $NetBSD: Makefile,v 1.18 2004/04/26 03:37:48 snj Exp $
+# $NetBSD: Makefile,v 1.19 2004/05/28 01:47:26 lukem Exp $
 #
 
-DISTNAME=		cvsweb-2.0.6
+DISTNAME=		cvsweb-3.0.1
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/
 
@@ -10,10 +10,18 @@ MAINTAINER=		lukem@NetBSD.org
 HOMEPAGE=		http://www.freebsd.org/projects/cvsweb.html
 COMMENT=		Web interface for browsing a CVS repository
 
+DEPENDS+=		p5-File-Temp>=0.12:../../devel/p5-File-Temp
+DEPENDS+=		p5-IPC-Run>=0.74:../../devel/p5-IPC-Run
+DEPENDS+=		p5-MIME-Types>=1.12:../../mail/p5-MIME-Types
+DEPENDS+=		p5-URI>=1.30:../../www/p5-URI
+
 NO_BUILDLINK=		YES
 USE_PERL5=		# defined
 USE_PKGINSTALL=		YES
 
+PERL5_REQD+=		5.6
+REPLACE_PERL=		cvsweb.cgi
+
 PKG_SYSCONFSUBDIR?=	httpd
 EGDIR=			${PREFIX}/share/examples/${PKGBASE}
 DOCDIR=			${PREFIX}/share/doc/${PKGBASE}
@@ -24,23 +32,21 @@ CVSWEB_CONF_FILES=	cvsweb.conf \
 			cvsweb.conf-openbsd \
 			cvsweb.conf-ruby
 
-CVSWEB_ICONS=		back.gif dir.gif \
-			miniback.gif minidir.gif minitext.gif text.gif
+CVSWEB_CSS=		cvsweb.css
 
-CVSWEB_DOCS=		ChangeLog INSTALL README README.FreeBSD \
-			TODO TODO.FreeBSD
+CVSWEB_ICONS=		back.gif binary.gif dir.gif \
+			miniback.gif minidir.gif minigraph.png minitext.gif \
+			text.gif
+
+CVSWEB_DOCS=		ChangeLog INSTALL NEWS README TODO
 
 CONF_FILES=		${EGDIR}/cvsweb.conf ${PKG_SYSCONFDIR}/cvsweb.conf
 
 .if !exists(/usr/bin/rlog)
-DEPENDS+=	rcs-[0-9]*:../../devel/rcs
+DEPENDS+=		rcs-[0-9]*:../../devel/rcs
 .endif
 
 do-build:
-	${MV} ${WRKSRC}/cvsweb.cgi ${WRKSRC}/cvsweb.cgi.bak
-	${SED}	-e 's,/usr/bin/perl,${PERL5},'				\
-		-e 's,/usr/local/etc/cvsweb/,${PKG_SYSCONFDIR}/,'	\
-		${WRKSRC}/cvsweb.cgi.bak > ${WRKSRC}/cvsweb.cgi
 
 do-install:
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/libexec/cgi-bin
@@ -53,6 +59,10 @@ do-install:
 .for f in ${CVSWEB_ICONS}
 	${INSTALL_DATA} ${WRKSRC}/icons/${f} ${EGDIR}/icons/${f}
 .endfor
+	${INSTALL_DATA_DIR} ${EGDIR}/css
+.for f in ${CVSWEB_CSS}
+	${INSTALL_DATA} ${WRKSRC}/css/${f} ${EGDIR}/css/${f}
+.endfor
 	${INSTALL_DATA_DIR} ${DOCDIR}
 .for f in ${CVSWEB_DOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f}
diff --git a/www/cvsweb/PLIST b/www/cvsweb/PLIST
index aa3ef16dba1..c6323b712dc 100644
--- a/www/cvsweb/PLIST
+++ b/www/cvsweb/PLIST
@@ -1,22 +1,25 @@
-@comment $NetBSD: PLIST,v 1.3 2002/08/25 21:52:06 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/05/28 01:47:26 lukem Exp $
 libexec/cgi-bin/cvsweb.cgi
 share/doc/cvsweb/ChangeLog
 share/doc/cvsweb/INSTALL
+share/doc/cvsweb/NEWS
 share/doc/cvsweb/README
-share/doc/cvsweb/README.FreeBSD
 share/doc/cvsweb/TODO
-share/doc/cvsweb/TODO.FreeBSD
+share/examples/cvsweb/css/cvsweb.css
 share/examples/cvsweb/cvsweb.conf
 share/examples/cvsweb/cvsweb.conf-freebsd
 share/examples/cvsweb/cvsweb.conf-netbsd
 share/examples/cvsweb/cvsweb.conf-openbsd
 share/examples/cvsweb/cvsweb.conf-ruby
 share/examples/cvsweb/icons/back.gif
+share/examples/cvsweb/icons/binary.gif
 share/examples/cvsweb/icons/dir.gif
 share/examples/cvsweb/icons/miniback.gif
 share/examples/cvsweb/icons/minidir.gif
+share/examples/cvsweb/icons/minigraph.png
 share/examples/cvsweb/icons/minitext.gif
 share/examples/cvsweb/icons/text.gif
 @dirrm share/examples/cvsweb/icons
+@dirrm share/examples/cvsweb/css
 @dirrm share/examples/cvsweb
 @dirrm share/doc/cvsweb
diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo
index d54abd64fb2..6539cf1a667 100644
--- a/www/cvsweb/distinfo
+++ b/www/cvsweb/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.9 2002/09/29 12:46:41 martti Exp $
+$NetBSD: distinfo,v 1.10 2004/05/28 01:47:26 lukem Exp $
 
-SHA1 (cvsweb-2.0.6.tar.gz) = ecfb465970966b832457e7bb04e1c3055e07b413
-Size (cvsweb-2.0.6.tar.gz) = 52659 bytes
-SHA1 (patch-aa) = 7306be52d771e18549af9cad421b8ca89c660428
+SHA1 (cvsweb-3.0.1.tar.gz) = 52ae5e8cc65cef7c3fdc33f9369fe00b2c5af8da
+Size (cvsweb-3.0.1.tar.gz) = 69916 bytes
+SHA1 (patch-aa) = 8aa77c9188a61c76c5ca537a85ca16426f81a086
diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa
index 2e4e81deb11..a692abf1097 100644
--- a/www/cvsweb/patches/patch-aa
+++ b/www/cvsweb/patches/patch-aa
@@ -1,10 +1,13 @@
-$NetBSD: patch-aa,v 1.7 2002/09/29 12:46:41 martti Exp $
+$NetBSD: patch-aa,v 1.8 2004/05/28 01:47:26 lukem Exp $
 
---- cvsweb.cgi.orig	Thu Sep 26 20:56:05 2002
-+++ cvsweb.cgi	Sun Sep 29 14:36:06 2002
-@@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!/usr/bin/perl -w
+--- cvsweb.conf.orig	2004-05-05 09:40:50.000000000 +1000
++++ cvsweb.conf
+@@ -19,7 +19,7 @@
+ #   cvsgraph (if you enable $allow_graph)
+ #   enscript (if you enable $allow_enscript)
  #
- # cvsweb - a CGI interface to CVS trees.
+-@command_path = qw(/bin /usr/bin /usr/local/bin);
++@command_path = qw(/bin /usr/bin /usr/pkg/bin /usr/local/bin);
+ 
+ # Search the above directories for each command (prefer gtar over tar).
  #