From owner-svn-ports-branches@freebsd.org Sun Jul 19 04:34:36 2015 Return-Path: Delivered-To: svn-ports-branches@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id D82169A4019; Sun, 19 Jul 2015 04:34:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C7C161DD9; Sun, 19 Jul 2015 04:34:36 +0000 (UTC) (envelope-from gordon@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.70]) by repo.freebsd.org (8.14.9/8.14.9) with ESMTP id t6J4Yars059976; Sun, 19 Jul 2015 04:34:36 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6J4YY7g059969; Sun, 19 Jul 2015 04:34:34 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507190434.t6J4YY7g059969@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sun, 19 Jul 2015 04:34:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r392486 - in branches/2015Q3/devel/p4p: . files X-SVN-Group: ports-branches MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 19 Jul 2015 04:34:37 -0000 Author: gordon Date: Sun Jul 19 04:34:33 2015 New Revision: 392486 URL: https://svnweb.freebsd.org/changeset/ports/392486 Log: MFH: r392480 Update devel/p4p to 2015.1/1126382 to fix the broken distfile. Move plist execs to the stage and init script. PR: 198692 Differential Revision: https://reviews.freebsd.org/D3092 Approved by: mat (mentor) Approved by: ports-secteam (feld) Modified: branches/2015Q3/devel/p4p/Makefile branches/2015Q3/devel/p4p/distinfo.freebsd100x86 branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 branches/2015Q3/devel/p4p/distinfo.freebsd70x86 branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 branches/2015Q3/devel/p4p/files/p4p.in branches/2015Q3/devel/p4p/pkg-plist Directory Properties: branches/2015Q3/ (props changed) Modified: branches/2015Q3/devel/p4p/Makefile ============================================================================== --- branches/2015Q3/devel/p4p/Makefile Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/Makefile Sun Jul 19 04:34:33 2015 (r392486) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4p -PORTVERSION= 2014.2.962050 +PORTVERSION= 2015.1.1126382 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -15,12 +15,6 @@ 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 @@ -29,6 +23,8 @@ NO_WRKSUBDIR= yes P4CACHE?= /var/db/p4p P4LOG?= /var/log/p4p.log +PLIST_SUB= P4CACHE=${P4CACHE} + SUB_LIST= P4CACHE=${P4CACHE} \ P4LOG=${P4LOG} @@ -43,13 +39,6 @@ GROUPS= p4admin do-install: ${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${STAGEDIR}${PREFIX}/sbin/ - @${MKDIR} ${STAGEDIR}${P4CACHE} - @${ECHO_CMD} "@exec ${MKDIR} ${P4CACHE}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4CACHE}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 750 ${P4CACHE}" >> ${TMPPLIST} - @${ECHO_CMD} "@unexec ${RMDIR} ${P4CACHE} 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}${P4CACHE} .include Modified: branches/2015Q3/devel/p4p/distinfo.freebsd100x86 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd100x86 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd100x86 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86/p4p) = 555b1196824fd495bdf6a4524e77737fb679afa5b13d93386c1078d25bf77156 -SIZE (perforce/2014.2.962050/bin.freebsd100x86/p4p) = 2253172 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86/p4p) = 4112a14b93630f3cf78f1e733e90c72f9560eaf1fbb8f240a8bf73dfe002dc4a +SIZE (perforce/2015.1.1126382/bin.freebsd100x86/p4p) = 2362740 Modified: branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd100x86_64 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86_64/p4p) = eb6e988d05d6e7bd65ffb3fc9beaa6a0f05aaf132d18731bf8280fcbe5456127 -SIZE (perforce/2014.2.962050/bin.freebsd100x86_64/p4p) = 2520496 +SHA256 (perforce/2015.1.1126382/bin.freebsd100x86_64/p4p) = 8fb5f91d99d7ef965d2879cbc934ba3bbb2ea296f137f27f3b0a323588baf1c5 +SIZE (perforce/2015.1.1126382/bin.freebsd100x86_64/p4p) = 2627408 Modified: branches/2015Q3/devel/p4p/distinfo.freebsd70x86 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd70x86 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd70x86 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86/p4p) = 516f12eba6149dc2f50d2916086a64c474a031cc7d8c914c5d9717555b08f40a -SIZE (perforce/2014.2.962050/bin.freebsd70x86/p4p) = 2302392 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86/p4p) = b987a0bfeef99e28eaf12db66e0bb930c28180c1d69c8a05caf8c0964779a8f8 +SIZE (perforce/2015.1.1126382/bin.freebsd70x86/p4p) = 2404000 Modified: branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 ============================================================================== --- branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/distinfo.freebsd70x86_64 Sun Jul 19 04:34:33 2015 (r392486) @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86_64/p4p) = 0cd62924f16c9dcbd075f72712675d69ce1aa0f91634851e05ac81919fe2ee23 -SIZE (perforce/2014.2.962050/bin.freebsd70x86_64/p4p) = 2497968 +SHA256 (perforce/2015.1.1126382/bin.freebsd70x86_64/p4p) = 9609923de4f6c83e072c76448137e78e7721a50c03513b95bb2e8663ec26613f +SIZE (perforce/2015.1.1126382/bin.freebsd70x86_64/p4p) = 2601336 Modified: branches/2015Q3/devel/p4p/files/p4p.in ============================================================================== --- branches/2015Q3/devel/p4p/files/p4p.in Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/files/p4p.in Sun Jul 19 04:34:33 2015 (r392486) @@ -44,5 +44,13 @@ load_rc_config $name command="%%PREFIX%%/sbin/p4p" command_args="-r ${p4p_cache} -p ${p4p_port} -t ${p4p_target} -v ${p4p_debug} -L ${p4p_log} -d ${p4p_args} > /dev/null 2>&1 &" p4p_user="p4admin" +start_precmd="p4p_prestart" + +p4p_prestart() +{ + if [ ! -f "${p4p_log}" ]; then + install -o p4admin -g p4admin -m 0640 /dev/null ${p4p_log} + fi +} run_rc_command "$1" Modified: branches/2015Q3/devel/p4p/pkg-plist ============================================================================== --- branches/2015Q3/devel/p4p/pkg-plist Sun Jul 19 04:33:25 2015 (r392485) +++ branches/2015Q3/devel/p4p/pkg-plist Sun Jul 19 04:34:33 2015 (r392486) @@ -1 +1,2 @@ sbin/p4p +@dir(p4admin,p4admin,0750) %%P4CACHE%%