Index: branches/2015Q3/devel/p4d/Makefile
===================================================================
--- branches/2015Q3/devel/p4d/Makefile	(revision 392483)
+++ branches/2015Q3/devel/p4d/Makefile	(revision 392484)
@@ -1,55 +1,44 @@
 # Created by: gordon@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	p4d
-PORTVERSION=	2014.2.1045032
+PORTVERSION=	2015.1.1171507
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \
 		http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/
 DISTNAME=	p4d
 EXTRACT_SUFX=
 EXTRACT_ONLY=	# none
 
 MAINTAINER=	gordon@FreeBSD.org
 COMMENT=	Perforce server
 
 RUN_DEPENDS=	p4:${PORTSDIR}/devel/p4
 
-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
 NO_WRKSUBDIR=	yes
 
 P4ROOT?=	/var/db/p4d
 P4LOG?=		/var/log/p4d.log
 
+PLIST_SUB=	P4ROOT=${P4ROOT}
+
 SUB_LIST=	P4ROOT=${P4ROOT} \
 		P4LOG=${P4LOG}
 
 USE_RC_SUBR=	p4d
 
 .include <bsd.port.pre.mk>
 
 .include "${.CURDIR}/../p4/Makefile.inc"
 
 USERS=	p4admin
 GROUPS=	p4admin
 
 do-install:
 	${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${STAGEDIR}${PREFIX}/sbin/
-	@${MKDIR} ${STAGEDIR}${P4ROOT}
-	@${ECHO_CMD} "@exec ${MKDIR} ${P4ROOT}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4ROOT}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 750 ${P4ROOT}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ${RMDIR} ${P4ROOT} 2>/dev/null || true" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST}
-	@${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST}
+	${MKDIR} ${STAGEDIR}${P4ROOT}
 
 .include <bsd.port.post.mk>
Index: branches/2015Q3/devel/p4d/distinfo.freebsd100x86
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd100x86	(revision 392483)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86	(revision 392484)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd100x86/p4d) = 7be673ffd8099882476d6502e9155d37ed4d55168be6df9f8935b0afefb6d238
-SIZE (perforce/2014.2.1045032/bin.freebsd100x86/p4d) = 4715188
+SHA256 (perforce/2015.1.1171507/bin.freebsd100x86/p4d) = 3dcf9efa82e44d4f10579c53095672ad90db040360ef83ee825a2325183379be
+SIZE (perforce/2015.1.1171507/bin.freebsd100x86/p4d) = 5218084
Index: branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64	(revision 392483)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd100x86_64	(revision 392484)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd100x86_64/p4d) = 0c2fcfd58a90ca84d008c011235a731421092503ce73eee9b31d666f6cfc299f
-SIZE (perforce/2014.2.1045032/bin.freebsd100x86_64/p4d) = 4878976
+SHA256 (perforce/2015.1.1171507/bin.freebsd100x86_64/p4d) = 6282e55d869cb64398f1203624f58acdbfdedf04311bb960de52aed451f4c38b
+SIZE (perforce/2015.1.1171507/bin.freebsd100x86_64/p4d) = 5368544
Index: branches/2015Q3/devel/p4d/distinfo.freebsd70x86
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd70x86	(revision 392483)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86	(revision 392484)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd70x86/p4d) = 40d1cb49c1edbe7886e7b18feed1cfbefc7a594271fc6658a806b022f833e1b5
-SIZE (perforce/2014.2.1045032/bin.freebsd70x86/p4d) = 5071328
+SHA256 (perforce/2015.1.1171507/bin.freebsd70x86/p4d) = a9b127101a540ead5192d9ee15eaf8ce5422671dafe36ad1dc2bd01ae217f77a
+SIZE (perforce/2015.1.1171507/bin.freebsd70x86/p4d) = 5583296
Index: branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64
===================================================================
--- branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64	(revision 392483)
+++ branches/2015Q3/devel/p4d/distinfo.freebsd70x86_64	(revision 392484)
@@ -1,2 +1,2 @@
-SHA256 (perforce/2014.2.1045032/bin.freebsd70x86_64/p4d) = cf918faed8cca2e02ccc342cf1cf4d7d3dd99b83c8d6b11020ad2033dd5e9c4b
-SIZE (perforce/2014.2.1045032/bin.freebsd70x86_64/p4d) = 5243776
+SHA256 (perforce/2015.1.1171507/bin.freebsd70x86_64/p4d) = f2b05148753813c4241441861ed1c89f22810afb476d780081fffef9752820e7
+SIZE (perforce/2015.1.1171507/bin.freebsd70x86_64/p4d) = 5758976
Index: branches/2015Q3/devel/p4d/files/p4d.in
===================================================================
--- branches/2015Q3/devel/p4d/files/p4d.in	(revision 392483)
+++ branches/2015Q3/devel/p4d/files/p4d.in	(revision 392484)
@@ -1,45 +1,53 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: p4d
 # REQUIRE: LOGIN
 # KEYWORD: shutdown
 
 # These variables (and many more) can be set via environment variables. Check
 # p4d -h for what you can set.
 #
 # Add the following line to /etc/rc.conf to enable p4d:
 # p4d_enable (bool):	Set to "NO" by default.
 #			Set it to "YES" to enable p4d.
 # p4d_root (str):	Default to "%%P4ROOT%%".
 #			Base database directory.
 # p4d_port (int):	Default to "1666".
 #			Set to TCP port to bind to.
 # p4d_debug (str):	Default to "server=3".
 #			Debug options. Highly recommended.
 # p4d_log (str):	Default to "%%P4LOG%%".
 #			Logfile for debug output.
 # p4d_args (str):	Custom additional arguments to be passed
 #			to p4d (default empty).
 #
 
 . /etc/rc.subr
 
 name="p4d"
 rcvar=p4d_enable
 
 load_rc_config $name
 
 : ${p4d_enable="NO"}
 : ${p4d_root="%%P4ROOT%%"}
 : ${p4d_port="1666"}
 : ${p4d_debug="server=3"}
 : ${p4d_log="%%P4LOG%%"}
 
 command="%%PREFIX%%/sbin/p4d"
 command_args="-r ${p4d_root} -p ${p4d_port} -v ${p4d_debug} -L ${p4d_log} -d ${p4d_args} > /dev/null 2>&1 &"
 p4d_user="p4admin"
+start_precmd="p4d_prestart"
+
+p4d_prestart()
+{
+	if [ ! -f "${p4d_log}" ]; then
+		install -o p4admin -g p4admin -m 0640 /dev/null ${p4d_log}
+	fi
+}
 
 run_rc_command "$1"
Index: branches/2015Q3/devel/p4d/pkg-plist
===================================================================
--- branches/2015Q3/devel/p4d/pkg-plist	(revision 392483)
+++ branches/2015Q3/devel/p4d/pkg-plist	(revision 392484)
@@ -1 +1,2 @@
 sbin/p4d
+@dir(p4admin,p4admin,0750) %%P4ROOT%%
Index: branches/2015Q3
===================================================================
--- branches/2015Q3	(revision 392483)
+++ branches/2015Q3	(revision 392484)

Property changes on: branches/2015Q3
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r392477