Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 8 Jul 2015 22:04:28 +0000 (UTC)
From:      "Philip M. Gollucci" <pgollucci@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r391605 - head/devel/p4
Message-ID:  <201507082204.t68M4STV076769@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: pgollucci
Date: Wed Jul  8 22:04:27 2015
New Revision: 391605
URL: https://svnweb.freebsd.org/changeset/ports/391605

Log:
  Revert r391601 "- devel/p4: Unbreak"
  
  I have to fix all the p4* ports too.
  Teach me to fix something.
  
  Pointyhat to: myself

Added:
  head/devel/p4/Makefile.inc   (contents, props changed)
  head/devel/p4/distinfo.freebsd100x86   (contents, props changed)
  head/devel/p4/distinfo.freebsd100x86_64   (contents, props changed)
  head/devel/p4/distinfo.freebsd70x86   (contents, props changed)
  head/devel/p4/distinfo.freebsd70x86_64   (contents, props changed)
Deleted:
  head/devel/p4/distinfo.amd64
  head/devel/p4/distinfo.i386
Modified:
  head/devel/p4/Makefile

Modified: head/devel/p4/Makefile
==============================================================================
--- head/devel/p4/Makefile	Wed Jul  8 22:02:25 2015	(r391604)
+++ head/devel/p4/Makefile	Wed Jul  8 22:04:27 2015	(r391605)
@@ -4,7 +4,8 @@
 PORTNAME=	p4
 PORTVERSION=	2014.2.1045032
 CATEGORIES=	devel
-MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.freebsd100${ARCH:S,i386,x86,:S,amd64,x86_64,}/
+MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
+		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
@@ -12,14 +13,13 @@ EXTRACT_ONLY=	# none
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce client
 
-BROKEN_FreeBSD_8=	no distfiles
-BROKEN_FreeBSD_9=	no distfiles
-BROKEN_FreeBSD_11=	no distfiles
+BROKEN=		checksum mismatch
 
 ONLY_FOR_ARCHS=	amd64 i386
 
 P4VERSION=	r${PORTVERSION:S/^20//:C/\.[0-9]+$//}
-DISTINFO_FILE=	${MASTERDIR}/distinfo.${ARCH}
+DIST_SUBDIR=	perforce/${PORTVERSION}/bin.${PLATFORM}
+DISTINFO_FILE=	${MASTERDIR}/distinfo.${PLATFORM}
 
 RESTRICTED=	Restricted distribution
 
@@ -28,7 +28,11 @@ NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/p4
 
+.include <bsd.port.pre.mk>
+
+.include "Makefile.inc"
+
 do-install:
 	${INSTALL_PROGRAM} ${DISTDIR}/${DIST_SUBDIR}/p4 ${STAGEDIR}${PREFIX}/bin
 
-.include <bsd.port.mk>
+.include <bsd.port.post.mk>

Added: head/devel/p4/Makefile.inc
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/p4/Makefile.inc	Wed Jul  8 22:04:27 2015	(r391605)
@@ -0,0 +1,24 @@
+# Figure out what to install
+.if ${OPSYS} == FreeBSD
+
+.if ${ARCH} == amd64
+. if ${OSVERSION} >= 1000100
+PLATFORM=	freebsd100x86_64
+. else
+PLATFORM=	freebsd70x86_64
+. endif
+
+.elif ${ARCH} == i386
+. if ${OSVERSION} >= 1000100
+PLATFORM=	freebsd100x86
+. else
+PLATFORM=	freebsd70x86
+. endif
+
+.else
+IGNORE=		unsupported OS release, sorry
+.endif
+
+.else
+IGNORE=		${OPSYS} is unsupported, sorry
+.endif

Added: head/devel/p4/distinfo.freebsd100x86
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/p4/distinfo.freebsd100x86	Wed Jul  8 22:04:27 2015	(r391605)
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 1261bacd887cb09bcf79004a427784e3428ebef8ef7f8cd527e8f446feb3efb4
+SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4) = 2474416

Added: head/devel/p4/distinfo.freebsd100x86_64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/p4/distinfo.freebsd100x86_64	Wed Jul  8 22:04:27 2015	(r391605)
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 676c424b485e90817e63592fc5f14ea151b489128078053989f2e85080d485c2
+SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4) = 2732720

Added: head/devel/p4/distinfo.freebsd70x86
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/p4/distinfo.freebsd70x86	Wed Jul  8 22:04:27 2015	(r391605)
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 0c48532af152ba9ef187fd3a098ec0be0c5f8b9312becea4a27fe63ddec427ac
+SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4) = 2555504

Added: head/devel/p4/distinfo.freebsd70x86_64
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/devel/p4/distinfo.freebsd70x86_64	Wed Jul  8 22:04:27 2015	(r391605)
@@ -0,0 +1,2 @@
+SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 3fbf5e0203bf4c2bc9b6107c8111c28e9d2f88372f6330fcff32057addf6c069
+SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4) = 2716456



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201507082204.t68M4STV076769>