Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 30 May 2014 23:21:05 GMT
From:      Joseph Benden <joe@thrallingpenguin.com>
To:        freebsd-gnats-submit@FreeBSD.org
Subject:   ports/190436: [patch] Add staging support to www/sitebar
Message-ID:  <201405302321.s4UNL5B6007556@cgiserv.freebsd.org>
Resent-Message-ID: <201405302330.s4UNU01d079130@freefall.freebsd.org>

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

>Number:         190436
>Category:       ports
>Synopsis:       [patch] Add staging support to www/sitebar
>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:   Fri May 30 23:30: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/sitebar.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/sitebar/Makefile b/www/sitebar/Makefile
index a0ae706..24c27e6 100644
--- a/www/sitebar/Makefile
+++ b/www/sitebar/Makefile
@@ -16,16 +16,15 @@ WANT_PHP_WEB=	yes
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/www/${PORTNAME}
 
-NO_STAGE=	yes
 do-install:
-	@${MKDIR} ${DATADIR}
+	@${MKDIR} ${STAGEDIR}${DATADIR}
 	@cd ${WRKSRC} && \
-		${FIND} . -type d -exec ${MKDIR} ${DATADIR}/{} \;
+		${FIND} . -type d -exec ${MKDIR} ${STAGEDIR}${DATADIR}/{} \;
 	@cd ${WRKSRC} && \
-		${FIND} . ! -type d -exec ${INSTALL_DATA} {} ${DATADIR}/{} \;
-	@${FIND} ${DATADIR} ! -type d | \
-		${SED} 's,^${PREFIX}/,,' >> ${TMPPLIST}
-	@${FIND} ${DATADIR} -type d | ${SORT} -r | \
-		${SED} 's,^${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
+		${FIND} . ! -type d -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/{} \;
+	@${FIND} ${STAGEDIR}${DATADIR} ! -type d | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,,' >> ${TMPPLIST}
+	@${FIND} ${STAGEDIR}${DATADIR} -type d | ${SORT} -r | \
+		${SED} 's,^${STAGEDIR}${PREFIX}/,@dirrm ,' >> ${TMPPLIST}
 
 .include <bsd.port.mk>


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



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