Attachment 143700 Details for Bug 190957 – Added stage support to usermanager

Added stage support to usermanager

usermanager-staging.patch.txt (text/plain), 1.33 KB, created by joe on 2014-06-12 03:00:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: joe

Created: 2014-06-12 03:00:29 UTC

Size: 1.33 KB

patch

obsolete

>diff --git a/www/usermanager/Makefile b/www/usermanager/Makefile
>index a21867f..633d4dd 100644
>--- a/www/usermanager/Makefile
>+++ b/www/usermanager/Makefile
>@@ -22,7 +22,6 @@ PLIST_SUB+=	INSTALLDIR=${INSTALLDIR}
> _INSTDIR=	www/data/UserManager
> INSTALLDIR?=	${_INSTDIR}
> 
>-NO_STAGE=	yes
> pre-fetch:
> .if ${INSTALLDIR} == ${_INSTDIR}
> 	@${ECHO_MSG} ""
>@@ -35,14 +34,10 @@ post-patch:
> 	 -e 's|%%INSTALLDIR%%|${INSTALLDIR}|g' ${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
> 
> do-install:
>-	@${MKDIR} ${PREFIX}/${INSTALLDIR}
>-	@${CP} -Rp ${WRKSRC}/* ${PREFIX}/${INSTALLDIR}
>-	@${CHMOD} 666 ${PREFIX}/${INSTALLDIR}/config.php
>-	@${ECHO_CMD} ""
>-
>-post-install:
>-.if !defined(BATCH)
>-	@${CAT} ${PKGMESSAGE}
>-.endif
>+	@${MKDIR} ${STAGEDIR}${PREFIX}/${INSTALLDIR}
>+	@${CP} -Rp ${WRKSRC}/* ${STAGEDIR}${PREFIX}/${INSTALLDIR}
>+	@${CHMOD} 666 ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php
>+	@${MV} ${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php \
>+		${STAGEDIR}${PREFIX}/${INSTALLDIR}/config.php.sample
> 
> .include <bsd.port.mk>
>diff --git a/www/usermanager/pkg-plist b/www/usermanager/pkg-plist
>index 753f466..523cebb 100644
>--- a/www/usermanager/pkg-plist
>+++ b/www/usermanager/pkg-plist
>@@ -1,5 +1,5 @@
> %%INSTALLDIR%%/CHANGELOG
>-%%INSTALLDIR%%/config.php
>+@sample %%INSTALLDIR%%/config.php.sample
> %%INSTALLDIR%%/index.php
> %%INSTALLDIR%%/install.php
> %%INSTALLDIR%%/readme.txt

Actions: View

Attachments on bug 190957: 143700