Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 08 Jun 2014 20:49:48 +0000
From:      bz-noreply@freebsd.org
To:        freebsd-ports-bugs@FreeBSD.org
Subject:   [Bug 190805] New: Update Perforce ports for stage support
Message-ID:  <bug-190805-13@https.bugs.freebsd.org/bugzilla/>

next in thread | raw e-mail | index | archive | help
https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=190805

            Bug ID: 190805
           Summary: Update Perforce ports for stage support
           Product: Ports Tree
           Version: Latest
          Hardware: Any
                OS: Any
            Status: Needs Triage
          Severity: Affects Many People
          Priority: Normal
         Component: Individual Port(s)
          Assignee: freebsd-ports-bugs@FreeBSD.org
          Reporter: gordon@tetlows.org

Update p4d, p4p, and p4ftpd for STAGE support.

Fix:
Index: p4d/Makefile
===================================================================
--- p4d/Makefile    (revision 357067)
+++ p4d/Makefile    (working copy)
@@ -34,7 +34,6 @@

 USE_RC_SUBR=    p4d

-NO_STAGE=    yes
 .include <bsd.port.pre.mk>

 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -43,16 +42,9 @@
 GROUPS=    p4admin

 do-install:
-    ${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${PREFIX}/sbin/
+    ${INSTALL_PROGRAM} ${_DISTDIR}/p4d ${STAGEDIR}${PREFIX}/sbin/

 post-install:
-    @${CAT} ${PKGMESSAGE}
-    ${MKDIR} ${DESTDIR}${P4ROOT}
-    ${CHOWN} p4admin:p4admin ${DESTDIR}${P4ROOT}
-    ${CHMOD} 750 ${DESTDIR}${P4ROOT}
-    ${TOUCH} ${DESTDIR}${P4LOG}
-    ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-    ${CHMOD} 640 ${DESTDIR}${P4LOG}
     @${ECHO_CMD} "@exec ${MKDIR} ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
     @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4ROOT}" >>
${TMPPLIST}
     @${ECHO_CMD} "@exec ${CHMOD} 750 ${DESTDIR}${P4ROOT}" >> ${TMPPLIST}
Index: p4ftpd/Makefile
===================================================================
--- p4ftpd/Makefile    (revision 357067)
+++ p4ftpd/Makefile    (working copy)
@@ -30,7 +30,6 @@

 USE_RC_SUBR=    p4ftpd

-NO_STAGE=    yes
 .include <bsd.port.pre.mk>

 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -39,12 +38,9 @@
 GROUPS=    p4admin

 do-install:
-    ${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${PREFIX}/sbin/
+    ${INSTALL_PROGRAM} ${_DISTDIR}/p4ftpd ${STAGEDIR}${PREFIX}/sbin/

 post-install:
-    ${TOUCH} ${DESTDIR}${P4LOG}
-    ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-    ${CHMOD} 640 ${DESTDIR}${P4LOG}
     @${ECHO_CMD} "@exec ${TOUCH} ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
     @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}" >>
${TMPPLIST}
     @${ECHO_CMD} "@exec ${CHMOD} 640 ${DESTDIR}${P4LOG}" >> ${TMPPLIST}
Index: p4p/Makefile
===================================================================
--- p4p/Makefile    (revision 357067)
+++ p4p/Makefile    (working copy)
@@ -34,7 +34,6 @@

 USE_RC_SUBR=    p4p

-NO_STAGE=    yes
 .include <bsd.port.pre.mk>

 .include "${.CURDIR}/../p4/Makefile.inc"
@@ -43,15 +42,9 @@
 GROUPS=    p4admin

 do-install:
-    ${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${PREFIX}/sbin/
+    ${INSTALL_PROGRAM} ${_DISTDIR}/p4p ${STAGEDIR}${PREFIX}/sbin/

 post-install:
-    ${MKDIR} ${DESTDIR}${P4CACHE}
-    ${CHOWN} p4admin:p4admin ${DESTDIR}${P4CACHE}
-    ${CHMOD} 750 ${DESTDIR}${P4CACHE}
-    ${TOUCH} ${DESTDIR}${P4LOG}
-    ${CHOWN} p4admin:p4admin ${DESTDIR}${P4LOG}
-    ${CHMOD} 640 ${DESTDIR}${P4LOG}
     @${ECHO_CMD} "@exec ${MKDIR} ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}
     @${ECHO_CMD} "@exec ${CHOWN} p4admin:p4admin ${DESTDIR}${P4CACHE}" >>
${TMPPLIST}
     @${ECHO_CMD} "@exec ${CHMOD} 750 ${DESTDIR}${P4CACHE}" >> ${TMPPLIST}

-- 
You are receiving this mail because:
You are the assignee for the bug.



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?bug-190805-13>