- Update to the latest upstream versions:

  - 2014.1 for p4, p4d, p4ftpd, p4p
  - 2012.1 build update for 10.x releases

PR:		191648
Submitted by:	gordon (maintainer)
Approved by:	mentors (implicit)

30 files changed, 67 insertions, 44 deletions

diff --git a/devel/p4/Makefile b/devel/p4/Makefile
index 1a6667d8a3e3..1541b3c16a36 100644
--- a/devel/p4/Makefile
+++ b/devel/p4/Makefile
@@ -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}/
diff --git a/devel/p4/Makefile.inc b/devel/p4/Makefile.inc
index ba68d1a19cb4..6f43850ccfff 100644
--- a/devel/p4/Makefile.inc
+++ b/devel/p4/Makefile.inc
@@ -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
diff --git a/devel/p4/distinfo.freebsd100x86 b/devel/p4/distinfo.freebsd100x86
new file mode 100644
index 000000000000..5564b359a9f8
--- /dev/null
+++ b/devel/p4/distinfo.freebsd100x86
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.821990/bin.freebsd100x86/p4) = cc452d3df4b646aa7ad971b8500fb85ecfee6dcb88034d1da4182e2eae820c9a
+SIZE (perforce/2014.1.821990/bin.freebsd100x86/p4) = 2448372
diff --git a/devel/p4/distinfo.freebsd100x86_64 b/devel/p4/distinfo.freebsd100x86_64
new file mode 100644
index 000000000000..c529af049d89
--- /dev/null
+++ b/devel/p4/distinfo.freebsd100x86_64
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.821990/bin.freebsd100x86_64/p4) = ac7cf3fe13011d31c190fb0f07043a61fb1321840851f28962ba8250fc371a2c
+SIZE (perforce/2014.1.821990/bin.freebsd100x86_64/p4) = 2700576
diff --git a/devel/p4/distinfo.freebsd60x86 b/devel/p4/distinfo.freebsd60x86
deleted file mode 100644
index a4a4cbc6d3c7..000000000000
--- a/devel/p4/distinfo.freebsd60x86
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.473528/bin.freebsd60x86/p4) = c922ecfd34ad4233424f003397f6ef76d0914d9177fcb969997abccaa0427600
-SIZE (perforce/2012.1.473528/bin.freebsd60x86/p4) = 1980644
diff --git a/devel/p4/distinfo.freebsd60x86_64 b/devel/p4/distinfo.freebsd60x86_64
deleted file mode 100644
index e40ed3478767..000000000000
--- a/devel/p4/distinfo.freebsd60x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.473528/bin.freebsd60x86_64/p4) = 2b4db27df4d804338275b5ce7db9bf0e1b88ef6e98566bcd007c013a7c7bf1bb
-SIZE (perforce/2012.1.473528/bin.freebsd60x86_64/p4) = 2241672
diff --git a/devel/p4/distinfo.freebsd70x86 b/devel/p4/distinfo.freebsd70x86
index 1220339968ef..91f1a8bb45fd 100644
--- a/devel/p4/distinfo.freebsd70x86
+++ b/devel/p4/distinfo.freebsd70x86
@@ -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
diff --git a/devel/p4/distinfo.freebsd70x86_64 b/devel/p4/distinfo.freebsd70x86_64
index 89619bf6205e..ef9750ae6f68 100644
--- a/devel/p4/distinfo.freebsd70x86_64
+++ b/devel/p4/distinfo.freebsd70x86_64
@@ -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
diff --git a/devel/p4d/Makefile b/devel/p4d/Makefile
index ae044b48a636..950e47d22e97 100644
--- a/devel/p4d/Makefile
+++ b/devel/p4d/Makefile
@@ -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}/
diff --git a/devel/p4d/distinfo.freebsd100x86 b/devel/p4d/distinfo.freebsd100x86
new file mode 100644
index 000000000000..c8cf71fde9e3
--- /dev/null
+++ b/devel/p4d/distinfo.freebsd100x86
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.886167/bin.freebsd100x86/p4d) = 2308290729df1fb4f891eb09836b194cf528eaa2413d9d10a2352cd985a90f10
+SIZE (perforce/2014.1.886167/bin.freebsd100x86/p4d) = 4512936
diff --git a/devel/p4d/distinfo.freebsd100x86_64 b/devel/p4d/distinfo.freebsd100x86_64
new file mode 100644
index 000000000000..859a58709748
--- /dev/null
+++ b/devel/p4d/distinfo.freebsd100x86_64
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.886167/bin.freebsd100x86_64/p4d) = 6cc64e5bd8d3e0052b8b46bd5899a2b46be474be89d4e83828597addfbb761d7
+SIZE (perforce/2014.1.886167/bin.freebsd100x86_64/p4d) = 4683488
diff --git a/devel/p4d/distinfo.freebsd60x86 b/devel/p4d/distinfo.freebsd60x86
deleted file mode 100644
index 507559cf7efc..000000000000
--- a/devel/p4d/distinfo.freebsd60x86
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.876219/bin.freebsd60x86/p4d) = fc5564c148fdfaa9f23d2f232f515039d69b2721352129d76d1f4b0d61f9a782
-SIZE (perforce/2012.1.876219/bin.freebsd60x86/p4d) = 3825092
diff --git a/devel/p4d/distinfo.freebsd60x86_64 b/devel/p4d/distinfo.freebsd60x86_64
deleted file mode 100644
index 1d73e4185574..000000000000
--- a/devel/p4d/distinfo.freebsd60x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.876219/bin.freebsd60x86_64/p4d) = b7e4381940f963822cca7c591e987b36f5f67e1771594a83bfc8cd8a7dec92e5
-SIZE (perforce/2012.1.876219/bin.freebsd60x86_64/p4d) = 4377688
diff --git a/devel/p4d/distinfo.freebsd70x86 b/devel/p4d/distinfo.freebsd70x86
index 012d85d0de8e..39926ced3a4b 100644
--- a/devel/p4d/distinfo.freebsd70x86
+++ b/devel/p4d/distinfo.freebsd70x86
@@ -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
diff --git a/devel/p4d/distinfo.freebsd70x86_64 b/devel/p4d/distinfo.freebsd70x86_64
index 55bfd070ffd5..dcb41013fd8f 100644
--- a/devel/p4d/distinfo.freebsd70x86_64
+++ b/devel/p4d/distinfo.freebsd70x86_64
@@ -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
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile
index 12bc89ebc5a5..ee8de2758b86 100644
--- a/devel/p4ftpd/Makefile
+++ b/devel/p4ftpd/Makefile
@@ -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 @@ EXTRACT_ONLY=	# none
 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}
