Attachment #97271 for bug #135987

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




#

PORTNAME=	cvs2p4
PORTVERSION=	3.1
CATEGORIES+=	devel
MASTER_SITES=	ftp://public.perforce.com/public/perforce/utils/cvs2p4/ \
		${MASTER_SITE_LOCAL}
MASTER_SITE_SUBDIR=	erwin
EXTRACT_SUFX=	.tar

MAINTAINER=	scjamorim@bsd.com.br
COMMENT=	CVS to Perforce Converter

REINPLACE_ARGS=	-i ""

	@${REINPLACE_CMD} \
		-e 's,!!PREFIX!!,${PREFIX},g;' \
		-e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \
		${WRKSRC}/test/config.test
	@${FIND} ${WRKSRC} -name '*.orig' -delete
	@${FIND} ${WRKSRC} -name '*.bak' -delete


Lines 1-3 Link Here

(-)distinfo (-3 / +3 lines)
1	MD5 (cvs2p4-2.5.5.tar) = 91e58b2f36f09bd5d05e8bb4228e7add	1	MD5 (cvs2p4-3.1.tar) = b6c9e0edde16ba8d623ebb7cac91e83e
2	SHA256 (cvs2p4-2.5.5.tar) = 0aa89aaefe45d75a2f69359963061dbd77dba2e54c5d0d8541385cd264b478c0	2	SHA256 (cvs2p4-3.1.tar) = 0e6131c645246bbcdbb01fe95b9606fd1e6ec5320265aca1be3bee63da14f0d0
3	SIZE (cvs2p4-2.5.5.tar) = 204800	3	SIZE (cvs2p4-3.1.tar) = 276480

Lines 1-7 Link Here

(-)pkg-plist (-4 / +12 lines)
1	cvs2p4/Artistic
2	cvs2p4/MANIFEST	1	cvs2p4/MANIFEST
3	cvs2p4/NEWS	2	cvs2p4/NEWS
4	cvs2p4/README	3	cvs2p4/README
		4	cvs2p4/config.tmpl
		5	cvs2p4/bin/cvs2p4
5	cvs2p4/bin/dochanges	6	cvs2p4/bin/dochanges
6	cvs2p4/bin/dolabels	7	cvs2p4/bin/dolabels
7	cvs2p4/bin/genchanges	8	cvs2p4/bin/genchanges
Lines 11-20 Link Here
11	cvs2p4/lib/util.pl	12	cvs2p4/lib/util.pl
12	cvs2p4/test/Attic/datefile,v	13	cvs2p4/test/Attic/datefile,v
13	cvs2p4/test/at@file,v	14	cvs2p4/test/at@file,v
		15	cvs2p4/test/brmap.pl
14	cvs2p4/test/changes.good	16	cvs2p4/test/changes.good
15	cvs2p4/test/config	17	cvs2p4/test/config.test
16	cvs2p4/test/datefile_readd,v	18	cvs2p4/test/datefile_readd,v
17	cvs2p4/test/dollar$file,v	19	cvs2p4/test/dollar$file,v
		20	cvs2p4/test/exclude_branches
		21	cvs2p4/test/exclude_tags
18	cvs2p4/test/file,v	22	cvs2p4/test/file,v
19	cvs2p4/test/lines.good	23	cvs2p4/test/lines.good
20	cvs2p4/test/metadata.good	24	cvs2p4/test/metadata.good
Lines 30-37 Link Here
30	cvs2p4/test/runtest	34	cvs2p4/test/runtest
31	cvs2p4/test/space file,v	35	cvs2p4/test/space file,v
32	cvs2p4/test/star*file,v	36	cvs2p4/test/star*file,v
		37	cvs2p4/src/rcs-5.7/src/rlog.c.patch
		38	@dirrm cvs2p4/bin
		39	@dirrm cvs2p4/lib
		40	@dirrm cvs2p4/src/rcs-5.7/src
		41	@dirrm cvs2p4/src/rcs-5.7
		42	@dirrm cvs2p4/src
33	@dirrm cvs2p4/test/Attic	43	@dirrm cvs2p4/test/Attic
34	@dirrm cvs2p4/test	44	@dirrm cvs2p4/test
35	@dirrm cvs2p4/lib
36	@dirrm cvs2p4/bin
37	@dirrm cvs2p4	45	@dirrm cvs2p4




