svn commit: r460954 - in branches/2018Q1/devel: p4d p4ftpd p4p

[Gordon Tetlow]

Author: gordon
Date: Sun Feb  4 23:37:26 2018
New Revision: 460954
URL: https://svnweb.freebsd.org/changeset/ports/460954

Log:
  MFH: r460953
  
  Fixup include for p4 related ports now that devel/p4 is using source.
  
  Also update devel/p4d to 2016.1/1611275.
  
  Approved by:	ports-secteam (blanket)

Added:
  branches/2018Q1/devel/p4d/Makefile.inc
     - copied unchanged from r460953, head/devel/p4d/Makefile.inc
Modified:
  branches/2018Q1/devel/p4d/Makefile
  branches/2018Q1/devel/p4d/distinfo.freebsd100x86
  branches/2018Q1/devel/p4d/distinfo.freebsd100x86_64
  branches/2018Q1/devel/p4ftpd/Makefile
  branches/2018Q1/devel/p4p/Makefile
Directory Properties:
  branches/2018Q1/   (props changed)

Modified: branches/2018Q1/devel/p4d/Makefile
==============================================================================
--- branches/2018Q1/devel/p4d/Makefile	Sun Feb  4 23:35:50 2018	(r460953)
+++ branches/2018Q1/devel/p4d/Makefile	Sun Feb  4 23:37:26 2018	(r460954)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2016.1.1598719
+PORTVERSION=	2016.1.1611275
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
@@ -32,7 +32,7 @@ USE_RC_SUBR=	p4d
 
 .include <bsd.port.pre.mk>
 
-.include "${.CURDIR}/../p4/Makefile.inc"
+.include "${.CURDIR}/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin

Copied: branches/2018Q1/devel/p4d/Makefile.inc (from r460953, head/devel/p4d/Makefile.inc)
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ branches/2018Q1/devel/p4d/Makefile.inc	Sun Feb  4 23:37:26 2018	(r460954, copy of r460953, head/devel/p4d/Makefile.inc)
@@ -0,0 +1,22 @@
+# Figure out what to install
+.if ${OPSYS} == FreeBSD
+
+ONLY_FOR_ARCHS?= amd64 i386
+
+.if ${ARCH} == amd64
+PLATFORM=	freebsd100x86_64
+
+.elif ${ARCH} == i386
+PLATFORM=	freebsd100x86
+
+.else
+IGNORE=		unsupported OS release, sorry
+.endif
+
+.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: branches/2018Q1/devel/p4d/distinfo.freebsd100x86
==============================================================================
--- branches/2018Q1/devel/p4d/distinfo.freebsd100x86	Sun Feb  4 23:35:50 2018	(r460953)
+++ branches/2018Q1/devel/p4d/distinfo.freebsd100x86	Sun Feb  4 23:37:26 2018	(r460954)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513828975
-SHA256 (perforce/2016.1.1598719/bin.freebsd100x86/p4d) = 089f8d1d83aa2386f7aad2461561d62a31eea029e184ab2b471016e8f9eb43fb
-SIZE (perforce/2016.1.1598719/bin.freebsd100x86/p4d) = 5885136
+TIMESTAMP = 1517785967
+SHA256 (perforce/2016.1.1611275/bin.freebsd100x86/p4d) = 3283e50f82842605ebfb5fd5cdd13d1729e10955fdc170154d3deb224b8418ee
+SIZE (perforce/2016.1.1611275/bin.freebsd100x86/p4d) = 5885136

Modified: branches/2018Q1/devel/p4d/distinfo.freebsd100x86_64
==============================================================================
--- branches/2018Q1/devel/p4d/distinfo.freebsd100x86_64	Sun Feb  4 23:35:50 2018	(r460953)
+++ branches/2018Q1/devel/p4d/distinfo.freebsd100x86_64	Sun Feb  4 23:37:26 2018	(r460954)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513828937
-SHA256 (perforce/2016.1.1598719/bin.freebsd100x86_64/p4d) = a3d5fc07cb7b207f537894b5723279ec8aef9b50699f086dcf9df8a46b4ca356
-SIZE (perforce/2016.1.1598719/bin.freebsd100x86_64/p4d) = 6261704
+TIMESTAMP = 1517785962
+SHA256 (perforce/2016.1.1611275/bin.freebsd100x86_64/p4d) = 99784b81f31f2aaeedc341fd1a2144a69c4181db525cb3502b85c6c0e3c77c11
+SIZE (perforce/2016.1.1611275/bin.freebsd100x86_64/p4d) = 6265800

Modified: branches/2018Q1/devel/p4ftpd/Makefile
==============================================================================
--- branches/2018Q1/devel/p4ftpd/Makefile	Sun Feb  4 23:35:50 2018	(r460953)
+++ branches/2018Q1/devel/p4ftpd/Makefile	Sun Feb  4 23:37:26 2018	(r460954)
@@ -26,7 +26,7 @@ USE_RC_SUBR=	p4ftpd
 
 .include <bsd.port.pre.mk>
 
-.include "${.CURDIR}/../p4/Makefile.inc"
+.include "${.CURDIR}/../p4d/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin

Modified: branches/2018Q1/devel/p4p/Makefile
==============================================================================
--- branches/2018Q1/devel/p4p/Makefile	Sun Feb  4 23:35:50 2018	(r460953)
+++ branches/2018Q1/devel/p4p/Makefile	Sun Feb  4 23:37:26 2018	(r460954)
@@ -32,7 +32,7 @@ USE_RC_SUBR=	p4p
 
 .include <bsd.port.pre.mk>
 
-.include "${.CURDIR}/../p4/Makefile.inc"
+.include "${.CURDIR}/../p4d/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin