Date: Wed, 8 Oct 2003 09:25:29 +0800 (CST) From: Ying-Chieh Liao <ijliao@FreeBSD.csie.NCTU.edu.tw> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/57726: upgrade cvslines to 1.6.8 Message-ID: <20031008012529.0552B106C42@FreeBSD.csie.NCTU.edu.tw> Resent-Message-ID: <200310080130.h981UARs032218@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 57726
>Category: ports
>Synopsis: upgrade cvslines to 1.6.8
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Tue Oct 07 18:30:10 PDT 2003
>Closed-Date:
>Last-Modified:
>Originator: Ying-Chieh Liao
>Release: FreeBSD 4.9-PRERELEASE i386
>Organization:
NCTU CSIE
>Environment:
System: FreeBSD FreeBSD.csie.NCTU.edu.tw 4.9-PRERELEASE FreeBSD 4.9-PRERELEASE #0: Tue Sep 23 10:54:38 CST 2003 root@FreeBSD.csie.NCTU.edu.tw:/big/freebsd/pub/branches/4.0-stable/src/sys/compile/FREEBSD i386
>Description:
upgrade ports/devel/cvslines to 1.6.8
>How-To-Repeat:
>Fix:
Index: Makefile
===================================================================
RCS file: /home/pcvs/ports/devel/cvslines/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- Makefile 1 Mar 2003 14:34:25 -0000 1.6
+++ Makefile 8 Oct 2003 01:23:45 -0000
@@ -5,24 +5,24 @@
# $FreeBSD: ports/devel/cvslines/Makefile,v 1.6 2003/03/01 14:34:25 trevor Exp $
#
-PORTNAME= cvslines
-PORTVERSION= 1.6.7
-CATEGORIES= devel
-MASTER_SITES= ${MASTER_SITE_LOCAL} \
- http://www.netsw.org/softeng/versioncontrol/repository/cvs/cvslines/
-MASTER_SITE_SUBDIR= jkoshy
+PORTNAME= cvslines
+PORTVERSION= 1.6.8
+CATEGORIES= devel
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
-MAINTAINER= trevor@FreeBSD.org
-COMMENT= Wrapper to ease merging of changes between CVS branches
+MAINTAINER= trevor@FreeBSD.org
+COMMENT= Wrapper to ease merging of changes between CVS branches
-PLIST= ${WRKDIR}/pkg-plist
-USE_PERL5= yes
-NO_BUILD= yes
+WRKSRC= ${WRKDIR}/${PORTNAME}
+PLIST= ${WRKDIR}/pkg-plist
+USE_PERL5= yes
+NO_BUILD= yes
MAN1= cvslines.1
pre-patch:
- ${PERL} -pi -e "s:usr/local/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines
+ ${PERL} -pi -e "s:usr/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines
${PERL} -pi -e "s:the the:the:g" ${WRKSRC}/cvslines.1
pre-install:
Index: distinfo
===================================================================
RCS file: /home/pcvs/ports/devel/cvslines/distinfo,v
retrieving revision 1.1
diff -u -r1.1 distinfo
--- distinfo 7 Feb 2002 22:28:37 -0000 1.1
+++ distinfo 8 Oct 2003 01:23:45 -0000
@@ -1 +1 @@
-MD5 (cvslines-1.6.7.tar.gz) = efca84137a552925f84b0084d833021a
+MD5 (cvslines-1.6.8.tar.gz) = 593dee98bdfd5a8e238114fa09f5aa13
Index: pkg-descr
===================================================================
RCS file: /home/pcvs/ports/devel/cvslines/pkg-descr,v
retrieving revision 1.4
diff -u -r1.4 pkg-descr
--- pkg-descr 7 Feb 2002 22:28:37 -0000 1.4
+++ pkg-descr 8 Oct 2003 01:23:45 -0000
@@ -5,4 +5,4 @@
between various cvs branches, where the branches represent different
lines of development.
-WWW: http://www.floating.co.uk/netapp/technology/freeware/cvslines/
+WWW: http://cvslines.sourceforge.net/
Index: files/patch-aa
===================================================================
RCS file: /home/pcvs/ports/devel/cvslines/files/patch-aa,v
retrieving revision 1.3
diff -u -r1.3 patch-aa
--- files/patch-aa 7 Feb 2002 22:28:37 -0000 1.3
+++ files/patch-aa 8 Oct 2003 01:23:45 -0000
@@ -1,10 +1,10 @@
---- CONFIG.old Wed May 21 11:39:38 1997
-+++ CONFIG Fri Feb 1 04:43:42 2002
+--- CONFIG.orig Wed Oct 8 09:16:47 2003
++++ CONFIG Wed Oct 8 09:18:54 2003
@@ -14,17 +14,17 @@
# The absolute path to the perl interpreter to use.
# INSTALL will substitute this into the #!... line.
#
--if (! defined($PERL5)) { $PERL5 = "/usr/local/bin/perl5"; } # cfg
+-if (! defined($PERL5)) { $PERL5 = "/usr/bin/perl"; } # cfg
+if (! defined($PERL5)) { $PERL5 = "$ENV{'PERL5'}"; } # cfg
# Where to install the cvslines scripts...
@@ -21,12 +21,12 @@
######################################################################
#
-@@ -52,7 +52,7 @@
-
- # Where the RCS to use with cvslines is kept.
+@@ -40,7 +40,7 @@
+ # This is used so that debug versions can know they are and alter
+ # logging behavior, etc.
#
--\$RCSBIN = "$BINDIR"; # cfg
-+\$RCSBIN = "/usr/bin/"; # cfg
-
- 1;
+-\$RELDIR = "$BINDIR"; # cfg
++\$RELDIR = "/usr/bin"; # cfg
+ # Where the cvslines log file is written.
+ #
Index: files/patch-ab
===================================================================
RCS file: /home/pcvs/ports/devel/cvslines/files/patch-ab,v
retrieving revision 1.3
diff -u -r1.3 patch-ab
--- files/patch-ab 7 Feb 2002 22:28:37 -0000 1.3
+++ files/patch-ab 8 Oct 2003 01:23:45 -0000
@@ -1,5 +1,5 @@
---- INSTALL-- Thu May 22 03:36:16 1997
-+++ INSTALL Tue Aug 25 14:26:30 1998
+--- INSTALL.orig Fri Apr 19 21:26:39 2002
++++ INSTALL Wed Oct 8 09:22:22 2003
@@ -73,7 +73,7 @@
}
@@ -9,24 +9,29 @@
($u_os, $u_host, $u_osrel) = split(/\s+/, $uname);
# Try to find things in the usual places, but failing those,
-@@ -121,7 +121,8 @@
- {
+@@ -122,6 +122,7 @@
if ( ! ( ($u_os eq "SunOS" && $u_osrel =~ /^5\./)
|| ($u_os eq "SunOS" && $u_osrel =~ /^4\./)
-- || ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)))
-+ || ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)
-+ || ($u_os eq "FreeBSD")))
+ || ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)
++ || ($u_os eq "FreeBSD")
+ || ($u_os eq "Linux")))
{
print STDERR <<MSG;
- $Myname:
-@@ -148,9 +149,8 @@
- cvslines has been tested with cvs 1.9. The "cvs" command found via
- your \$PATH provided the following version information:
+@@ -134,7 +135,7 @@
+
+ (press Return to continue with the install...)
+ MSG
+- $ans = <STDIN>;
++# $ans = <STDIN>;
+ }
+
+ $cvs_versmsg = `cvs -v`;
+@@ -151,7 +152,7 @@
$cvs_versmsg
-- (press Return to continue with the install...)
+ (press Return to continue with the install...)
MSG
- $ans = <STDIN>;
-+ # $ans = <STDIN>;
++# $ans = <STDIN>;
}
}
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20031008012529.0552B106C42>