From d57cd6684a138d0057b11ac8a3205a4aef331586 Mon Sep 17 00:00:00 2001 From: tnn Date: Sat, 20 Aug 2011 13:05:49 +0000 Subject: Fix build of legacy mozilla packages and rename the PKGBASE to facilitate coinstallation with current packages. --- www/firefox36/Makefile | 31 ++++++--- www/firefox36/PLIST | 138 +++++++++++++++++++------------------- www/firefox36/files/firefox.sh.in | 4 +- 3 files changed, 91 insertions(+), 82 deletions(-) (limited to 'www/firefox36') diff --git a/www/firefox36/Makefile b/www/firefox36/Makefile index f0480780468..b8e72dca2b1 100644 --- a/www/firefox36/Makefile +++ b/www/firefox36/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2011/07/21 13:06:05 obache Exp $ +# $NetBSD: Makefile,v 1.4 2011/08/20 13:05:50 tnn Exp $ .include "../../devel/xulrunner192/dist.mk" -PKGNAME= firefox-${FIREFOX_VER} -PKGREVISION= 1 +PKGNAME= firefox36-${FIREFOX_VER} +PKGREVISION= 2 CATEGORIES= www MAINTAINER= tnn@NetBSD.org @@ -13,15 +13,24 @@ LICENSE= mpl-1.1 MOZILLA_DIR= # empty CONFIGURE_ARGS+= --enable-application=browser -CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner-sdk +CONFIGURE_ARGS+= --with-libxul-sdk=${PREFIX}/lib/xulrunner192-sdk CONFIGURE_ARGS+= --with-system-libxul -ALL_ENV+= MOZILLA_PKG_NAME=firefox +ALL_ENV+= MOZILLA_PKG_NAME=firefox36 + +SUBST_CLASSES+= fix-paths2 +SUBST_STAGE.fix-paths2= pre-configure +SUBST_MESSAGE.fix-paths2= Fixing absolute paths. +SUBST_FILES.fix-paths2= ${MOZILLA_DIR}xpcom/build/nsXPCOMPrivate.h +SUBST_FILES.fix-paths2+= ${MOZILLA_DIR}xulrunner/app/nsRegisterGREUnix.cpp +SUBST_FILES.fix-paths2+= ${MOZILLA_DIR}xulrunner/installer/Makefile.in +SUBST_SED.fix-paths2= -e 's,/etc/gre.d,${PREFIX}/lib/xulrunner192/gre.d,g' .include "../../devel/xulrunner/mozilla-common.mk" +CONFIGURE_ARGS+= --enable-chrome-format=jar .include "options.mk" -MOZILLA=firefox +MOZILLA=firefox36 .if !empty(PKG_OPTIONS:Mofficial-mozilla-branding) MOZILLA_NAME= Firefox 3.6 MOZILLA_ICON= ${WRKSRC}/other-licenses/branding/firefox/default48.png @@ -40,7 +49,7 @@ post-build: < ${FILESDIR}/desktop.in \ > ${WRKDIR}/desktop ${SED} -e 's|@PREFIX@|${PREFIX}|g' < ${FILESDIR}/firefox.sh.in \ - > ${WRKDIR}/firefox + > ${WRKDIR}/${MOZILLA} INSTALLATION_DIRS+= share/applications share/pixmaps post-install: @@ -48,11 +57,11 @@ post-install: ${DESTDIR}${PREFIX}/share/applications/${MOZILLA}.desktop ${INSTALL_DATA} ${MOZILLA_ICON} \ ${DESTDIR}${PREFIX}/share/pixmaps/${MOZILLA}.png - rm -f ${DESTDIR}${PREFIX}/bin/firefox - ${INSTALL_SCRIPT} ${WRKDIR}/firefox ${DESTDIR}${PREFIX}/bin + rm -f ${DESTDIR}${PREFIX}/bin/${MOZILLA} + ${INSTALL_SCRIPT} ${WRKDIR}/${MOZILLA} ${DESTDIR}${PREFIX}/bin -BUILDLINK_API_DEPENDS.xulrunner+= xulrunner>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR} -BUILD_DEPENDS+= xulrunner-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner192 +BUILDLINK_API_DEPENDS.xulrunner192+= xulrunner192>=${MOZ_BRANCH}${MOZ_BRANCH_MINOR} +BUILD_DEPENDS+= xulrunner192-${MOZ_BRANCH}${MOZ_BRANCH_MINOR}{,nb*}:../../devel/xulrunner192 .include "../../devel/xulrunner192/buildlink3.mk" .if !empty(PKG_BUILD_OPTIONS.xulrunner:Mgnome) CONFIGURE_ARGS+= --enable-gnomevfs --enable-dbus --enable-gnomeui diff --git a/www/firefox36/PLIST b/www/firefox36/PLIST index 8ed8e0bc4b5..cd19f2e7f19 100644 --- a/www/firefox36/PLIST +++ b/www/firefox36/PLIST @@ -1,69 +1,69 @@ -@comment $NetBSD: PLIST,v 1.1.1.1 2011/04/19 13:16:10 tnn Exp $ -bin/firefox -lib/firefox/.autoreg -lib/firefox/LICENSE -lib/firefox/README.txt -lib/firefox/application.ini -lib/firefox/blocklist.xml -lib/firefox/browserconfig.properties -lib/firefox/chrome/browser.jar -lib/firefox/chrome/browser.manifest -lib/firefox/chrome/classic.jar -lib/firefox/chrome/classic.manifest -lib/firefox/chrome/en-US.jar -lib/firefox/chrome/en-US.manifest -lib/firefox/chrome/icons/default/default16.png -lib/firefox/chrome/icons/default/default32.png -lib/firefox/chrome/icons/default/default48.png -lib/firefox/chrome/reporter.jar -lib/firefox/chrome/reporter.manifest -lib/firefox/components/FeedConverter.js -lib/firefox/components/FeedWriter.js -lib/firefox/components/WebContentConverter.js -lib/firefox/components/browser.xpt -lib/firefox/components/components.list -lib/firefox/components/fuelApplication.js -lib/firefox/components/libbrowsercomps.so -lib/firefox/components/libbrowserdirprovider.so -lib/firefox/components/nsBrowserContentHandler.js -lib/firefox/components/nsBrowserGlue.js -lib/firefox/components/nsMicrosummaryService.js -lib/firefox/components/nsPlacesTransactionsService.js -lib/firefox/components/nsPrivateBrowsingService.js -lib/firefox/components/nsSafebrowsingApplication.js -lib/firefox/components/nsSessionStartup.js -lib/firefox/components/nsSessionStore.js -lib/firefox/components/nsSetDefaultBrowser.js -lib/firefox/components/nsSidebar.js -lib/firefox/defaults/preferences/channel-prefs.js -lib/firefox/defaults/preferences/firefox-branding.js -lib/firefox/defaults/preferences/firefox-l10n.js -lib/firefox/defaults/preferences/firefox.js -lib/firefox/defaults/preferences/reporter.js -lib/firefox/defaults/profile/bookmarks.html -lib/firefox/defaults/profile/chrome/userChrome-example.css -lib/firefox/defaults/profile/chrome/userContent-example.css -lib/firefox/defaults/profile/localstore.rdf -lib/firefox/defaults/profile/mimeTypes.rdf -lib/firefox/defaults/profile/prefs.js -lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png -lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf -lib/firefox/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png -lib/firefox/firefox -lib/firefox/icons/document.png -lib/firefox/icons/mozicon128.png -lib/firefox/modules/NetworkPrioritizer.jsm -lib/firefox/modules/distribution.js -lib/firefox/modules/openLocationLastURL.jsm -lib/firefox/removed-files -lib/firefox/run-mozilla.sh -lib/firefox/searchplugins/amazondotcom.xml -lib/firefox/searchplugins/answers.xml -lib/firefox/searchplugins/creativecommons.xml -lib/firefox/searchplugins/eBay.xml -lib/firefox/searchplugins/google.xml -lib/firefox/searchplugins/wikipedia.xml -lib/firefox/searchplugins/yahoo.xml -lib/firefox/updater.ini -share/applications/firefox.desktop -share/pixmaps/firefox.png +@comment $NetBSD: PLIST,v 1.2 2011/08/20 13:05:50 tnn Exp $ +bin/firefox36 +lib/firefox36/.autoreg +lib/firefox36/LICENSE +lib/firefox36/README.txt +lib/firefox36/application.ini +lib/firefox36/blocklist.xml +lib/firefox36/browserconfig.properties +lib/firefox36/chrome/browser.jar +lib/firefox36/chrome/browser.manifest +lib/firefox36/chrome/classic.jar +lib/firefox36/chrome/classic.manifest +lib/firefox36/chrome/en-US.jar +lib/firefox36/chrome/en-US.manifest +lib/firefox36/chrome/icons/default/default16.png +lib/firefox36/chrome/icons/default/default32.png +lib/firefox36/chrome/icons/default/default48.png +lib/firefox36/chrome/reporter.jar +lib/firefox36/chrome/reporter.manifest +lib/firefox36/components/FeedConverter.js +lib/firefox36/components/FeedWriter.js +lib/firefox36/components/WebContentConverter.js +lib/firefox36/components/browser.xpt +lib/firefox36/components/components.list +lib/firefox36/components/fuelApplication.js +lib/firefox36/components/libbrowsercomps.so +lib/firefox36/components/libbrowserdirprovider.so +lib/firefox36/components/nsBrowserContentHandler.js +lib/firefox36/components/nsBrowserGlue.js +lib/firefox36/components/nsMicrosummaryService.js +lib/firefox36/components/nsPlacesTransactionsService.js +lib/firefox36/components/nsPrivateBrowsingService.js +lib/firefox36/components/nsSafebrowsingApplication.js +lib/firefox36/components/nsSessionStartup.js +lib/firefox36/components/nsSessionStore.js +lib/firefox36/components/nsSetDefaultBrowser.js +lib/firefox36/components/nsSidebar.js +lib/firefox36/defaults/preferences/channel-prefs.js +lib/firefox36/defaults/preferences/firefox-branding.js +lib/firefox36/defaults/preferences/firefox-l10n.js +lib/firefox36/defaults/preferences/firefox.js +lib/firefox36/defaults/preferences/reporter.js +lib/firefox36/defaults/profile/bookmarks.html +lib/firefox36/defaults/profile/chrome/userChrome-example.css +lib/firefox36/defaults/profile/chrome/userContent-example.css +lib/firefox36/defaults/profile/localstore.rdf +lib/firefox36/defaults/profile/mimeTypes.rdf +lib/firefox36/defaults/profile/prefs.js +lib/firefox36/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png +lib/firefox36/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +lib/firefox36/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png +lib/firefox36/firefox +lib/firefox36/icons/document.png +lib/firefox36/icons/mozicon128.png +lib/firefox36/modules/NetworkPrioritizer.jsm +lib/firefox36/modules/distribution.js +lib/firefox36/modules/openLocationLastURL.jsm +lib/firefox36/removed-files +lib/firefox36/run-mozilla.sh +lib/firefox36/searchplugins/amazondotcom.xml +lib/firefox36/searchplugins/answers.xml +lib/firefox36/searchplugins/creativecommons.xml +lib/firefox36/searchplugins/eBay.xml +lib/firefox36/searchplugins/google.xml +lib/firefox36/searchplugins/wikipedia.xml +lib/firefox36/searchplugins/yahoo.xml +lib/firefox36/updater.ini +share/applications/firefox36.desktop +share/pixmaps/firefox36.png diff --git a/www/firefox36/files/firefox.sh.in b/www/firefox36/files/firefox.sh.in index a6f2b673bb3..c3162d765c5 100644 --- a/www/firefox36/files/firefox.sh.in +++ b/www/firefox36/files/firefox.sh.in @@ -1,9 +1,9 @@ #! /bin/sh # -# $NetBSD: firefox.sh.in,v 1.1.1.1 2011/04/19 13:16:10 tnn Exp $ +# $NetBSD: firefox.sh.in,v 1.2 2011/08/20 13:05:50 tnn Exp $ # # We currently overwrite the nsXULStub launcher with this wrapper script. # The stub causes problems like HTTPS protocol not working. # XXX to be investigated -exec @PREFIX@/lib/xulrunner/xulrunner-bin @PREFIX@/lib/firefox/application.ini "$@" +exec @PREFIX@/lib/xulrunner192/xulrunner-bin @PREFIX@/lib/firefox36/application.ini "$@" -- cgit v1.2.3