svn commit: r392478 - head/devel/p4

[Gordon Tetlow]

Author: gordon
Date: Sat Jul 18 23:49:12 2015
New Revision: 392478
URL: https://svnweb.freebsd.org/changeset/ports/392478

Log:
  Update to devel/p4 2015.1/1126382 to fix broken port.
  Migrate common variable for the devel/p4* ports into the Makefile.inc.
  
  PR:		201216
  Differential Revision:	https://reviews.freebsd.org/D3088
  Approved by:	mat (mentor)
  MFH:		2015Q3

Modified:
  head/devel/p4/Makefile
  head/devel/p4/Makefile.inc
  head/devel/p4/distinfo.freebsd100x86
  head/devel/p4/distinfo.freebsd100x86_64
  head/devel/p4/distinfo.freebsd70x86
  head/devel/p4/distinfo.freebsd70x86_64

Modified: head/devel/p4/Makefile
==============================================================================
--- head/devel/p4/Makefile	Sat Jul 18 23:45:58 2015	(r392477)
+++ head/devel/p4/Makefile	Sat Jul 18 23:49:12 2015	(r392478)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p4
-PORTVERSION=	2014.2.1045032
+PORTVERSION=	2015.1.1126382
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
@@ -13,14 +13,6 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon at FreeBSD.org
 COMMENT=	Perforce client
 
-BROKEN=		checksum mismatch
-
-ONLY_FOR_ARCHS=	amd64 i386
-
-P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
-DIST_SUBDIR=	perforce/${PORTVERSION}/bin.${PLATFORM}
-DISTINFO_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
-
 RESTRICTED=	Restricted distribution
 
 NO_BUILD=	yes

Modified: head/devel/p4/Makefile.inc
==============================================================================
--- head/devel/p4/Makefile.inc	Sat Jul 18 23:45:58 2015	(r392477)
+++ head/devel/p4/Makefile.inc	Sat Jul 18 23:49:12 2015	(r392478)
@@ -1,6 +1,8 @@
 # Figure out what to install
 .if ${OPSYS} == FreeBSD
 
+ONLY_FOR_ARCHS?= amd64 i386
+
 .if ${ARCH} == amd64
 . if ${OSVERSION} >= 1000100
 PLATFORM=	freebsd100x86_64
@@ -22,3 +24,7 @@ IGNORE=		unsupported OS release, sorry
 .else
 IGNORE=		${OPSYS} is unsupported, sorry
 .endif
+
+P4VERSION?=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
+DIST_SUBDIR?=	perforce/${PORTVERSION}/bin.${PLATFORM}
+DISTINFO_FILE?=	${MASTERDIR}/distinfo.${PLATFORM}

Modified: head/devel/p4/distinfo.freebsd100x86
==============================================================================
--- head/devel/p4/distinfo.freebsd100x86	Sat Jul 18 23:45:58 2015	(r392477)
+++ head/devel/p4/distinfo.freebsd100x86	Sat Jul 18 23:49:12 2015	(r392478)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 1261bacd887cb09bcf79004a427784e3428ebef8ef7f8cd527e8f446feb3efb4
-SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 2474416
+SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4) = 4ac2ca86a68a355a0920e28a7ed41db4b8a6d7f2e0390069625665cf009cfad9
+SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4) = 2562660

Modified: head/devel/p4/distinfo.freebsd100x86_64
==============================================================================
--- head/devel/p4/distinfo.freebsd100x86_64	Sat Jul 18 23:45:58 2015	(r392477)
+++ head/devel/p4/distinfo.freebsd100x86_64	Sat Jul 18 23:49:12 2015	(r392478)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 676c424b485e90817e63592fc5f14ea151b489128078053989f2e85080d485c2
-SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 2732720
+SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4) = 77a102169d95b2f3f18039be0787a7373c71551358322a7ae35674f4991804c6
+SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4) = 2815472

Modified: head/devel/p4/distinfo.freebsd70x86
==============================================================================
--- head/devel/p4/distinfo.freebsd70x86	Sat Jul 18 23:45:58 2015	(r392477)
+++ head/devel/p4/distinfo.freebsd70x86	Sat Jul 18 23:49:12 2015	(r392478)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 0c48532af152ba9ef187fd3a098ec0be0c5f8b9312becea4a27fe63ddec427ac
-SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 2555504
+SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4) = e0e5d3bd20246c03e7b3b9244701546b2e5dc9fa109bdc17dbf155b058ee95bc
+SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4) = 2634304

Modified: head/devel/p4/distinfo.freebsd70x86_64
==============================================================================
--- head/devel/p4/distinfo.freebsd70x86_64	Sat Jul 18 23:45:58 2015	(r392477)
+++ head/devel/p4/distinfo.freebsd70x86_64	Sat Jul 18 23:49:12 2015	(r392478)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 3fbf5e0203bf4c2bc9b6107c8111c28e9d2f88372f6330fcff32057addf6c069
-SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 2716456
+SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4) = 648e9ebdd28fa5dfe5ffaa6d344385f49cc3e31641f10ba89a099d4aa199488e
+SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4) = 2795160