7 files changed, 63 insertions, 15 deletions

diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 0fd0a118113a..2b933e186dbd 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -19,7 +19,7 @@ USE_PERL5=	yes
 
 # This version of cvsweb is Zeller's version + knu's enhancements.
 REV_ZELLER=	1.104
-REV_KNU=	1.52
+REV_KNU=	1.54
 
 # Specify where your repository belongs.
 # (You can reconfigure it after installation anyway)
@@ -39,22 +39,34 @@ CGIDIR?=	www/cgi-bin
 ICONSDIR?=	www/icons
 .endif
 
+CONFFILES=	cvsweb.conf \
+		cvsweb.conf-freebsd \
+		cvsweb.conf-openbsd \
+		cvsweb.conf-netbsd \
+		cvsweb.conf-ruby
+
 PLIST_SUB=	CGIDIR="${CGIDIR}" ICONSDIR="${ICONSDIR}"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-do-configure:
-	cd ${WRKSRC} && ${PERL} -i -pe "\
-		s;/usr/bin/perl5;${PERL};g; \
-		s;/usr/local;${PREFIX};g; \
-		s;/home/cvs;${CVSROOT};g; \
-		s;'Local Repository';'${TITLE}';g; \
-		" cvsweb.cgi cvsweb.conf
+post-patch:
+	${PERL} -i -pe "\
+		s;!!PERL!!;${PERL};g; \
+		s;!!PREFIX!!;${PREFIX};g;" \
+		${WRKSRC}/cvsweb.cgi
+	${PERL} -i -pe "\
+		s;!!PREFIX!!;${PREFIX};g; \
+		s;!!CVSROOT!!;${CVSROOT};g; \
+		s;!!TITLE!!;${TITLE};g;" \
+		${WRKSRC}/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}/etc/cvsweb
+.for f in ${CONFFILES}
+	${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/etc/cvsweb/${f}.dist
+.endfor
 	${MKDIR} ${PREFIX}/${ICONSDIR}/cvsweb
 	cd ${WRKSRC}/icons && ${INSTALL_DATA} * ${PREFIX}/${ICONSDIR}/cvsweb/
 .if !defined(NOPORTDOCS)
diff --git a/devel/cvsweb3/distinfo b/devel/cvsweb3/distinfo
index 3e20eb3223b9..6e4e655d3649 100644
--- a/devel/cvsweb3/distinfo
+++ b/devel/cvsweb3/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-1.104.1.52.tar.gz) = 970ca8be46c72003bfa62788f8211ebb
+MD5 (cvsweb-1.104.1.54.tar.gz) = 3a36c30e77161a7f63ccd6649f415120
diff --git a/devel/cvsweb3/files/patch-cvsweb.cgi b/devel/cvsweb3/files/patch-cvsweb.cgi
new file mode 100644
index 000000000000..d498c7b4e126
--- /dev/null
+++ b/devel/cvsweb3/files/patch-cvsweb.cgi
@@ -0,0 +1,8 @@
+--- cvsweb.cgi.orig	Tue Jan  2 08:15:02 2001
++++ cvsweb.cgi	Tue Jan  2 08:33:52 2001
+@@ -1 +1 @@
+-#!/usr/bin/perl5 -ws
++#!!!PERL!! -ws
+@@ -139 +139 @@
+-     '/usr/local/etc/cvsweb.conf',
++     '!!PREFIX!!/etc/cvsweb/cvsweb.conf',
diff --git a/devel/cvsweb3/files/patch-cvsweb.conf b/devel/cvsweb3/files/patch-cvsweb.conf
new file mode 100644
index 000000000000..ea7c77bc254b
--- /dev/null
+++ b/devel/cvsweb3/files/patch-cvsweb.conf
@@ -0,0 +1,23 @@
+--- cvsweb.conf.orig	Tue Jan  2 08:15:03 2001
++++ cvsweb.conf	Tue Jan  2 08:32:37 2001
+@@ -28 +28 @@
+-	    'local'     => '/home/cvs',
++	    'local'     => '!!CVSROOT!!',
+@@ -37 +37 @@
+-		 'local'     => 'Local Repository',
++		 'local'     => '!!TITLE!!',
+@@ -203 +203 @@
+-my $iconsdir = "/icons";
++my $iconsdir = "/icons/cvsweb";
+@@ -323 +323 @@
+-$mime_types = '/usr/local/etc/apache/mime.types';
++$mime_types = '!!PREFIX!!/etc/apache/mime.types';
+@@ -393 +393 @@
+-#$ENV{'PATH'} = '/usr/local/bin';
++#$ENV{'PATH'} = '!!PREFIX!!/bin';
+@@ -447 +447 @@
+-@tar_options = qw();
++@tar_options = qw(--ignore-failed-read);
+@@ -452 +452 @@
+-@cvs_options = qw(-l);
++@cvs_options = qw(-R -l);
diff --git a/devel/cvsweb3/pkg-comment b/devel/cvsweb3/pkg-comment
index ce1447b54b72..63c4db196022 100644
--- a/devel/cvsweb3/pkg-comment
+++ b/devel/cvsweb3/pkg-comment
@@ -1 +1 @@
-WWW CGI script to browse CVS repository trees (Zeller's version + enhancements)
+WWW CGI script to browse CVS repository trees
diff --git a/devel/cvsweb3/pkg-message b/devel/cvsweb3/pkg-message
index 6ceb286c8358..c9c5c1b10c92 100644
--- a/devel/cvsweb3/pkg-message
+++ b/devel/cvsweb3/pkg-message
@@ -1,14 +1,14 @@
 ************************************************************
 Quickstart:
-	cd ${PREFIX}/etc
-	cp cvsweb.conf.sample cvsweb.conf
+	cd ${PREFIX}/etc/cvsweb
+	cp cvsweb.conf.dist 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 repository entries to
-browse, try editing cvsweb.conf as you like.
+browse, edit cvsweb.conf* as you like.
 
   For further information, please look into the directory
 `${PREFIX}/share/doc/cvsweb/'.
diff --git a/devel/cvsweb3/pkg-plist b/devel/cvsweb3/pkg-plist
index 2adf440f50fb..300c26ff8ec9 100644
--- a/devel/cvsweb3/pkg-plist
+++ b/devel/cvsweb3/pkg-plist
@@ -1,4 +1,9 @@
-etc/cvsweb.conf.sample
+etc/cvsweb/cvsweb.conf.dist
+etc/cvsweb/cvsweb.conf-freebsd.dist
+etc/cvsweb/cvsweb.conf-openbsd.dist
+etc/cvsweb/cvsweb.conf-netbsd.dist
+etc/cvsweb/cvsweb.conf-ruby.dist
+@dirrm etc/cvsweb
 share/doc/cvsweb/ChangeLog
 share/doc/cvsweb/INSTALL
 share/doc/cvsweb/README