* Look in /usr/pkg/etc/cvsweb before /usr/local/etc/cvsweb for

  configuration.  Noted by Bartosz Ku?ma in private mail.
* Use /usr/pkg/etc/httpd/mime.types as the default mime.types file.
* Bump PKGREVISION.

5 files changed, 43 insertions, 4 deletions

diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index ea3815b7295..2bee189adec 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,8 +1,9 @@
 #
-# $NetBSD: Makefile,v 1.19 2004/05/28 01:47:26 lukem Exp $
+# $NetBSD: Makefile,v 1.20 2004/06/09 01:54:16 lukem Exp $
 #
 
 DISTNAME=		cvsweb-3.0.1
+PKGREVISION=		1
 CATEGORIES=		www
 MASTER_SITES=		ftp://ftp.freebsd.org/pub/FreeBSD/ports/local-distfiles/scop/
 
diff --git a/www/cvsweb/distinfo b/www/cvsweb/distinfo
index 6539cf1a667..f4b34db43f4 100644
--- a/www/cvsweb/distinfo
+++ b/www/cvsweb/distinfo
@@ -1,5 +1,7 @@
-$NetBSD: distinfo,v 1.10 2004/05/28 01:47:26 lukem Exp $
+$NetBSD: distinfo,v 1.11 2004/06/09 01:54:16 lukem Exp $
 
 SHA1 (cvsweb-3.0.1.tar.gz) = 52ae5e8cc65cef7c3fdc33f9369fe00b2c5af8da
 Size (cvsweb-3.0.1.tar.gz) = 69916 bytes
-SHA1 (patch-aa) = 8aa77c9188a61c76c5ca537a85ca16426f81a086
+SHA1 (patch-aa) = 6b5b4e70a493068cae6e4859f7f86b91249d4e71
+SHA1 (patch-ab) = 7419965bf4e078c1f72e8ddb9834959215d3a477
+SHA1 (patch-ac) = f1dc55f458de536624e6c44c526490a21b3d25e0
diff --git a/www/cvsweb/patches/patch-aa b/www/cvsweb/patches/patch-aa
index a692abf1097..20acb04993d 100644
--- a/www/cvsweb/patches/patch-aa
+++ b/www/cvsweb/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.8 2004/05/28 01:47:26 lukem Exp $
+$NetBSD: patch-aa,v 1.9 2004/06/09 01:54:16 lukem Exp $
 
 --- cvsweb.conf.orig	2004-05-05 09:40:50.000000000 +1000
 +++ cvsweb.conf
@@ -11,3 +11,12 @@ $NetBSD: patch-aa,v 1.8 2004/05/28 01:47:26 lukem Exp $
  
  # Search the above directories for each command (prefer gtar over tar).
  #
+@@ -344,7 +344,7 @@ $inputTextSize = 12;
+ # The traditional mime.types file, eg. the one from Apache is fine.
+ # See above where this gets used.
+ #
+-$mime_types = '/usr/local/etc/apache/mime.types';
++$mime_types = '/usr/pkg/etc/httpd/mime.types';
+ 
+ # Charset appended to the Content-Type HTTP header for text/* MIME types.
+ # Note that the web server may default to some charset which may take effect
diff --git a/www/cvsweb/patches/patch-ab b/www/cvsweb/patches/patch-ab
new file mode 100644
index 00000000000..843ea8f9832
--- /dev/null
+++ b/www/cvsweb/patches/patch-ab
@@ -0,0 +1,15 @@
+$NetBSD: patch-ab,v 1.6 2004/06/09 01:54:16 lukem Exp $
+
+--- cvsweb.cgi.orig	2004-05-09 00:13:40.000000000 +1000
++++ cvsweb.cgi
+@@ -214,7 +214,9 @@ my ($mydir) = (dirname($0) =~ /(.*)/);  
+ 
+ # == EDIT this ==
+ # Locations to search for user configuration, in order:
+-for (catfile($mydir, 'cvsweb.conf'), '/usr/local/etc/cvsweb/cvsweb.conf') {
++for (catfile($mydir, 'cvsweb.conf'),
++    '/usr/pkg/etc/cvsweb/cvsweb.conf',
++    '/usr/local/etc/cvsweb/cvsweb.conf') {
+   if (-r $_) {
+     $config = $_;
+     last;
diff --git a/www/cvsweb/patches/patch-ac b/www/cvsweb/patches/patch-ac
new file mode 100644
index 00000000000..a55a9b6cdce
--- /dev/null
+++ b/www/cvsweb/patches/patch-ac
@@ -0,0 +1,12 @@
+$NetBSD: patch-ac,v 1.1 2004/06/09 01:54:16 lukem Exp $
+
+--- INSTALL.orig	2004-05-09 00:13:40.000000000 +1000
++++ INSTALL
+@@ -49,6 +49,7 @@ of this document.
+    configuration notes.  You'll need version 2.0 or newer.
+ 
+ 2) Copy cvsweb.conf to a configuration directory, typically
++   /usr/pkg/etc/cvsweb/cvsweb.conf or
+    /usr/local/etc/cvsweb/cvsweb.conf.
+    Edit cvsweb.conf to fit your needs, you'll probably need to tweak the
+    CVS root(s) of the Repository(ies) you want to view.