--- test/config.orig	Wed Aug 27 23:35:53 2003
+++ test/config	Sat Oct  2 01:06:28 2004
@@ -6,7 +6,7 @@
 
 # p4 command location (If other than "/usr/local/bin/p4")
 #
-$P4		= "/usr/local/bin/p4";
+$P4		= "!!PREFIX!!/bin/p4";
 
 # p4 command location (If other than "/usr/local/bin/p4d")
 #
@@ -14,7 +14,7 @@
 
 # Perforce server we're using.
 #
-$P4PORT = "localhost:1680";
+$P4PORT = "!!PERFORCE_PORT!!";
 
 # Perforce server's P4ROOT
 #
@@ -99,7 +99,7 @@
 # Perforce. But if that makes you nervous, you can set this to
 # "trunk".
 #
-$TRUNKLINE    	= "shemp";
+$TRUNKLINE    	= "head";
 
 # Conventional branch tag name suffix to remove when importing to
 # Perforce. (This is a netapp specific thing; our branch tags were

Return to bug 135987

Lines 6-19 Link Here

(-)Makefile (-3 / +3 lines)
6	#	6	#
7		7
8	PORTNAME= cvs2p4	8	PORTNAME= cvs2p4
9	PORTVERSION= 2.5.5	9	PORTVERSION= 3.1
10	CATEGORIES+= devel	10	CATEGORIES+= devel
11	MASTER_SITES= ftp://public.perforce.com/public/perforce/utils/cvs2p4/ \	11	MASTER_SITES= ftp://public.perforce.com/public/perforce/utils/cvs2p4/ \
12	${MASTER_SITE_LOCAL}	12	${MASTER_SITE_LOCAL}
13	MASTER_SITE_SUBDIR= erwin	13	MASTER_SITE_SUBDIR= erwin
14	EXTRACT_SUFX= .tar	14	EXTRACT_SUFX= .tar
15		15
16	MAINTAINER= ports@FreeBSD.org	16	MAINTAINER= scjamorim@bsd.com.br
17	COMMENT= CVS to Perforce Converter	17	COMMENT= CVS to Perforce Converter
18		18
19	REINPLACE_ARGS= -i ""	19	REINPLACE_ARGS= -i ""
Lines 27-33 Link Here
27	@${REINPLACE_CMD} \	27	@${REINPLACE_CMD} \
28	-e 's,!!PREFIX!!,${PREFIX},g;' \	28	-e 's,!!PREFIX!!,${PREFIX},g;' \
29	-e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \	29	-e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \
30	${WRKSRC}/test/config	30	${WRKSRC}/test/config.test
31	@${FIND} ${WRKSRC} -name '*.orig' -delete	31	@${FIND} ${WRKSRC} -name '*.orig' -delete
32	@${FIND} ${WRKSRC} -name '*.bak' -delete	32	@${FIND} ${WRKSRC} -name '*.bak' -delete
33		33

Removed Link Here

(-)files/patch-config (-29 lines)
1	--- test/config.orig Wed Aug 27 23:35:53 2003
2	+++ test/config Sat Oct 2 01:06:28 2004
3	@@ -6,7 +6,7 @@
4
5	# p4 command location (If other than "/usr/local/bin/p4")
6	#
7	-$P4 = "/usr/local/bin/p4";
8	+$P4 = "!!PREFIX!!/bin/p4";
9
10	# p4 command location (If other than "/usr/local/bin/p4d")
11	#
12	@@ -14,7 +14,7 @@
13
14	# Perforce server we're using.
15	#
16	-$P4PORT = "localhost:1680";
17	+$P4PORT = "!!PERFORCE_PORT!!";
18
19	# Perforce server's P4ROOT
20	#
21	@@ -99,7 +99,7 @@
22	# Perforce. But if that makes you nervous, you can set this to
23	# "trunk".
24	#
25	-$TRUNKLINE = "shemp";
26	+$TRUNKLINE = "head";
27
28	# Conventional branch tag name suffix to remove when importing to
29	# Perforce. (This is a netapp specific thing; our branch tags were