From d4791b77602e375b6613b17038c7172d77845fae Mon Sep 17 00:00:00 2001 From: "Philip M. Gollucci" Date: Wed, 8 Sep 2010 00:55:10 +0000 Subject: - Account for ports/150327 Do not install meta data (META-INF) since its not needed allow for xpi-post-extract to still work in xpi-* ports o fix pkg-plist o fix XPI_DIRS, XPI_FILES o Bump PORTREVISION o s/post-extract/xpi-post-extract/ PR: ports/150327 Submitted by: Lapo Luchini , tweaked by myself Approved by: maintainer timeout (miwi) Tested by: P6 TB Run, RideCharge Inc. / Taximagic TB Run --- www/xpi-adblock_plus/Makefile | 6 +++--- www/xpi-downthemall/Makefile | 2 +- www/xpi-flashgot/Makefile | 6 +++--- www/xpi-foxmarks/Makefile | 1 + www/xpi-foxmarks/pkg-plist | 4 ---- www/xpi-foxyproxy/Makefile | 2 +- www/xpi-google-notebook/Makefile | 1 + www/xpi-google-notebook/pkg-plist | 4 ---- www/xpi-gwt-dev-plugin/Makefile | 2 +- www/xpi-joga/Makefile | 6 +++--- www/xpi-jsview/Makefile | 2 +- www/xpi-mousegestures/Makefile | 2 +- www/xpi-noscript/Makefile | 5 +++-- www/xpi-pdf_download/Makefile | 6 +++--- www/xpi-statusbarclock/Makefile | 2 +- www/xpi-togglewordwrap/Makefile | 1 + www/xpi-togglewordwrap/pkg-plist | 4 ---- www/xpi-unplug/Makefile | 4 ++-- 18 files changed, 26 insertions(+), 34 deletions(-) (limited to 'www') diff --git a/www/xpi-adblock_plus/Makefile b/www/xpi-adblock_plus/Makefile index b3b6c6de3857..27f3777ee414 100644 --- a/www/xpi-adblock_plus/Makefile +++ b/www/xpi-adblock_plus/Makefile @@ -7,6 +7,7 @@ PORTNAME= adblock_plus PORTVERSION= 1.2.1 +PORTREVISION= 1 DISTVERSIONSUFFIX= -fx+sm+tb+fn CATEGORIES= www @@ -15,11 +16,10 @@ COMMENT= A content filtering extension XPI_NUM= 1865 XPI_ID= {d10d0bf8-f5b5-c8b4-a8b2-2b9879e08c5d} -XPI_FILES= META-INF/manifest.mf META-INF/zigbert.rsa META-INF/zigbert.sf \ - chrome/adblockplus.jar chrome.manifest components/AdblockPlus.js \ +XPI_FILES= chrome/adblockplus.jar chrome.manifest components/AdblockPlus.js \ defaults/preferences/adblockplus.js \ icon.png install.rdf -XPI_DIRS= META-INF chrome components defaults/preferences defaults +XPI_DIRS= chrome components defaults/preferences defaults .include "../xpi-adblock/Makefile.xpi" .include diff --git a/www/xpi-downthemall/Makefile b/www/xpi-downthemall/Makefile index 06e12a711ce1..4ae4384ef68f 100644 --- a/www/xpi-downthemall/Makefile +++ b/www/xpi-downthemall/Makefile @@ -38,7 +38,7 @@ XPI_FILES= GPL LGPL LICENSE MPL chrome/chrome.jar \ XPI_DIRS= chrome/icons/default chrome/icons chrome components \ defaults/preferences defaults modules -post-extract: +xpi-post-extract: @${FIND} ${WRKSRC} -name .svn|${XARGS} ${RM} -rf .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" diff --git a/www/xpi-flashgot/Makefile b/www/xpi-flashgot/Makefile index b4ab406f9f24..442989b43499 100644 --- a/www/xpi-flashgot/Makefile +++ b/www/xpi-flashgot/Makefile @@ -7,6 +7,7 @@ PORTNAME= flashgot PORTVERSION= 1.2.1.09 +PORTREVISION= 1 #DISTVERSIONSUFFIX= -fx+mz+tb+ns+sm+fl CATEGORIES= www MASTER_SITES= http://software.informaction.com/data/releases/ CENKES @@ -16,10 +17,9 @@ COMMENT= Download links using popular download managers XPI_ID= {19503e42-ca3c-4c27-b1e2-9cdb2170ee34} XPI_NUM= 220 -XPI_FILES= META-INF/manifest.mf META-INF/zigbert.rsa META-INF/zigbert.sf \ - FlashGot_License.txt GPL.txt chrome/flashgot.jar chrome.manifest components/.autoreg \ +XPI_FILES= FlashGot_License.txt GPL.txt chrome/flashgot.jar chrome.manifest components/.autoreg \ components/flashgotService.js defaults/preferences/flashgot.js install.js install.rdf -XPI_DIRS= META-INF chrome components defaults/preferences defaults +XPI_DIRS= chrome components defaults/preferences defaults .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" .include diff --git a/www/xpi-foxmarks/Makefile b/www/xpi-foxmarks/Makefile index 9c4a797a3438..3710f575a367 100644 --- a/www/xpi-foxmarks/Makefile +++ b/www/xpi-foxmarks/Makefile @@ -7,6 +7,7 @@ PORTNAME= foxmarks PORTVERSION= 2.7.2 +PORTREVISION= 1 DISTVERSIONSUFFIX= -fx CATEGORIES= www diff --git a/www/xpi-foxmarks/pkg-plist b/www/xpi-foxmarks/pkg-plist index 4d82877d6782..23c039ac19cd 100644 --- a/www/xpi-foxmarks/pkg-plist +++ b/www/xpi-foxmarks/pkg-plist @@ -1,6 +1,3 @@ -%%XPI_XPIDIR%%/META-INF/manifest.mf -%%XPI_XPIDIR%%/META-INF/zigbert.rsa -%%XPI_XPIDIR%%/META-INF/zigbert.sf %%XPI_XPIDIR%%/chrome/.DS_Store %%XPI_XPIDIR%%/chrome/content/foxmarks-alert.xul %%XPI_XPIDIR%%/chrome/content/foxmarks-bookmark.js @@ -217,7 +214,6 @@ %%XPI_XPIDIR%%/components/foxmarks-service.xpt %%XPI_XPIDIR%%/defaults/preferences/prefs.js %%XPI_XPIDIR%%/install.rdf -@dirrm %%XPI_XPIDIR%%/META-INF @dirrm %%XPI_XPIDIR%%/chrome/content/shared @dirrm %%XPI_XPIDIR%%/chrome/content @dirrm %%XPI_XPIDIR%%/chrome/locale/bg-BG diff --git a/www/xpi-foxyproxy/Makefile b/www/xpi-foxyproxy/Makefile index 62348042d6c6..dd74ddb3ce8a 100644 --- a/www/xpi-foxyproxy/Makefile +++ b/www/xpi-foxyproxy/Makefile @@ -20,7 +20,7 @@ XPI_ID= foxyproxy@eric.h.jung LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -post-extract: +xpi-post-extract: @${FIND} ${WRKSRC} -type f -name '*.js' |${XARGS} ${SED} -i '' -e 's/[[:space:]]*$$//g' @${MV} ${WRKSRC}/LICENSE ${WRKSRC}/COPYING @${GREP} -Rl LICENSE ${WRKSRC} |${XARGS} ${REINPLACE_CMD} -e s/LICENSE/COPYING/g diff --git a/www/xpi-google-notebook/Makefile b/www/xpi-google-notebook/Makefile index 8e37bda159f3..0b80eeb5a808 100644 --- a/www/xpi-google-notebook/Makefile +++ b/www/xpi-google-notebook/Makefile @@ -7,6 +7,7 @@ PORTNAME= google-notebook PORTVERSION= 1.0.0.5 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= LOCAL/chinsan/xpi # The unversioned dist is at http://dl.google.com/firefox/google-notebook.xpi diff --git a/www/xpi-google-notebook/pkg-plist b/www/xpi-google-notebook/pkg-plist index d0caec45b4b6..4c51870fcb8a 100644 --- a/www/xpi-google-notebook/pkg-plist +++ b/www/xpi-google-notebook/pkg-plist @@ -1,6 +1,3 @@ -%%XPI_XPIDIR%%/META-INF/manifest.mf -%%XPI_XPIDIR%%/META-INF/zigbert.rsa -%%XPI_XPIDIR%%/META-INF/zigbert.sf %%XPI_XPIDIR%%/chrome/chromeFiles/content/gnotes_overlay.css %%XPI_XPIDIR%%/chrome/chromeFiles/content/google-gnotes-overlay.xul %%XPI_XPIDIR%%/chrome/chromeFiles/content/notebook.png @@ -9,7 +6,6 @@ %%XPI_XPIDIR%%/components/bootstrap.js %%XPI_XPIDIR%%/install.rdf %%XPI_XPIDIR%%/lib/gnotes.js -@dirrm %%XPI_XPIDIR%%/META-INF @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles/content @dirrm %%XPI_XPIDIR%%/chrome/chromeFiles @dirrm %%XPI_XPIDIR%%/chrome diff --git a/www/xpi-gwt-dev-plugin/Makefile b/www/xpi-gwt-dev-plugin/Makefile index f4a770ad0806..e2e04c08bbfe 100644 --- a/www/xpi-gwt-dev-plugin/Makefile +++ b/www/xpi-gwt-dev-plugin/Makefile @@ -39,7 +39,7 @@ do-fetch: ${FETCH_CMD} ${MASTER_SITES}${DISTFILES}?attredirects=0\&d=1 ; \ fi -post-extract: +xpi-post-extract: ${RM} -rf ${XPI_FILESDIR}/.svn ${XPI_FILESDIR}/*/.svn ${XPI_FILESDIR}/platform/* do-install: diff --git a/www/xpi-joga/Makefile b/www/xpi-joga/Makefile index b9d53b8bde9f..2bcf4b946b1f 100644 --- a/www/xpi-joga/Makefile +++ b/www/xpi-joga/Makefile @@ -7,6 +7,7 @@ PORTNAME= joga PORTVERSION= 1.6 +PORTREVISION= 1 CATEGORIES= www MASTER_SITES= CENKES # The unversioned dist is at http://dl.google.com/firefox/joga/companion.xpi @@ -16,9 +17,8 @@ MAINTAINER= miwi@FreeBSD.org COMMENT= Joga.com Companion XPI_ID= {06108483-1773-402e-a112-bfec19a73942} -XPI_FILES= META-INF/manifest.mf META-INF/zigbert.rsa META-INF/zigbert.sf chrome/joga.jar \ - chrome.manifest defaults/preferences/joga.js install.rdf -XPI_DIRS= META-INF chrome defaults/preferences defaults +XPI_FILES= chrome/joga.jar chrome.manifest defaults/preferences/joga.js install.rdf +XPI_DIRS= chrome defaults/preferences defaults .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" .include diff --git a/www/xpi-jsview/Makefile b/www/xpi-jsview/Makefile index d0fed3557e59..2811c6bcabc1 100644 --- a/www/xpi-jsview/Makefile +++ b/www/xpi-jsview/Makefile @@ -18,7 +18,7 @@ XPI_ID= {cf15270e-cf08-4def-b4ea-6a5ac23f3bca} XPI_FILES= chrome/jsview.jar chrome.manifest defaults/preferences/jsview.js install.js install.rdf XPI_DIRS= chrome defaults/preferences defaults -post-extract: +xpi-post-extract: @${RM} -rf ${WRKSRC}/temp .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" diff --git a/www/xpi-mousegestures/Makefile b/www/xpi-mousegestures/Makefile index b321e19d4db8..ee2dc1f8d007 100644 --- a/www/xpi-mousegestures/Makefile +++ b/www/xpi-mousegestures/Makefile @@ -20,7 +20,7 @@ XPI_FILES= chrome/mozgest.jar chrome.manifest components/mgIMouseService.xpt \ install/install.properties install.js install.rdf XPI_DIRS= chrome components install -post-extract: +xpi-post-extract: @${RM} -rf ${WRKSRC}/platform .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" diff --git a/www/xpi-noscript/Makefile b/www/xpi-noscript/Makefile index 1fcd853d6ca4..d6bf29520af3 100644 --- a/www/xpi-noscript/Makefile +++ b/www/xpi-noscript/Makefile @@ -7,6 +7,7 @@ PORTNAME= noscript PORTVERSION= 1.10 +PORTREVISION= 1 DISTVERSIONSUFFIX= -fx+sm+fn CATEGORIES= www @@ -17,8 +18,8 @@ XPI_ID= {73a6fe31-595d-460b-a920-fcc0f8843232} XPI_NUM= 722 XPI_FILES= GPL.txt NoScript_License.txt chrome/noscript.jar chrome.manifest \ components/noscriptService.js defaults/preferences/noscript.js \ - install.js install.rdf .autoreg mozilla.cfg META-INF/zigbert.rsa META-INF/manifest.mf META-INF/zigbert.sf -XPI_DIRS= chrome components defaults/preferences defaults META-INF + install.js install.rdf .autoreg mozilla.cfg +XPI_DIRS= chrome components defaults/preferences defaults .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" .include diff --git a/www/xpi-pdf_download/Makefile b/www/xpi-pdf_download/Makefile index 742419d46e61..a0a622069793 100644 --- a/www/xpi-pdf_download/Makefile +++ b/www/xpi-pdf_download/Makefile @@ -7,6 +7,7 @@ PORTNAME= pdf_download PORTVERSION= 3.0.0.1 +PORTREVISION= 1 DISTVERSIONSUFFIX= -fx CATEGORIES= www @@ -15,10 +16,9 @@ COMMENT= An extension to handle PDF files XPI_ID= {37E4D8EA-8BDA-4831-8EA1-89053939A250} XPI_NUM= 636 -XPI_FILES= META-INF/manifest.mf META-INF/zigbert.rsa META-INF/zigbert.sf \ - chrome/pdfdownload.jar chrome.manifest install.rdf \ +XPI_FILES= chrome/pdfdownload.jar chrome.manifest install.rdf \ defaults/preferences/prefs.js -XPI_DIRS= META-INF chrome defaults/preferences defaults +XPI_DIRS= chrome defaults/preferences defaults .include "../xpi-adblock/Makefile.xpi" .include diff --git a/www/xpi-statusbarclock/Makefile b/www/xpi-statusbarclock/Makefile index e0aac92f0d28..7ab8720d629d 100644 --- a/www/xpi-statusbarclock/Makefile +++ b/www/xpi-statusbarclock/Makefile @@ -20,7 +20,7 @@ XPI_DISTNAME= statusbar_clock XPI_ID= {3669edc0-b1ad-11d8-92e7-00d09e0179f2} XPI_NUM= 52 -post-extract: +xpi-post-extract: @${RM} -rf ${WRKSRC}/readme.txt .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" diff --git a/www/xpi-togglewordwrap/Makefile b/www/xpi-togglewordwrap/Makefile index 79c563302fa5..ce6e3ee8c86c 100644 --- a/www/xpi-togglewordwrap/Makefile +++ b/www/xpi-togglewordwrap/Makefile @@ -7,6 +7,7 @@ PORTNAME= togglewordwrap PORTVERSION= 1.2 +PORTREVISION= 1 DISTVERSIONSUFFIX= -fx+tb CATEGORIES= www diff --git a/www/xpi-togglewordwrap/pkg-plist b/www/xpi-togglewordwrap/pkg-plist index 1c2613b16a34..b0bfaa7051a2 100644 --- a/www/xpi-togglewordwrap/pkg-plist +++ b/www/xpi-togglewordwrap/pkg-plist @@ -1,6 +1,3 @@ -%%XPI_XPIDIR%%/META-INF/manifest.mf -%%XPI_XPIDIR%%/META-INF/whodoyoutrust.rsa -%%XPI_XPIDIR%%/META-INF/whodoyoutrust.sf %%XPI_XPIDIR%%/chrome/content/togglewordwrap/toggleWordWrap.js %%XPI_XPIDIR%%/chrome/content/togglewordwrap/toggleWordWrap.xul %%XPI_XPIDIR%%/chrome/locale/de/togglewordwrap/toggleWordWrap.dtd @@ -8,7 +5,6 @@ %%XPI_XPIDIR%%/chrome/locale/sk/togglewordwrap/toggleWordWrap.dtd %%XPI_XPIDIR%%/chrome.manifest %%XPI_XPIDIR%%/install.rdf -@dirrm %%XPI_XPIDIR%%/META-INF @dirrm %%XPI_XPIDIR%%/chrome/content/togglewordwrap @dirrm %%XPI_XPIDIR%%/chrome/content @dirrm %%XPI_XPIDIR%%/chrome/locale/de/togglewordwrap diff --git a/www/xpi-unplug/Makefile b/www/xpi-unplug/Makefile index 41a10554484d..70b8275498ab 100644 --- a/www/xpi-unplug/Makefile +++ b/www/xpi-unplug/Makefile @@ -16,8 +16,8 @@ COMMENT= Converts embedded media to html links XPI_ID= unplug@compunach XPI_NUM= 2254 -post-extract: - @${FIND} ${WRKSRC} -type d -name CVS|${XARGS} ${RM} -rf +xpi-post-extract: + ${FIND} ${WRKSRC} -type d -name CVS|${XARGS} ${RM} -rf .include "${.CURDIR}/../xpi-adblock/Makefile.xpi" .include -- cgit v1.2.3