Attachment #35838 for bug #57726

View | Details | Raw Unified | Return to bug 57726
Collapse All | Expand All




# $FreeBSD: ports/devel/cvslines/Makefile,v 1.6 2003/03/01 14:34:25 trevor Exp $
#

PORTNAME=	cvslines
PORTVERSION=	1.6.8
CATEGORIES=	devel
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR=	${PORTNAME}
MASTER_SITE_SUBDIR=	jkoshy

MAINTAINER=	trevor@FreeBSD.org
COMMENT=	Wrapper to ease merging of changes between CVS branches

WRKSRC=		${WRKDIR}/${PORTNAME}
PLIST=		${WRKDIR}/pkg-plist
USE_PERL5=	yes
NO_BUILD=	yes

MAN1=	cvslines.1

pre-patch:
	${PERL} -pi -e "s:usr/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines
	${PERL} -pi -e "s:the the:the:g" ${WRKSRC}/cvslines.1

pre-install:

Line 1 Link Here

(-)distinfo (-1 / +1 lines)
1	MD5 (cvslines-1.6.7.tar.gz) = efca84137a552925f84b0084d833021a	1	MD5 (cvslines-1.6.8.tar.gz) = 593dee98bdfd5a8e238114fa09f5aa13

Lines 5-8 Link Here

(-)pkg-descr (-1 / +1 lines)
5	between various cvs branches, where the branches represent different	5	between various cvs branches, where the branches represent different
6	lines of development.	6	lines of development.
7		7
8	WWW: http://www.floating.co.uk/netapp/technology/freeware/cvslines/	8	WWW: http://cvslines.sourceforge.net/




--- 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/bin/perl"; }   # cfg
+if (! defined($PERL5)) { $PERL5 = "$ENV{'PERL5'}"; }   # cfg
 
 #  Where to install the cvslines scripts...

 
 ######################################################################
 #
@@ -40,7 +40,7 @@
 #  This is used so that debug versions can know they are and alter
 #  logging behavior, etc.
 #
-\$RELDIR = "$BINDIR";                # cfg
+\$RELDIR = "/usr/bin";                # cfg
 
 1;
 
 #  Where the cvslines log file is written.
 #




--- INSTALL.orig	Fri Apr 19 21:26:39 2002
+++ INSTALL	Wed Oct  8 09:22:22 2003
@@ -73,7 +73,7 @@
 }
    

 ($u_os, $u_host, $u_osrel) = split(/\s+/, $uname);
 
 #  Try to find things in the usual places, but failing those,
@@ -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 "FreeBSD")
 	        || ($u_os eq "Linux")))
       {
         print STDERR <<MSG;
@@ -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...)
 MSG
-        $ans = <STDIN>;    
+#        $ans = <STDIN>;    
 
       }
   }

Return to bug 57726

Lines 5-28 Link Here

(-)Makefile (-12 / +12 lines)
5	# $FreeBSD: ports/devel/cvslines/Makefile,v 1.6 2003/03/01 14:34:25 trevor Exp $	5	# $FreeBSD: ports/devel/cvslines/Makefile,v 1.6 2003/03/01 14:34:25 trevor Exp $
6	#	6	#
7		7
8	PORTNAME= cvslines	8	PORTNAME= cvslines
9	PORTVERSION= 1.6.7	9	PORTVERSION= 1.6.8
10	CATEGORIES= devel	10	CATEGORIES= devel
11	MASTER_SITES= ${MASTER_SITE_LOCAL} \	11	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
12	http://www.netsw.org/softeng/versioncontrol/repository/cvs/cvslines/	12	MASTER_SITE_SUBDIR= ${PORTNAME}
13	MASTER_SITE_SUBDIR= jkoshy
14		13
15	MAINTAINER= trevor@FreeBSD.org	14	MAINTAINER= trevor@FreeBSD.org
16	COMMENT= Wrapper to ease merging of changes between CVS branches	15	COMMENT= Wrapper to ease merging of changes between CVS branches
17		16
18	PLIST= ${WRKDIR}/pkg-plist	17	WRKSRC= ${WRKDIR}/${PORTNAME}
19	USE_PERL5= yes	18	PLIST= ${WRKDIR}/pkg-plist
20	NO_BUILD= yes	19	USE_PERL5= yes
		20	NO_BUILD= yes
21		21
22	MAN1= cvslines.1	22	MAN1= cvslines.1
23		23
24	pre-patch:	24	pre-patch:
25	${PERL} -pi -e "s:usr/local/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines	25	${PERL} -pi -e "s:usr/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines
26	${PERL} -pi -e "s:the the:the:g" ${WRKSRC}/cvslines.1	26	${PERL} -pi -e "s:the the:the:g" ${WRKSRC}/cvslines.1
27		27
28	pre-install:	28	pre-install:

