From owner-svn-ports-head@freebsd.org Sat Jul 18 23:46:02 2015 Return-Path: Delivered-To: svn-ports-head@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 707099A5313; Sat, 18 Jul 2015 23:46:02 +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 53D211656; Sat, 18 Jul 2015 23:46:02 +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 t6INk2Tn041721; Sat, 18 Jul 2015 23:46:02 GMT (envelope-from gordon@FreeBSD.org) Received: (from gordon@localhost) by repo.freebsd.org (8.14.9/8.14.9/Submit) id t6INjxbT041708; Sat, 18 Jul 2015 23:45:59 GMT (envelope-from gordon@FreeBSD.org) Message-Id: <201507182345.t6INjxbT041708@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: gordon set sender to gordon@FreeBSD.org using -f From: Gordon Tetlow Date: Sat, 18 Jul 2015 23:45:59 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r392477 - in head/devel/p4d: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 18 Jul 2015 23:46:02 -0000 Author: gordon Date: Sat Jul 18 23:45:58 2015 New Revision: 392477 URL: https://svnweb.freebsd.org/changeset/ports/392477 Log: Update devel/p4d to 2015.1/1045032 to fix broken fetch. Remove unneeded exec statements by moving them into the port stage or init script. PR: 198692 Differential Revision: https://reviews.freebsd.org/D3087 Approved by: mat (mentor) MFH: 2015Q3 Modified: head/devel/p4d/Makefile head/devel/p4d/distinfo.freebsd100x86 head/devel/p4d/distinfo.freebsd100x86_64 head/devel/p4d/distinfo.freebsd70x86 head/devel/p4d/distinfo.freebsd70x86_64 head/devel/p4d/files/p4d.in head/devel/p4d/pkg-plist Modified: head/devel/p4d/Makefile ============================================================================== --- head/devel/p4d/Makefile Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/Makefile Sat Jul 18 23:45:58 2015 (r392477) @@ -2,7 +2,7 @@ # $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}/ @@ -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 P4ROOT?= /var/db/p4d P4LOG?= /var/log/p4d.log +PLIST_SUB= P4ROOT=${P4ROOT} + SUB_LIST= P4ROOT=${P4ROOT} \ P4LOG=${P4LOG} @@ -43,13 +39,6 @@ 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 Modified: head/devel/p4d/distinfo.freebsd100x86 ============================================================================== --- head/devel/p4d/distinfo.freebsd100x86 Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/distinfo.freebsd100x86 Sat Jul 18 23:45:58 2015 (r392477) @@ -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 Modified: head/devel/p4d/distinfo.freebsd100x86_64 ============================================================================== --- head/devel/p4d/distinfo.freebsd100x86_64 Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/distinfo.freebsd100x86_64 Sat Jul 18 23:45:58 2015 (r392477) @@ -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 Modified: head/devel/p4d/distinfo.freebsd70x86 ============================================================================== --- head/devel/p4d/distinfo.freebsd70x86 Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/distinfo.freebsd70x86 Sat Jul 18 23:45:58 2015 (r392477) @@ -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 Modified: head/devel/p4d/distinfo.freebsd70x86_64 ============================================================================== --- head/devel/p4d/distinfo.freebsd70x86_64 Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/distinfo.freebsd70x86_64 Sat Jul 18 23:45:58 2015 (r392477) @@ -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 Modified: head/devel/p4d/files/p4d.in ============================================================================== --- head/devel/p4d/files/p4d.in Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/files/p4d.in Sat Jul 18 23:45:58 2015 (r392477) @@ -41,5 +41,13 @@ load_rc_config $name 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" Modified: head/devel/p4d/pkg-plist ============================================================================== --- head/devel/p4d/pkg-plist Sat Jul 18 23:43:41 2015 (r392476) +++ head/devel/p4d/pkg-plist Sat Jul 18 23:45:58 2015 (r392477) @@ -1 +1,2 @@ sbin/p4d +@dir(p4admin,p4admin,0750) %%P4ROOT%%