Attachment 144445 Details for Bug 191648 – Perforce ports patch

[patch] Perforce ports patch

p4.ports.diff (text/plain), 14.33 KB, created by Gordon Tetlow on 2014-07-06 04:46:58 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gordon Tetlow

Created: 2014-07-06 04:46:58 UTC

Size: 14.33 KB

patch

obsolete

>Index: p4/Makefile
>===================================================================
>--- p4/Makefile	(revision 359181)
>+++ p4/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	p4
>-PORTVERSION=	2012.1.473528
>+PORTVERSION=	2014.1.821990
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
> 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
>Index: p4/Makefile.inc
>===================================================================
>--- p4/Makefile.inc	(revision 359181)
>+++ p4/Makefile.inc	(working copy)
>@@ -1,18 +1,18 @@
> # Figure out what to install
> .if ${ARCH} == amd64
>-. if ${OSVERSION} >= 700043
>+. if ${OSVERSION} >= 1000100
>+PLATFORM=	freebsd100x86_64
>+. elif ${OSVERSION} >= 700043
> PLATFORM=	freebsd70x86_64
>-. elif ${OSVERSION} >= 600033
>-PLATFORM=	freebsd60x86_64
> . else
> IGNORE=		unsupported OS release, sorry
> . endif
> 
> .elif ${ARCH} == i386
>-. if ${OSVERSION} >= 700043
>+. if ${OSVERSION} >= 1000100
>+PLATFORM=	freebsd100x86
>+. elif ${OSVERSION} >= 700043
> PLATFORM=	freebsd70x86
>-. elif ${OSVERSION} >= 600033
>-PLATFORM=	freebsd60x86
> . else
> IGNORE=		unsupported OS release, sorry
> . endif
>Index: p4/distinfo.freebsd100x86
>===================================================================
>--- p4/distinfo.freebsd100x86	(revision 0)
>+++ p4/distinfo.freebsd100x86	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.821990/bin.freebsd100x86/p4) = cc452d3df4b646aa7ad971b8500fb85ecfee6dcb88034d1da4182e2eae820c9a
>+SIZE (perforce/2014.1.821990/bin.freebsd100x86/p4) = 2448372
>Index: p4/distinfo.freebsd100x86_64
>===================================================================
>--- p4/distinfo.freebsd100x86_64	(revision 0)
>+++ p4/distinfo.freebsd100x86_64	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.821990/bin.freebsd100x86_64/p4) = ac7cf3fe13011d31c190fb0f07043a61fb1321840851f28962ba8250fc371a2c
>+SIZE (perforce/2014.1.821990/bin.freebsd100x86_64/p4) = 2700576
>Index: p4/distinfo.freebsd60x86
>===================================================================
>--- p4/distinfo.freebsd60x86	(revision 359181)
>+++ p4/distinfo.freebsd60x86	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.473528/bin.freebsd60x86/p4) = c922ecfd34ad4233424f003397f6ef76d0914d9177fcb969997abccaa0427600
>-SIZE (perforce/2012.1.473528/bin.freebsd60x86/p4) = 1980644
>Index: p4/distinfo.freebsd60x86_64
>===================================================================
>--- p4/distinfo.freebsd60x86_64	(revision 359181)
>+++ p4/distinfo.freebsd60x86_64	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.473528/bin.freebsd60x86_64/p4) = 2b4db27df4d804338275b5ce7db9bf0e1b88ef6e98566bcd007c013a7c7bf1bb
>-SIZE (perforce/2012.1.473528/bin.freebsd60x86_64/p4) = 2241672
>Index: p4/distinfo.freebsd70x86
>===================================================================
>--- p4/distinfo.freebsd70x86	(revision 359181)
>+++ p4/distinfo.freebsd70x86	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.473528/bin.freebsd70x86/p4) = 647b063f56b0ce09846fb3214813ed58b6143d3a7b26b33236b2a3fa3467567e
>-SIZE (perforce/2012.1.473528/bin.freebsd70x86/p4) = 2131248
>+SHA256 (perforce/2014.1.821990/bin.freebsd70x86/p4) = eed7ad02ab5a8647af50a68bcf85b23b405eb95fbccc0c30b99ad32142e23635
>+SIZE (perforce/2014.1.821990/bin.freebsd70x86/p4) = 2528000
>Index: p4/distinfo.freebsd70x86_64
>===================================================================
>--- p4/distinfo.freebsd70x86_64	(revision 359181)
>+++ p4/distinfo.freebsd70x86_64	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.473528/bin.freebsd70x86_64/p4) = b00add837d1ef4a6f112be04b3a191f1f5e2a273b509689c03ba2f5a71ce9545
>-SIZE (perforce/2012.1.473528/bin.freebsd70x86_64/p4) = 2216352
>+SHA256 (perforce/2014.1.821990/bin.freebsd70x86_64/p4) = c2cf42a142e40a739e754cb47a795c1cc54a28ca73d3a3ac83500b835643dd21
>+SIZE (perforce/2014.1.821990/bin.freebsd70x86_64/p4) = 2686728
>Index: p4d/Makefile
>===================================================================
>--- p4d/Makefile	(revision 359181)
>+++ p4d/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	p4d
>-PORTVERSION=	2012.1.876219
>+PORTVERSION=	2014.1.886167
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
> 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
>Index: p4d/distinfo.freebsd100x86
>===================================================================
>--- p4d/distinfo.freebsd100x86	(revision 0)
>+++ p4d/distinfo.freebsd100x86	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.886167/bin.freebsd100x86/p4d) = 2308290729df1fb4f891eb09836b194cf528eaa2413d9d10a2352cd985a90f10
>+SIZE (perforce/2014.1.886167/bin.freebsd100x86/p4d) = 4512936
>Index: p4d/distinfo.freebsd100x86_64
>===================================================================
>--- p4d/distinfo.freebsd100x86_64	(revision 0)
>+++ p4d/distinfo.freebsd100x86_64	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.886167/bin.freebsd100x86_64/p4d) = 6cc64e5bd8d3e0052b8b46bd5899a2b46be474be89d4e83828597addfbb761d7
>+SIZE (perforce/2014.1.886167/bin.freebsd100x86_64/p4d) = 4683488
>Index: p4d/distinfo.freebsd60x86
>===================================================================
>--- p4d/distinfo.freebsd60x86	(revision 359181)
>+++ p4d/distinfo.freebsd60x86	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.876219/bin.freebsd60x86/p4d) = fc5564c148fdfaa9f23d2f232f515039d69b2721352129d76d1f4b0d61f9a782
>-SIZE (perforce/2012.1.876219/bin.freebsd60x86/p4d) = 3825092
>Index: p4d/distinfo.freebsd60x86_64
>===================================================================
>--- p4d/distinfo.freebsd60x86_64	(revision 359181)
>+++ p4d/distinfo.freebsd60x86_64	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.876219/bin.freebsd60x86_64/p4d) = b7e4381940f963822cca7c591e987b36f5f67e1771594a83bfc8cd8a7dec92e5
>-SIZE (perforce/2012.1.876219/bin.freebsd60x86_64/p4d) = 4377688
>Index: p4d/distinfo.freebsd70x86
>===================================================================
>--- p4d/distinfo.freebsd70x86	(revision 359181)
>+++ p4d/distinfo.freebsd70x86	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.876219/bin.freebsd70x86/p4d) = 44b114233e9ed3d3e0f84ec010d82ae9d52de40fb26bae37d3fe43f4ab501192
>-SIZE (perforce/2012.1.876219/bin.freebsd70x86/p4d) = 4096716
>+SHA256 (perforce/2014.1.886167/bin.freebsd70x86/p4d) = 9bcb1f1d879bfaf495ec32b68d01ccb5fad54919df95492656a460eaf72f4fdd
>+SIZE (perforce/2014.1.886167/bin.freebsd70x86/p4d) = 4860976
>Index: p4d/distinfo.freebsd70x86_64
>===================================================================
>--- p4d/distinfo.freebsd70x86_64	(revision 359181)
>+++ p4d/distinfo.freebsd70x86_64	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.876219/bin.freebsd70x86_64/p4d) = da2452b263d36dfeba2548dc3292e94ab543ca3b10bce2706578ab8bcb8eacc3
>-SIZE (perforce/2012.1.876219/bin.freebsd70x86_64/p4d) = 4264112
>+SHA256 (perforce/2014.1.886167/bin.freebsd70x86_64/p4d) = e70b1f4f4c5c4cb8f7a3af83f8c1934ee284547a390ec8aedf4bf7783caced1e
>+SIZE (perforce/2014.1.886167/bin.freebsd70x86_64/p4d) = 5026384
>Index: p4ftpd/Makefile
>===================================================================
>--- p4ftpd/Makefile	(revision 359181)
>+++ p4ftpd/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	p4ftpd
>-PORTVERSION=	2012.1.442152
>+PORTVERSION=	2014.1.821990
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
> 		http://filehost.perforce.com/perforce/r${P4VERSION}/bin.${PLATFORM}/
>@@ -13,7 +13,7 @@
> MAINTAINER=	gordon@FreeBSD.org
> COMMENT=	Perforce server
> 
>-ONLY_FOR_ARCHS=	amd64 i386 sparc64
>+ONLY_FOR_ARCHS=	amd64 i386
> 
> P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
> DIST_SUBDIR=	perforce/${PORTVERSION}/bin.${PLATFORM}
>Index: p4ftpd/distinfo.freebsd100x86
>===================================================================
>--- p4ftpd/distinfo.freebsd100x86	(revision 0)
>+++ p4ftpd/distinfo.freebsd100x86	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.821990/bin.freebsd100x86/p4ftpd) = af7e7ae4700cb7b0adc80c034199ca5756047b20218a69f4eddd9ef334432869
>+SIZE (perforce/2014.1.821990/bin.freebsd100x86/p4ftpd) = 2522656
>Index: p4ftpd/distinfo.freebsd100x86_64
>===================================================================
>--- p4ftpd/distinfo.freebsd100x86_64	(revision 0)
>+++ p4ftpd/distinfo.freebsd100x86_64	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.821990/bin.freebsd100x86_64/p4ftpd) = 4413ad393f6c3a89606e7e1f20ecc18f33bdfa4dbbb4e3f2cfcc5c03a21e2c86
>+SIZE (perforce/2014.1.821990/bin.freebsd100x86_64/p4ftpd) = 2777616
>Index: p4ftpd/distinfo.freebsd60x86
>===================================================================
>--- p4ftpd/distinfo.freebsd60x86	(revision 359181)
>+++ p4ftpd/distinfo.freebsd60x86	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.442152/bin.freebsd60x86/p4ftpd) = 2cda8eaff54bbf57c5ffe7a5c5b106d8edcc73edfccf530123c314b2806b2b66
>-SIZE (perforce/2012.1.442152/bin.freebsd60x86/p4ftpd) = 2150340
>Index: p4ftpd/distinfo.freebsd60x86_64
>===================================================================
>--- p4ftpd/distinfo.freebsd60x86_64	(revision 359181)
>+++ p4ftpd/distinfo.freebsd60x86_64	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.442152/bin.freebsd60x86_64/p4ftpd) = 6d304cb110e68e6fe0df2fa1e417d25432c10412e78fec1ef02ac780330f779f
>-SIZE (perforce/2012.1.442152/bin.freebsd60x86_64/p4ftpd) = 2368040
>Index: p4ftpd/distinfo.freebsd70x86
>===================================================================
>--- p4ftpd/distinfo.freebsd70x86	(revision 359181)
>+++ p4ftpd/distinfo.freebsd70x86	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.442152/bin.freebsd70x86/p4ftpd) = 6e4c5045484c734911094fd7ce7fbf4828b2ec509fc359be748dfb5ce7e44bc9
>-SIZE (perforce/2012.1.442152/bin.freebsd70x86/p4ftpd) = 2319088
>+SHA256 (perforce/2014.1.821990/bin.freebsd70x86/p4ftpd) = d0c75f0b99768e73213957ec7c4672aa9fe9bc48c531703d26582d75c06b3052
>+SIZE (perforce/2014.1.821990/bin.freebsd70x86/p4ftpd) = 2599132
>Index: p4ftpd/distinfo.freebsd70x86_64
>===================================================================
>--- p4ftpd/distinfo.freebsd70x86_64	(revision 359181)
>+++ p4ftpd/distinfo.freebsd70x86_64	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.442152/bin.freebsd70x86_64/p4ftpd) = 1d18b5678c4384855cd6ef99b03de2aaab7f1e7928df0e9a3bf1b3c1dee7a6d9
>-SIZE (perforce/2012.1.442152/bin.freebsd70x86_64/p4ftpd) = 2362208
>+SHA256 (perforce/2014.1.821990/bin.freebsd70x86_64/p4ftpd) = c9cbfbc988cfa277a52c67dc1f61f8952d6b59e19d8f0c6c25f86a7e499fdc65
>+SIZE (perforce/2014.1.821990/bin.freebsd70x86_64/p4ftpd) = 2765792
>Index: p4p/Makefile
>===================================================================
>--- p4p/Makefile	(revision 359181)
>+++ p4p/Makefile	(working copy)
>@@ -2,7 +2,7 @@
> # $FreeBSD$
> 
> PORTNAME=	p4p
>-PORTVERSION=	2012.1.549175
>+PORTVERSION=	2014.1.821990
> CATEGORIES=	devel
> MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
> 		http://filehost.perforce.com/perforce/r${P4VERSION}/bin.${PLATFORM}/
>Index: p4p/distinfo.freebsd100x86
>===================================================================
>--- p4p/distinfo.freebsd100x86	(revision 0)
>+++ p4p/distinfo.freebsd100x86	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.821990/bin.freebsd100x86/p4p) = ff83a187e2120e2efd4bcaeae7a637647085204fe4fad8180ef753cbf4747774
>+SIZE (perforce/2014.1.821990/bin.freebsd100x86/p4p) = 2214504
>Index: p4p/distinfo.freebsd100x86_64
>===================================================================
>--- p4p/distinfo.freebsd100x86_64	(revision 0)
>+++ p4p/distinfo.freebsd100x86_64	(working copy)
>@@ -0,0 +1,2 @@
>+SHA256 (perforce/2014.1.821990/bin.freebsd100x86_64/p4p) = 4f1d5c7ad8bf732a5ee34bb076430ff2e5eb22f6386935437e56cd617609ed8a
>+SIZE (perforce/2014.1.821990/bin.freebsd100x86_64/p4p) = 2476800
>Index: p4p/distinfo.freebsd60x86
>===================================================================
>--- p4p/distinfo.freebsd60x86	(revision 359181)
>+++ p4p/distinfo.freebsd60x86	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.549175/bin.freebsd60x86/p4p) = 6454b5c8c030f2ce4b5679833f98bba56a846c5940cc69d99395e9f63ddc052f
>-SIZE (perforce/2012.1.549175/bin.freebsd60x86/p4p) = 1655088
>Index: p4p/distinfo.freebsd60x86_64
>===================================================================
>--- p4p/distinfo.freebsd60x86_64	(revision 359181)
>+++ p4p/distinfo.freebsd60x86_64	(working copy)
>@@ -1,2 +0,0 @@
>-SHA256 (perforce/2012.1.549175/bin.freebsd60x86_64/p4p) = 888f4d8e0653c994c28b30b8101de307e4405e6c7de78de3ae3504e0bace9830
>-SIZE (perforce/2012.1.549175/bin.freebsd60x86_64/p4p) = 1989456
>Index: p4p/distinfo.freebsd70x86
>===================================================================
>--- p4p/distinfo.freebsd70x86	(revision 359181)
>+++ p4p/distinfo.freebsd70x86	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.549175/bin.freebsd70x86/p4p) = 1e25f0af296b6b6cbd7c0713d62c8a2dfde9f1751091a0b20a62ea0a5ad3b3eb
>-SIZE (perforce/2012.1.549175/bin.freebsd70x86/p4p) = 1825240
>+SHA256 (perforce/2014.1.821990/bin.freebsd70x86/p4p) = ee659222335dd761cef6ea8c4cab4fc96c7be481d0066f13577376e4e460f8a4
>+SIZE (perforce/2014.1.821990/bin.freebsd70x86/p4p) = 2263440
>Index: p4p/distinfo.freebsd70x86_64
>===================================================================
>--- p4p/distinfo.freebsd70x86_64	(revision 359181)
>+++ p4p/distinfo.freebsd70x86_64	(working copy)
>@@ -1,2 +1,2 @@
>-SHA256 (perforce/2012.1.549175/bin.freebsd70x86_64/p4p) = d1db0e1d16e900d2e18d736529ecf2f869ed2e1e5249f7a69720a6b755b42ba1
>-SIZE (perforce/2012.1.549175/bin.freebsd70x86_64/p4p) = 1949032
>+SHA256 (perforce/2014.1.821990/bin.freebsd70x86_64/p4p) = 4ca8b90585ceee144353a782ae5c5bc50619ced0b12abba2bd759e3b5a2b888e
>+SIZE (perforce/2014.1.821990/bin.freebsd70x86_64/p4p) = 2454064
>Index: p4web/Makefile
>===================================================================
>--- p4web/Makefile	(revision 359187)
>+++ p4web/Makefile	(working copy)
>@@ -32,8 +32,30 @@
> 
> .include <bsd.port.pre.mk>
> 
>-.include "${.CURDIR}/../p4/Makefile.inc"
>+# 10.x (and higher) needs compat libs
>+.if ${OSVERSION} >= 1000054
>+LIB_DEPENDS=	stdc++.6:${PORTSDIR}/misc/compat9x
>+.endif
> 
>+# Figure out what to install
>+.if ${ARCH} == amd64
>+. if ${OSVERSION} >= 700043
>+PLATFORM=	freebsd70x86_64
>+. else
>+IGNORE=		unsupported OS release, sorry
>+. endif
>+
>+.elif ${ARCH} == i386
>+. if ${OSVERSION} >= 700043
>+PLATFORM=	freebsd70x86
>+. else
>+IGNORE=		unsupported OS release, sorry
>+. endif
>+
>+.else
>+IGNORE=		unsupported OS release, sorry
>+.endif
>+
> USERS=	p4admin
> GROUPS=	p4admin
>

Flags:

gordon: maintainer-approval+

Actions: View | Diff

Attachments on bug 191648: 144445