diff --git a/devel/p4ftpd/distinfo.freebsd100x86 b/devel/p4ftpd/distinfo.freebsd100x86
new file mode 100644
index 000000000000..6f05151b6033
--- /dev/null
+++ b/devel/p4ftpd/distinfo.freebsd100x86
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.821990/bin.freebsd100x86/p4ftpd) = af7e7ae4700cb7b0adc80c034199ca5756047b20218a69f4eddd9ef334432869
+SIZE (perforce/2014.1.821990/bin.freebsd100x86/p4ftpd) = 2522656
diff --git a/devel/p4ftpd/distinfo.freebsd100x86_64 b/devel/p4ftpd/distinfo.freebsd100x86_64
new file mode 100644
index 000000000000..1eb7e6624a24
--- /dev/null
+++ b/devel/p4ftpd/distinfo.freebsd100x86_64
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.821990/bin.freebsd100x86_64/p4ftpd) = 4413ad393f6c3a89606e7e1f20ecc18f33bdfa4dbbb4e3f2cfcc5c03a21e2c86
+SIZE (perforce/2014.1.821990/bin.freebsd100x86_64/p4ftpd) = 2777616
diff --git a/devel/p4ftpd/distinfo.freebsd60x86 b/devel/p4ftpd/distinfo.freebsd60x86
deleted file mode 100644
index 072baddb6da6..000000000000
--- a/devel/p4ftpd/distinfo.freebsd60x86
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.442152/bin.freebsd60x86/p4ftpd) = 2cda8eaff54bbf57c5ffe7a5c5b106d8edcc73edfccf530123c314b2806b2b66
-SIZE (perforce/2012.1.442152/bin.freebsd60x86/p4ftpd) = 2150340
diff --git a/devel/p4ftpd/distinfo.freebsd60x86_64 b/devel/p4ftpd/distinfo.freebsd60x86_64
deleted file mode 100644
index ec3135d682d5..000000000000
--- a/devel/p4ftpd/distinfo.freebsd60x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.442152/bin.freebsd60x86_64/p4ftpd) = 6d304cb110e68e6fe0df2fa1e417d25432c10412e78fec1ef02ac780330f779f
-SIZE (perforce/2012.1.442152/bin.freebsd60x86_64/p4ftpd) = 2368040
diff --git a/devel/p4ftpd/distinfo.freebsd70x86 b/devel/p4ftpd/distinfo.freebsd70x86
index b161ca0e55e8..de172a7fb312 100644
--- a/devel/p4ftpd/distinfo.freebsd70x86
+++ b/devel/p4ftpd/distinfo.freebsd70x86
@@ -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
diff --git a/devel/p4ftpd/distinfo.freebsd70x86_64 b/devel/p4ftpd/distinfo.freebsd70x86_64
index 192137d1abce..d65795db052b 100644
--- a/devel/p4ftpd/distinfo.freebsd70x86_64
+++ b/devel/p4ftpd/distinfo.freebsd70x86_64
@@ -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
diff --git a/devel/p4p/Makefile b/devel/p4p/Makefile
index b14313d3f800..5ef937751755 100644
--- a/devel/p4p/Makefile
+++ b/devel/p4p/Makefile
@@ -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}/
diff --git a/devel/p4p/distinfo.freebsd100x86 b/devel/p4p/distinfo.freebsd100x86
new file mode 100644
index 000000000000..1c3469afe713
--- /dev/null
+++ b/devel/p4p/distinfo.freebsd100x86
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.821990/bin.freebsd100x86/p4p) = ff83a187e2120e2efd4bcaeae7a637647085204fe4fad8180ef753cbf4747774
+SIZE (perforce/2014.1.821990/bin.freebsd100x86/p4p) = 2214504
diff --git a/devel/p4p/distinfo.freebsd100x86_64 b/devel/p4p/distinfo.freebsd100x86_64
new file mode 100644
index 000000000000..47575ffc6a83
--- /dev/null
+++ b/devel/p4p/distinfo.freebsd100x86_64
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.1.821990/bin.freebsd100x86_64/p4p) = 4f1d5c7ad8bf732a5ee34bb076430ff2e5eb22f6386935437e56cd617609ed8a
+SIZE (perforce/2014.1.821990/bin.freebsd100x86_64/p4p) = 2476800
diff --git a/devel/p4p/distinfo.freebsd60x86 b/devel/p4p/distinfo.freebsd60x86
deleted file mode 100644
index cb8f16791643..000000000000
--- a/devel/p4p/distinfo.freebsd60x86
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.549175/bin.freebsd60x86/p4p) = 6454b5c8c030f2ce4b5679833f98bba56a846c5940cc69d99395e9f63ddc052f
-SIZE (perforce/2012.1.549175/bin.freebsd60x86/p4p) = 1655088
diff --git a/devel/p4p/distinfo.freebsd60x86_64 b/devel/p4p/distinfo.freebsd60x86_64
deleted file mode 100644
index e047e065cb85..000000000000
--- a/devel/p4p/distinfo.freebsd60x86_64
+++ /dev/null
@@ -1,2 +0,0 @@
-SHA256 (perforce/2012.1.549175/bin.freebsd60x86_64/p4p) = 888f4d8e0653c994c28b30b8101de307e4405e6c7de78de3ae3504e0bace9830
-SIZE (perforce/2012.1.549175/bin.freebsd60x86_64/p4p) = 1989456
diff --git a/devel/p4p/distinfo.freebsd70x86 b/devel/p4p/distinfo.freebsd70x86
index 91f788b7d41a..015cc5906fb2 100644
--- a/devel/p4p/distinfo.freebsd70x86
+++ b/devel/p4p/distinfo.freebsd70x86
@@ -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
diff --git a/devel/p4p/distinfo.freebsd70x86_64 b/devel/p4p/distinfo.freebsd70x86_64
index 49117ee69bfc..3903f157e86c 100644
--- a/devel/p4p/distinfo.freebsd70x86_64
+++ b/devel/p4p/distinfo.freebsd70x86_64
@@ -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
diff --git a/devel/p4web/Makefile b/devel/p4web/Makefile
index 771e0506daa2..118e62ef67da 100644
--- a/devel/p4web/Makefile
+++ b/devel/p4web/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	p4web
 PORTVERSION=	2012.1.732581
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/r${P4VERSION}/bin.${PLATFORM}/
@@ -32,7 +33,29 @@ USE_RC_SUBR=	p4web
 
 .include <bsd.port.pre.mk>
 
-.include "${.CURDIR}/../p4/Makefile.inc"
+# 10.x (and higher) needs compat libs
+.if ${OSVERSION} >= 1000054
+LIB_DEPENDS+=	libstdc++.so.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