>Number:         186128
>Category:       ports
>Synopsis:       [PATCH] www/xpi-adblock: fix stagin for all XPI ports
>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 Jan 26 13:00:01 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator:     Lapo Luchini
>Release:        FreeBSD 10.0-RELEASE amd64
>Organization:
>Environment:
System: FreeBSD lapo.andxor.it 10.0-RELEASE FreeBSD 10.0-RELEASE #0 r260789: Thu Jan 16 22:34:59 UTC
>Description:
This patch should fix staging on *all* the XPI ports (except if any has a local install target, I guess).
I tested it (using porttools "port test") on 3 of them.
This is the complete list, as grepped from the Ports tree:

audio/xpi-*
mail/thunderbird-i18n
mail/xpi-*
russian/xpi-*
www/bugmenot-firefox
www/firefox-esr-i18n
www/firefox-i18n
www/seamonkey-i18n
www/xpi-*

Port maintainer (miwi@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_11 (mode: change, diff: ports)
>How-To-Repeat:
>Fix:

--- xpi-adblock-0.5.3.043.patch begins here ---
diff -ruN /usr/ports/www/xpi-adblock/Makefile ./Makefile
--- /usr/ports/www/xpi-adblock/Makefile	2014-01-22 18:00:46.000000000 +0100
+++ ./Makefile	2014-01-25 08:49:01.158104313 +0100
@@ -15,7 +15,6 @@
 		defaults/preferences/adblock.js install.js install.rdf license.txt
 XPI_DIRS=	chrome/adblock chrome components defaults/preferences defaults
 
-NO_STAGE=	yes
 post-patch:
 	@${REINPLACE_CMD} -e 's|2.0a3|2.0.*|g' ${WRKSRC}/install.rdf
 	@${RM} -f ${WRKSRC}/install.rdf?*
diff -ruN /usr/ports/www/xpi-adblock/Makefile.xpi ./Makefile.xpi
--- /usr/ports/www/xpi-adblock/Makefile.xpi	2013-06-28 21:21:42.000000000 +0200
+++ ./Makefile.xpi	2014-01-25 08:56:15.619074922 +0100
@@ -166,13 +166,13 @@
 
 .if !target(do-install)
 do-install:
-	@${INSTALL} -d ${_TD_FULL} ${XPI_SLDIRS_ALL}
-	@${CP} -R ${WRKSRC}/ ${_TD_FULL}/
+	@${INSTALL} -d ${STAGEDIR}${_TD_FULL} ${STAGEDIR}${XPI_SLDIRS_ALL}
+	@${CP} -R ${WRKSRC}/ ${STAGEDIR}${_TD_FULL}/
 	@if [ -d ${FILESDIR} -a -f ${FILESDIR}/chrome.manifest ] ; \
-		then ${CP} ${FILESDIR}/chrome.manifest ${_TD_FULL}/ ; fi
-	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${_TD_FULL}/
-	@${CHMOD} -R a+rX,go-w ${_TD_FULL}/
-	@for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q} ; }
+		then ${CP} ${FILESDIR}/chrome.manifest ${STAGEDIR}${_TD_FULL}/ ; fi
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${_TD_FULL}/
+	@${CHMOD} -R a+rX,go-w ${STAGEDIR}${_TD_FULL}/
+	@for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${STAGEDIR}${_Q} ; }
 	@${ECHO_CMD} '@exec ${INSTALL} -d ${XPI_SLDIRS_ALL:S,^${PREFIX},%D,}' ${_A}
 	@${ECHO_CMD} '@exec for _dir in ${XPI_LINKFARMS} ; { ${LN} -sf ${_TD_FULL} $$_dir/ ${_Q}; }' ${_A}
 	@${ECHO_CMD} '@unexec for _dir in ${XPI_LINKFARMS} ; { ${RM} -f $$_dir/${XPI_ID} ; }' ${_A}
--- xpi-adblock-0.5.3.043.patch ends here ---

>Release-Note:
>Audit-Trail:
>Unformatted:
_______________________________________________
freebsd-ports-bugs@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-ports-bugs
To unsubscribe, send any mail to "freebsd-ports-bugs-unsubscribe@freebsd.org"