Page MenuHomeFreeBSD
Files F155184745

D3092.diff
No OneTemporary
Actions

D3092.diff
View Options

Index: devel/p4p/Makefile
===================================================================
--- devel/p4p/Makefile
+++ devel/p4p/Makefile
@@ -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 @@
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 @@
P4CACHE?= /var/db/p4p
P4LOG?= /var/log/p4p.log
+PLIST_SUB= P4CACHE=${P4CACHE}
+
SUB_LIST= P4CACHE=${P4CACHE} \
P4LOG=${P4LOG}
@@ -43,13 +39,6 @@
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 <bsd.port.post.mk>
Index: devel/p4p/distinfo.freebsd100x86
===================================================================
--- devel/p4p/distinfo.freebsd100x86
+++ devel/p4p/distinfo.freebsd100x86
@@ -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
Index: devel/p4p/distinfo.freebsd100x86_64
===================================================================
--- devel/p4p/distinfo.freebsd100x86_64
+++ devel/p4p/distinfo.freebsd100x86_64
@@ -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
Index: devel/p4p/distinfo.freebsd70x86
===================================================================
--- devel/p4p/distinfo.freebsd70x86
+++ devel/p4p/distinfo.freebsd70x86
@@ -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
Index: devel/p4p/distinfo.freebsd70x86_64
===================================================================
--- devel/p4p/distinfo.freebsd70x86_64
+++ devel/p4p/distinfo.freebsd70x86_64
@@ -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
Index: devel/p4p/files/p4p.in
===================================================================
--- devel/p4p/files/p4p.in
+++ devel/p4p/files/p4p.in
@@ -44,5 +44,13 @@
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"
Index: devel/p4p/pkg-plist
===================================================================
--- devel/p4p/pkg-plist
+++ devel/p4p/pkg-plist
@@ -1 +1,2 @@
sbin/p4p
+@dir(p4admin,p4admin,0750) %%P4CACHE%%

File Metadata

Mime Type
text/plain
Expires
Sun, May 3, 2:09 AM (9 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
32636149
Default Alt Text
D3092.diff (4 KB)

Event Timeline