Attachment 143544 Details for Bug 190805 – Attached version of the inlined patch

[patch] Attached version of the inlined patch

perforce.diff (text/plain), 2.60 KB, created by Gordon Tetlow on 2014-06-08 20:54:15 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Gordon Tetlow

Created: 2014-06-08 20:54:15 UTC

Size: 2.60 KB

patch

obsolete

>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}

Flags:

gordon: maintainer-approval+

Actions: View | Diff

Attachments on bug 190805: 143544 | 143663