Update to FreeBSD-CVSweb 2.0.5.

Approved by:	knu (mentor)

8 files changed, 98 insertions, 26 deletions

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 56cbdf6443a..6ba5380a6fc 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.FreeBSD.org/~scop/cvsweb/
diff --git a/devel/cvsweb/distinfo b/devel/cvsweb/distinfo
index 0aab528e90f..e193a0a0847 100644
--- a/devel/cvsweb/distinfo
+++ b/devel/cvsweb/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-2.0.4.tar.gz) = 8f0e7051c41767ca6133e2840deef572
+MD5 (cvsweb-2.0.5.tar.gz) = 1c36f319ec5342db27275aed60a2a8ec
diff --git a/devel/cvsweb/files/patch-cvsweb.cgi b/devel/cvsweb/files/patch-cvsweb.cgi
index 8bae9c2c024..baf8486b18c 100644
--- a/devel/cvsweb/files/patch-cvsweb.cgi
+++ b/devel/cvsweb/files/patch-cvsweb.cgi
@@ -1,11 +1,22 @@
---- cvsweb.cgi.orig	Wed Aug  1 18:54:52 2001
-+++ cvsweb.cgi	Wed Aug  1 19:09:37 2001
-@@ -1,2 +1,2 @@
+Index: cvsweb.cgi
+===================================================================
+RCS file: /home/ncvs/projects/cvsweb/cvsweb.cgi,v
+retrieving revision 1.119
+diff -a -u -r1.119 cvsweb.cgi
+--- cvsweb.cgi	23 Jul 2002 13:58:32 -0000	1.119
++++ cvsweb.cgi	23 Jul 2002 14:16:12 -0000
+@@ -1,4 +1,4 @@
 -#!/usr/bin/perl -wT
 +#!!!PERL!! -wT
  #
