Page MenuHomeFreeBSD
Files F150170535

D3087.diff
No OneTemporary
Actions

D3087.diff
View Options

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

File Metadata

Mime Type
text/plain
Expires
Tue, Mar 31, 12:08 AM (54 m, 7 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
30608633
Default Alt Text
D3087.diff (4 KB)

Event Timeline