diff options
| author | gordon <gordon@FreeBSD.org> | 2015-07-19 07:52:28 +0800 |
|---|---|---|
| committer | gordon <gordon@FreeBSD.org> | 2015-07-19 07:52:28 +0800 |
| commit | e48a2021421b3eca7eea536558ac35738f1e8145 (patch) | |
| tree | 9482c294962cd3a80b3617db2d46a5d8d10200fa | |
| parent | 2c3b72964f60aa1b63a8dd6749a8018471e688cf (diff) | |
| download | freebsd-ports-gnome-e48a2021421b3eca7eea536558ac35738f1e8145.tar.gz freebsd-ports-gnome-e48a2021421b3eca7eea536558ac35738f1e8145.tar.zst freebsd-ports-gnome-e48a2021421b3eca7eea536558ac35738f1e8145.zip | |
Update devel/p4ftpd to 2015..1/1024208 fixing broken distfile.
Move unneeded execs from the plist into the init script.
PR: 198692
Differential Revision: https://reviews.freebsd.org/D3089
Approved by: mat (mentor)
MFH: 2015Q3
| -rw-r--r-- | devel/p4ftpd/Makefile | 11 | ||||
| -rw-r--r-- | devel/p4ftpd/distinfo.freebsd100x86 | 4 | ||||
| -rw-r--r-- | devel/p4ftpd/distinfo.freebsd100x86_64 | 4 | ||||
| -rw-r--r-- | devel/p4ftpd/distinfo.freebsd70x86 | 4 | ||||
| -rw-r--r-- | devel/p4ftpd/distinfo.freebsd70x86_64 | 4 | ||||
| -rw-r--r-- | devel/p4ftpd/files/p4ftpd.in | 8 |
6 files changed, 17 insertions, 18 deletions
diff --git a/devel/p4ftpd/Makefile b/devel/p4ftpd/Makefile index e4e3dbe1874f..679304b6059c 100644 --- a/devel/p4ftpd/Makefile +++ b/devel/p4ftpd/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= p4ftpd -PORTVERSION= 2014.2.962050 +PORTVERSION= 2015.1.1024208 CATEGORIES= devel MASTER_SITES= ftp://ftp.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ \ http://filehost.perforce.com/perforce/${P4VERSION}/bin.${PLATFORM}/ @@ -13,12 +13,6 @@ EXTRACT_ONLY= # none MAINTAINER= gordon@FreeBSD.org COMMENT= Perforce server -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 @@ -39,8 +33,5 @@ GROUPS= p4admin do-install: ${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${STAGEDIR}${PREFIX}/sbin/ - @${ECHO_CMD} "@exec ${TOUCH} ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${P4LOG}" >> ${TMPPLIST} - @${ECHO_CMD} "@exec ${CHMOD} 640 ${P4LOG}" >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/devel/p4ftpd/distinfo.freebsd100x86 b/devel/p4ftpd/distinfo.freebsd100x86 index 80a7048ca47d..7fa91a941acc 100644 --- a/devel/p4ftpd/distinfo.freebsd100x86 +++ b/devel/p4ftpd/distinfo.freebsd100x86 @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86/p4ftpd) = 7d17b0c3a178a823c2b441067f3a6916c22e8c86a5628dd82cb575b36b729afd -SIZE (perforce/2014.2.962050/bin.freebsd100x86/p4ftpd) = 2551480 +SHA256 (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = f9c63fafb8bf114286a778704c16a7a5b8d6b6fc5e8201a2f75218e416c7f067 +SIZE (perforce/2015.1.1024208/bin.freebsd100x86/p4ftpd) = 2596224 diff --git a/devel/p4ftpd/distinfo.freebsd100x86_64 b/devel/p4ftpd/distinfo.freebsd100x86_64 index 1634c380330e..7de51c252149 100644 --- a/devel/p4ftpd/distinfo.freebsd100x86_64 +++ b/devel/p4ftpd/distinfo.freebsd100x86_64 @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd100x86_64/p4ftpd) = 11f2e5fcb17e21ec8bdba86a3e91dc99b55f55ab51ee230c603e1070b5b95969 -SIZE (perforce/2014.2.962050/bin.freebsd100x86_64/p4ftpd) = 2807824 +SHA256 (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = ef79956f0e17e26e16d1b7d486e6611263cce9fa64a733b7e6976f1dbc7cfc01 +SIZE (perforce/2015.1.1024208/bin.freebsd100x86_64/p4ftpd) = 2852272 diff --git a/devel/p4ftpd/distinfo.freebsd70x86 b/devel/p4ftpd/distinfo.freebsd70x86 index 28c0332957e5..01180e5d91d4 100644 --- a/devel/p4ftpd/distinfo.freebsd70x86 +++ b/devel/p4ftpd/distinfo.freebsd70x86 @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86/p4ftpd) = 9565b6c695bbe3739ada7a1c84a8d7014121fbe952ed6f2bc146fa4762bdd21d -SIZE (perforce/2014.2.962050/bin.freebsd70x86/p4ftpd) = 2629832 +SHA256 (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 4e13ffd9ecc6fa773917f3da73f85220e0e934d09d8fd8736b06645023cab264 +SIZE (perforce/2015.1.1024208/bin.freebsd70x86/p4ftpd) = 2671092 diff --git a/devel/p4ftpd/distinfo.freebsd70x86_64 b/devel/p4ftpd/distinfo.freebsd70x86_64 index c33bdc3edc7d..9ad8b2c11cf4 100644 --- a/devel/p4ftpd/distinfo.freebsd70x86_64 +++ b/devel/p4ftpd/distinfo.freebsd70x86_64 @@ -1,2 +1,2 @@ -SHA256 (perforce/2014.2.962050/bin.freebsd70x86_64/p4ftpd) = e68d416a3dbbd1e5c136542da9ca760e02f0aa86652d6ba97e75b92ae4219eaa -SIZE (perforce/2014.2.962050/bin.freebsd70x86_64/p4ftpd) = 2795112 +SHA256 (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 6fa08dda4fad1e1c0ad5b5a5d267110c509ee240bb7c611433abb5ceb46056b7 +SIZE (perforce/2015.1.1024208/bin.freebsd70x86_64/p4ftpd) = 2840144 diff --git a/devel/p4ftpd/files/p4ftpd.in b/devel/p4ftpd/files/p4ftpd.in index aa7c0d5b026b..e87724ee10f1 100644 --- a/devel/p4ftpd/files/p4ftpd.in +++ b/devel/p4ftpd/files/p4ftpd.in @@ -40,5 +40,13 @@ load_rc_config $name command="%%PREFIX%%/sbin/p4ftpd" command_args="-l ${p4ftpd_listen} -p ${p4ftpd_port} -v ${p4ftpd_debug} -L ${p4ftpd_log} -d -u p4admin ${p4ftpd_args} > /dev/null 2>&1 &" +start_precmd="p4ftpd_prestart" + +p4ftpd_prestart() +{ + if [ ! -f "${p4ftpd_log}" ]; then + install -o p4admin -g p4admin -m 0640 /dev/null ${p4ftpd_log} + fi +} run_rc_command "$1" |