-@@ -155,3 +155,3 @@
+ # cvsweb - a CGI interface to CVS trees.
+ #
+@@ -157,7 +157,7 @@
+ 
+ # == EDIT this ==
  # Locations to search for user configuration, in order:
 -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
 +for ("$mydir/cvsweb.conf", '!!PREFIX!!/etc/cvsweb/cvsweb.conf') {
  	if (defined($_) && -r $_) {
+ 		$config = $_;
+ 		last;
diff --git a/devel/cvsweb/files/patch-cvsweb.conf b/devel/cvsweb/files/patch-cvsweb.conf
index d6f28c9fed6..c5716494a73 100644
--- a/devel/cvsweb/files/patch-cvsweb.conf
+++ b/devel/cvsweb/files/patch-cvsweb.conf
@@ -1,27 +1,52 @@
---- cvsweb.conf.orig	Wed Aug  1 18:48:39 2001
-+++ cvsweb.conf	Wed Aug  1 19:10:01 2001
-@@ -17,3 +17,3 @@
+Index: cvsweb.conf
+===================================================================
+RCS file: /home/ncvs/projects/cvsweb/cvsweb.conf,v
+retrieving revision 1.36
+diff -a -u -r1.36 cvsweb.conf
+--- cvsweb.conf	10 Jul 2002 15:30:56 -0000	1.36
++++ cvsweb.conf	23 Jul 2002 14:15:23 -0000
+@@ -18,7 +18,7 @@
+ #   uname, cvs, rlog, rcsdiff
+ #   gzip (if you enable $allow_compress)
  #   tar, rm, zip (if you enable $allow_tar)
 -$command_path = '/bin:/usr/bin:/usr/local/bin';
 +$command_path = '/bin:/usr/bin:!!PREFIX!!/bin';
  
-@@ -42,3 +42,3 @@
+ # Search the above directories for each command
+ for (qw(uname cvs rlog rcsdiff gzip tar rm zip)) {
+@@ -43,7 +43,7 @@
+ # 'symbolic_name' => ['name_to_display', 'path_to_the_actual_repository']
+ # Listed in the order specified:
  @CVSrepositories = (
 -	'local'   => ['Local Repository', '/home/cvs'],
 +	'local'   => ['!!TITLE!!', '!!CVSROOT!!'],
  #	'freebsd' => ['FreeBSD',          '/home/ncvs'],
-@@ -214,3 +214,3 @@
+ #	'openbsd' => ['OpenBSD',          '/home/ncvs'],
+ #	'netbsd'  => ['NetBSD',           '/home/ncvs'],
+@@ -200,7 +200,7 @@
+ # These default icons are coming with apache.
+ # If these icons are too large, check out the miniicons in the
  # icons/ directory; they have a width/height of 16/16
 -my $iconsdir = "/icons";
 +my $iconsdir = "/icons/cvsweb";
  
-@@ -348,3 +348,3 @@
+ # format:             TEXT      ICON-URL              width height
+ %ICONS = (
+@@ -335,7 +335,7 @@
+ # cvsweb to guess the correct mime-type on
+ # checkout; you can use the mime.types from
  # apache here:
 -$mime_types = '/usr/local/etc/apache/mime.types';
 +$mime_types = '!!PREFIX!!/etc/apache/mime.types';
  
-@@ -469,3 +469,3 @@
+ # quick mime-type lookup; maps file-suffices to
+ # mime-types for displaying checkouts in the browser.
+@@ -472,7 +472,7 @@
+ $allow_tar = '';
+ 
  # Options to pass to tar(1).
 -@tar_options = qw();
 +@tar_options = qw(--ignore-failed-read);
  
+ # e.g. @tar_options = qw(--ignore-failed-read);
+ #      GNU tar has some useful options against unexpected errors.
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 56cbdf6443a..6ba5380a6fc 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	cvsweb
-PORTVERSION=	2.0.4
+PORTVERSION=	2.0.5
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.FreeBSD.org/~scop/cvsweb/
diff --git a/devel/cvsweb3/distinfo b/devel/cvsweb3/distinfo
index 0aab528e90f..e193a0a0847 100644
--- a/devel/cvsweb3/distinfo
+++ b/devel/cvsweb3/distinfo
@@ -1 +1 @@
-MD5 (cvsweb-2.0.4.tar.gz) = 8f0e7051c41767ca6133e2840deef572
+MD5 (cvsweb-2.0.5.tar.gz) = 1c36f319ec5342db27275aed60a2a8ec
diff --git a/devel/cvsweb3/files/patch-cvsweb.cgi b/devel/cvsweb3/files/patch-cvsweb.cgi
index 8bae9c2c024..baf8486b18c 100644
--- a/devel/cvsweb3/files/patch-cvsweb.cgi
+++ b/devel/cvsweb3/files/patch-cvsweb.cgi
@@ -1,11 +1,22 @@
---- cvsweb.cgi.orig	Wed Aug  1 18:54:52 2001
-+++ cvsweb.cgi	Wed Aug  1 19:09:37 2001
-@@ -1,2 +1,2 @@
+Index: cvsweb.cgi
+===================================================================
+RCS file: /home/ncvs/projects/cvsweb/cvsweb.cgi,v
+retrieving revision 1.119
+diff -a -u -r1.119 cvsweb.cgi
+--- cvsweb.cgi	23 Jul 2002 13:58:32 -0000	1.119
++++ cvsweb.cgi	23 Jul 2002 14:16:12 -0000
+@@ -1,4 +1,4 @@
 -#!/usr/bin/perl -wT
 +#!!!PERL!! -wT
  #
-@@ -155,3 +155,3 @@
+ # cvsweb - a CGI interface to CVS trees.
+ #
+@@ -157,7 +157,7 @@
+ 
+ # == EDIT this ==
  # Locations to search for user configuration, in order:
 -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
 +for ("$mydir/cvsweb.conf", '!!PREFIX!!/etc/cvsweb/cvsweb.conf') {
  	if (defined($_) && -r $_) {
+ 		$config = $_;
+ 		last;
diff --git a/devel/cvsweb3/files/patch-cvsweb.conf b/devel/cvsweb3/files/patch-cvsweb.conf
index d6f28c9fed6..c5716494a73 100644
--- a/devel/cvsweb3/files/patch-cvsweb.conf
+++ b/devel/cvsweb3/files/patch-cvsweb.conf
@@ -1,27 +1,52 @@
---- cvsweb.conf.orig	Wed Aug  1 18:48:39 2001
-+++ cvsweb.conf	Wed Aug  1 19:10:01 2001
-@@ -17,3 +17,3 @@
+Index: cvsweb.conf
+===================================================================
+RCS file: /home/ncvs/projects/cvsweb/cvsweb.conf,v
+retrieving revision 1.36
+diff -a -u -r1.36 cvsweb.conf
+--- cvsweb.conf	10 Jul 2002 15:30:56 -0000	1.36
++++ cvsweb.conf	23 Jul 2002 14:15:23 -0000
+@@ -18,7 +18,7 @@
+ #   uname, cvs, rlog, rcsdiff
+ #   gzip (if you enable $allow_compress)
  #   tar, rm, zip (if you enable $allow_tar)
 -$command_path = '/bin:/usr/bin:/usr/local/bin';
 +$command_path = '/bin:/usr/bin:!!PREFIX!!/bin';
  
-@@ -42,3 +42,3 @@
+ # Search the above directories for each command
+ for (qw(uname cvs rlog rcsdiff gzip tar rm zip)) {
+@@ -43,7 +43,7 @@
+ # 'symbolic_name' => ['name_to_display', 'path_to_the_actual_repository']
+ # Listed in the order specified:
  @CVSrepositories = (
 -	'local'   => ['Local Repository', '/home/cvs'],
 +	'local'   => ['!!TITLE!!', '!!CVSROOT!!'],
  #	'freebsd' => ['FreeBSD',          '/home/ncvs'],
-@@ -214,3 +214,3 @@
+ #	'openbsd' => ['OpenBSD',          '/home/ncvs'],
+ #	'netbsd'  => ['NetBSD',           '/home/ncvs'],
+@@ -200,7 +200,7 @@
+ # These default icons are coming with apache.
+ # If these icons are too large, check out the miniicons in the
  # icons/ directory; they have a width/height of 16/16
 -my $iconsdir = "/icons";
 +my $iconsdir = "/icons/cvsweb";
  
-@@ -348,3 +348,3 @@
+ # format:             TEXT      ICON-URL              width height
+ %ICONS = (
+@@ -335,7 +335,7 @@
+ # cvsweb to guess the correct mime-type on
+ # checkout; you can use the mime.types from
  # apache here:
 -$mime_types = '/usr/local/etc/apache/mime.types';
 +$mime_types = '!!PREFIX!!/etc/apache/mime.types';
  
-@@ -469,3 +469,3 @@
+ # quick mime-type lookup; maps file-suffices to
+ # mime-types for displaying checkouts in the browser.
+@@ -472,7 +472,7 @@
+ $allow_tar = '';
+ 
  # Options to pass to tar(1).
 -@tar_options = qw();
 +@tar_options = qw(--ignore-failed-read);
  
+ # e.g. @tar_options = qw(--ignore-failed-read);
+ #      GNU tar has some useful options against unexpected errors.