From 6637f3742843195df4e8d0ed4c6e66862cc56508 Mon Sep 17 00:00:00 2001
From: naddy <naddy@openbsd.org>
Date: Sat, 16 Aug 2003 23:18:41 +0000
Subject: [PATCH] * upstreamer maintainer suggests that we run without taint
 checks on perl 5.8 * cosmetics

---
 devel/cvsweb/Makefile                 |  4 ++--
 devel/cvsweb/patches/patch-cvsweb_cgi | 12 +++++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 887d708c06f..1675130bff9 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.28 2003/08/16 18:12:10 naddy Exp $
+# $OpenBSD: Makefile,v 1.29 2003/08/16 23:18:41 naddy Exp $
 # $FreeBSD: ports/devel/cvsweb/Makefile,v 1.28 2000/09/23 20:48:45 knu Exp $
 
 COMMENT=	"WWW CGI script to browse CVS repository trees"
@@ -33,7 +33,7 @@ ICONS=		back.gif dir.gif text.gif \
 SUBST_VARS=	CONFDIR
 
 do-configure:
-	@perl -i -pe 's@%%SYSCONFDIR%%@${CONFDIR}@g' ${WRKSRC}/cvsweb.cgi
+	@perl -i -pe 's@%%CONFDIR%%@${CONFDIR}@g' ${WRKSRC}/cvsweb.cgi
 
 do-install:
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/cgi-bin
diff --git a/devel/cvsweb/patches/patch-cvsweb_cgi b/devel/cvsweb/patches/patch-cvsweb_cgi
index 2380cc9ba69..914fe8f8675 100644
--- a/devel/cvsweb/patches/patch-cvsweb_cgi
+++ b/devel/cvsweb/patches/patch-cvsweb_cgi
@@ -1,12 +1,18 @@
-$OpenBSD: patch-cvsweb_cgi,v 1.10 2003/08/16 18:12:10 naddy Exp $
+$OpenBSD: patch-cvsweb_cgi,v 1.11 2003/08/16 23:18:41 naddy Exp $
 --- cvsweb.cgi.orig	2002-09-26 22:56:05.000000000 +0200
-+++ cvsweb.cgi	2003-08-16 18:22:40.000000000 +0200
++++ cvsweb.cgi	2003-08-17 01:07:29.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -wT
++#!/usr/bin/perl -w
+ #
+ # cvsweb - a CGI interface to CVS trees.
+ #
 @@ -157,7 +157,7 @@ use File::Basename ();
  
  # == EDIT this ==
  # Locations to search for user configuration, in order:
 -for ("$mydir/cvsweb.conf", '/usr/local/etc/cvsweb/cvsweb.conf') {
-+for ("$mydir/cvsweb.conf", '%%SYSCONFDIR%%/cvsweb/cvsweb.conf') {
++for ("$mydir/cvsweb.conf", '%%CONFDIR%%/cvsweb/cvsweb.conf') {
  	if (defined($_) && -r $_) {
  		$config = $_;
  		last;