Lines 1-10 Link Here

(-)files/patch-aa (-10 / +10 lines)
1	--- CONFIG.old Wed May 21 11:39:38 1997	1	--- CONFIG.orig Wed Oct 8 09:16:47 2003
2	+++ CONFIG Fri Feb 1 04:43:42 2002	2	+++ CONFIG Wed Oct 8 09:18:54 2003
3	@@ -14,17 +14,17 @@	3	@@ -14,17 +14,17 @@
4	# The absolute path to the perl interpreter to use.	4	# The absolute path to the perl interpreter to use.
5	# INSTALL will substitute this into the #!... line.	5	# INSTALL will substitute this into the #!... line.
6	#	6	#
7	-if (! defined($PERL5)) { $PERL5 = "/usr/local/bin/perl5"; } # cfg	7	-if (! defined($PERL5)) { $PERL5 = "/usr/bin/perl"; } # cfg
8	+if (! defined($PERL5)) { $PERL5 = "$ENV{'PERL5'}"; } # cfg	8	+if (! defined($PERL5)) { $PERL5 = "$ENV{'PERL5'}"; } # cfg
9		9
10	# Where to install the cvslines scripts...	10	# Where to install the cvslines scripts...
Lines 21-32 Link Here
21		21
22	######################################################################	22	######################################################################
23	#	23	#
24	@@ -52,7 +52,7 @@	24	@@ -40,7 +40,7 @@
25		25	# This is used so that debug versions can know they are and alter
26	# Where the RCS to use with cvslines is kept.	26	# logging behavior, etc.
27	#	27	#
28	-\$RCSBIN = "$BINDIR"; # cfg	28	-\$RELDIR = "$BINDIR"; # cfg
29	+\$RCSBIN = "/usr/bin/"; # cfg	29	+\$RELDIR = "/usr/bin"; # cfg
30
31	1;
32		30
		31	# Where the cvslines log file is written.
		32	#

Lines 1-5 Link Here

(-)files/patch-ab (-13 / +18 lines)
1	--- INSTALL-- Thu May 22 03:36:16 1997	1	--- INSTALL.orig Fri Apr 19 21:26:39 2002
2	+++ INSTALL Tue Aug 25 14:26:30 1998	2	+++ INSTALL Wed Oct 8 09:22:22 2003
3	@@ -73,7 +73,7 @@	3	@@ -73,7 +73,7 @@
4	}	4	}
5		5
Lines 9-32 Link Here
9	($u_os, $u_host, $u_osrel) = split(/\s+/, $uname);	9	($u_os, $u_host, $u_osrel) = split(/\s+/, $uname);
10		10
11	# Try to find things in the usual places, but failing those,	11	# Try to find things in the usual places, but failing those,
12	@@ -121,7 +121,8 @@	12	@@ -122,6 +122,7 @@
13	{
14	if ( ! ( ($u_os eq "SunOS" && $u_osrel =~ /^5\./)	13	if ( ! ( ($u_os eq "SunOS" && $u_osrel =~ /^5\./)
15	\|\| ($u_os eq "SunOS" && $u_osrel =~ /^4\./)	14	\|\| ($u_os eq "SunOS" && $u_osrel =~ /^4\./)
16	- \|\| ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)))	15	\|\| ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)
17	+ \|\| ($u_os eq "OSF1" && $u_osrel =~ /^V[34]\./)	16	+ \|\| ($u_os eq "FreeBSD")
18	+ \|\| ($u_os eq "FreeBSD")))	17	\|\| ($u_os eq "Linux")))
19	{	18	{
20	print STDERR <<MSG;	19	print STDERR <<MSG;
21	$Myname:	20	@@ -134,7 +135,7 @@
22	@@ -148,9 +149,8 @@	21
23	cvslines has been tested with cvs 1.9. The "cvs" command found via	22	(press Return to continue with the install...)
24	your \$PATH provided the following version information:	23	MSG
		24	- $ans = <STDIN>;
		25	+# $ans = <STDIN>;
		26	}
		27
		28	$cvs_versmsg = `cvs -v`;
		29	@@ -151,7 +152,7 @@
25	$cvs_versmsg	30	$cvs_versmsg
26	- (press Return to continue with the install...)	31	(press Return to continue with the install...)
27	MSG	32	MSG
28	- $ans = <STDIN>;	33	- $ans = <STDIN>;
29	+ # $ans = <STDIN>;	34	+# $ans = <STDIN>;
30		35
31	}	36	}
32	}	37	}