Remove -l from the default cvs(1) options.

PR:		ports/69854
Submitted by:	Marco Trentini <mark@remotelab.org>
Suggested by:	scop

Replace a hardcoded /usr/local with $PREFIX.

2 files changed, 21 insertions, 8 deletions

diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index a5376b1eead9..f6d1cb462980 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	cvsweb
 PORTVERSION=	2.0.6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel www
 MASTER_SITES=	${MASTER_SITE_LOCAL} \
 		http://people.FreeBSD.org/~scop/cvsweb/
diff --git a/devel/cvsweb/files/patch-cvsweb.conf b/devel/cvsweb/files/patch-cvsweb.conf
index c5716494a73e..33786297f39e 100644
--- a/devel/cvsweb/files/patch-cvsweb.conf
+++ b/devel/cvsweb/files/patch-cvsweb.conf
@@ -1,10 +1,5 @@
-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
+--- cvsweb.conf.orig	Mon Sep 23 14:30:17 2002
++++ cvsweb.conf	Thu Aug 12 22:15:20 2004
 @@ -18,7 +18,7 @@
  #   uname, cvs, rlog, rcsdiff
  #   gzip (if you enable $allow_compress)
@@ -41,6 +36,15 @@ diff -a -u -r1.36 cvsweb.conf
  
  # quick mime-type lookup; maps file-suffices to
  # mime-types for displaying checkouts in the browser.
+@@ -368,7 +368,7 @@
+ 
+ # e.g.
+ ## unify/convert Japanese code into EUC-JP
+-#$output_filter= '/usr/local/bin/nkf -e';
++#$output_filter= '!!PREFIX!!/bin/nkf -e';
+ 
+ ##############
+ # Misc
 @@ -472,7 +472,7 @@
  $allow_tar = '';
  
@@ -50,3 +54,12 @@ diff -a -u -r1.36 cvsweb.conf
  
  # e.g. @tar_options = qw(--ignore-failed-read);
  #      GNU tar has some useful options against unexpected errors.
+@@ -495,7 +495,7 @@
+ # For cvs versions prior to 1.11, the '-l' option doesn't work; If you want
+ # working checkouts with an older cvs version, you'll have to make sure that
+ # the cvsweb user can read and write to CVSROOT/history.
+-@cvs_options = qw(-lf);
++@cvs_options = qw(-f);
+ 
+ push @cvs_options, '-R' if ($uname eq 'FreeBSD' || $uname eq 'OpenBSD');
+ push @cvs_options, '-u' if ($uname eq 'NetBSD');