Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 25 May 2014 21:05:20 GMT
From:      Joseph Benden <joe@thrallingpenguin.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/190225: [patch] Add staging support to www/lionwiki
Message-ID:  <201405252105.s4PL5Ka3037974@cgiserv.freebsd.org>
Resent-Message-ID: <201405252110.s4PLA01O095832@freefall.freebsd.org>

next in thread | raw e-mail | index | archive | help

>Number:         190225
>Category:       ports
>Synopsis:       [patch] Add staging support to www/lionwiki
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 25 21:10:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Joseph Benden
>Release:        FreeBSD 11
>Organization:
>Environment:
FreeBSD lucy 11.0-CURRENT FreeBSD 11.0-CURRENT #4 r264887: Thu Apr 24 12:43:46 MST 2014     root@lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/lionwiki.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/lionwiki/Makefile b/www/lionwiki/Makefile
index b67d7b3..2d888bb 100644
--- a/www/lionwiki/Makefile
+++ b/www/lionwiki/Makefile
@@ -17,21 +17,17 @@ ROOTFILES=	config.php index.php
 ROOTDIRS=	lang plugins templates var
 SUB_FILES=	pkg-message
 
-NO_STAGE=	yes
 post-patch:
 	(cd ${WRKSRC} && ${MV} config.php config.php.sample)
 
 do-install:
-	${MKDIR} ${WWWDIR}
-	${INSTALL_DATA} ${WRKSRC}/config.php.sample ${WWWDIR}/
-	if [ ! -f ${WWWDIR}/config.php ]; then \
-		${CP} -p ${WWWDIR}/config.php.sample ${WWWDIR}/config.php; \
-	fi
-	${INSTALL_DATA} ${WRKSRC}/index.php ${WWWDIR}/
+	${MKDIR} ${STAGEDIR}${WWWDIR}
+	${INSTALL_DATA} ${WRKSRC}/config.php.sample ${STAGEDIR}${WWWDIR}/
+	${INSTALL_DATA} ${WRKSRC}/index.php ${STAGEDIR}${WWWDIR}/
 .for dirs in ${ROOTDIRS}
-	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dirs} ${WWWDIR}/ )
+	(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dirs} ${STAGEDIR}${WWWDIR}/ )
 .endfor
-	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${WWWDIR}
+	${CHOWN} -R ${WWWOWN}:${WWWGRP} ${STAGEDIR}${WWWDIR}
 
 post-install:
 	${CAT} ${PKGMESSAGE}


>Release-Note:
>Audit-Trail:
>Unformatted:



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