ports/190025: [patch] Add staging support to www/crp

Joseph Benden joe at thrallingpenguin.com
Tue May 20 18:20:00 UTC 2014


>Number:         190025
>Category:       ports
>Synopsis:       [patch] Add staging support to www/crp
>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:   Tue May 20 18:20: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 at lucy:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Adds staging support to www/crp.
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff --git a/www/crp/Makefile b/www/crp/Makefile
index f8bf540..fc330c0 100644
--- a/www/crp/Makefile
+++ b/www/crp/Makefile
@@ -19,17 +19,16 @@ SPOOLDIR?=	/var/spool/conference
 
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
-NO_STAGE=	yes
 post-patch:
 	@${SED} -e 's|%%WWWDIR%%|${WWWDIR}|g; s|%%DISTNAME%%|${DISTNAME}|g' \
 		${MASTERDIR}/pkg-message > ${PKGMESSAGE}
 
 do-install:
-	@${MKDIR} -m 755 ${WWWDIR} ${SPOOLDIR}
-	@${CP} -R ${WRKSRC}/ ${WWWDIR}/
+	@${MKDIR} -m 755 ${STAGEDIR}${WWWDIR} ${STAGEDIR}${SPOOLDIR}
+	@${CP} -R ${WRKSRC}/ ${STAGEDIR}${WWWDIR}/
 	@${SED} -e 's#/var/www/html#${WWWDIR}#' \
-	  ${WRKSRC}/Code/confHeader.inc > ${WWWDIR}/Code/confHeader.inc
-	@${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${WWWDIR} ${SPOOLDIR}
+	  ${WRKSRC}/Code/confHeader.inc > ${STAGEDIR}${WWWDIR}/Code/confHeader.inc
+	@${CHOWN} -R ${WWWOWN}:${WWWGROUP} ${STAGEDIR}${WWWDIR} ${STAGEDIR}${SPOOLDIR}
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.mk>
diff --git a/www/crp/pkg-plist b/www/crp/pkg-plist
index 5f29372..8b9d3f3 100644
--- a/www/crp/pkg-plist
+++ b/www/crp/pkg-plist
@@ -237,3 +237,4 @@
 @dirrm %%WWWDIR%%/Assistant
 @dirrm %%WWWDIR%%/All
 @dirrm %%WWWDIR%%
+ at dirrmtry /var/spool/conference


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


More information about the freebsd-ports-bugs mailing list