Update to CVSweb 3.0.1 after a repocopy. Optional dependencies are

currently all enabled by default.

2 files changed, 51 insertions, 56 deletions

diff --git a/devel/cvsweb3/files/patch-cvsweb.cgi b/devel/cvsweb3/files/patch-cvsweb.cgi
index d1f55a60f264..df18e64f5c30 100644
--- a/devel/cvsweb3/files/patch-cvsweb.cgi
+++ b/devel/cvsweb3/files/patch-cvsweb.cgi
@@ -1,17 +1,17 @@
---- cvsweb.cgi.orig	Fri Sep 27 05:56:05 2002
-+++ cvsweb.cgi	Tue Feb 24 23:12:51 2004
+--- cvsweb.cgi.orig	Sat May  8 23:13:40 2004
++++ cvsweb.cgi	Wed May 12 15:27:34 2004
 @@ -1,4 +1,4 @@
--#!/usr/bin/perl -wT
-+#!!!PERL!! -w
+-#!/usr/bin/perl -T
++#!!!PERL!! -wT
  #
  # cvsweb - a CGI interface to CVS trees.
  #
-@@ -157,7 +157,7 @@
+@@ -214,7 +214,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;
+-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
++for (catfile($mydir, 'cvsweb.conf'), '!!PREFIX!!/etc/cvsweb/cvsweb.conf') {
+   if (-r $_) {
+     $config = $_;
+     last;
diff --git a/devel/cvsweb3/files/patch-cvsweb.conf b/devel/cvsweb3/files/patch-cvsweb.conf
index c5716494a73e..0a8d28d735d9 100644
--- a/devel/cvsweb3/files/patch-cvsweb.conf
+++ b/devel/cvsweb3/files/patch-cvsweb.conf
@@ -1,52 +1,47 @@
-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';
- 
- # 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:
+--- cvsweb.conf.orig	Wed May  5 08:40:50 2004
++++ cvsweb.conf	Wed May 12 15:50:36 2004
+@@ -47,7 +47,7 @@
+ # 'symbolic_name' => ['Name to display',  '/path/to/cvsroot']
+ #
  @CVSrepositories = (
--	'local'   => ['Local Repository', '/home/cvs'],
-+	'local'   => ['!!TITLE!!', '!!CVSROOT!!'],
- #	'freebsd' => ['FreeBSD',          '/home/ncvs'],
- #	'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";
+-        'local'   => ['Local Repository', '/var/cvs'],
++        'local'   => ['My CVS Repository', '/home/cvs'],
+ #       'freebsd' => ['FreeBSD',          '/var/ncvs'],
+ #       'openbsd' => ['OpenBSD',          '/var/ncvs'],
+ #       'netbsd'  => ['NetBSD',           '/var/ncvs'],
+@@ -202,7 +202,7 @@
+ # check out the "mini" versions in the icons/ directory; they have a
+ # width/height of 16/16.
+ #
+-my $iconsdir = '/icons';
++my $iconsdir = '/icons/cvsweb';
  
- # format:             TEXT      ICON-URL              width height
+ # 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';
+@@ -216,7 +216,7 @@
+ 
+ # An URL where to find the CSS.
+ #
+-$cssurl = '/css/cvsweb.css';
++$cssurl = '/css/cvsweb/cvsweb.css';
  
- # quick mime-type lookup; maps file-suffices to
- # mime-types for displaying checkouts in the browser.
-@@ -472,7 +472,7 @@
- $allow_tar = '';
+ # The length to which the last log entry should be truncated when shown
+ # in the directory view.
+@@ -470,7 +470,7 @@
+ # settings in the configuration file with command line options, see
+ # doGraph() and doGraphView() in cvsweb.cgi for details.
+ #
+-#$cvsgraph_config = "/etc/cvsgraph.conf";
++$cvsgraph_config = "!!PREFIX!!/etc/cvsgraph.conf";
  
- # Options to pass to tar(1).
--@tar_options = qw();
-+@tar_options = qw(--ignore-failed-read);
+ # URL to the CVSHistory script.  This should be absolute (but does not need
+ # to include the host and port if the script is on the same server as
+@@ -539,7 +539,7 @@
+ # Enables syntax highlighting using GNU Enscript if set.
+ # You will need GNU Enscript version 1.6.3 or newer for this to work.
+ #
+-#$allow_enscript = $CMD{enscript} ? 1 : 0;
++$allow_enscript = $CMD{enscript} ? 1 : 0;
  
- # e.g. @tar_options = qw(--ignore-failed-read);
- #      GNU tar has some useful options against unexpected errors.
+ # Options to pass to enscript(1).
+ # Do not set the -q, --language, -o or --highlight options here.