Rename mozilla-{firefox,thunderbird} packages to {firefox,thunderbird}.

Apparently required by many at c2k11.
This commit is contained in:
landry 2011-07-08 11:07:32 +00:00
parent 6c02fdc3bc
commit 87acad8dd6
5 changed files with 74 additions and 72 deletions

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.127 2011/06/22 12:03:30 landry Exp $
# $OpenBSD: Makefile,v 1.128 2011/07/08 11:07:32 landry Exp $
COMMENT-main = Mozilla e-mail, rss and usenet client
COMMENT-lightning = Mozilla Thunderbird calendar extension
@ -8,11 +8,12 @@ COMMENT-lightning = Mozilla Thunderbird calendar extension
MOZILLA_VERSION = 3.1.11
MOZILLA_BRANCH = 1.9.2
MOZILLA_PROJECT = mozilla-thunderbird
MOZILLA_PROJECT = thunderbird
MOZILLA_CODENAME = mail
MULTI_PACKAGES = -main -lightning
PKGNAME-main = ${PKGNAME}
REVISION-main = 0
PKGNAME-lightning = lightning-1.0beta2
EPOCH-lightning = 0
REVISION-lightning = 19
@ -64,7 +65,7 @@ CONFIGURE_STYLE = autoconf no-autoheader
LIB_DEPENDS-main = ${LIB_DEPENDS}
WANTLIB-main = ${WANTLIB}
LIB_DEPENDS-lightning = ${BUILD_PKGPATH},-main
WANTLIB-lightning = mozilla-thunderbird/mozjs mozilla-thunderbird/xpcom c m stdc++ nspr4 plc4 plds4
WANTLIB-lightning = thunderbird/mozjs thunderbird/xpcom c m stdc++ nspr4 plc4 plds4
BUILD_DEPENDS += archivers/unzip #to unzip xpi
# build lightning xpi

View File

@ -1,7 +1,7 @@
@comment $OpenBSD: PLIST-main,v 1.4 2011/01/14 22:53:42 landry Exp $
@conflict mozilla-thunderbird-<=3.0.5
@comment $OpenBSD: PLIST-main,v 1.5 2011/07/08 11:07:32 landry Exp $
@conflict mozilla-thunderbird-<=3.1.11
@pkgpath mail/mozilla-thunderbird
bin/thunderbird
bin/${MOZILLA_PROJECT}
${MOZILLA_PROJECT}/
${MOZILLA_PROJECT}/application.ini
${MOZILLA_PROJECT}/chrome/
@ -300,13 +300,13 @@ ${MOZILLA_PROJECT}/defaults/messenger/
${MOZILLA_PROJECT}/defaults/messenger/mailViews.dat
${MOZILLA_PROJECT}/defaults/pref/
${MOZILLA_PROJECT}/defaults/pref/all-l10n.js
${MOZILLA_PROJECT}/defaults/pref/all-thunderbird.js
${MOZILLA_PROJECT}/defaults/pref/all-${MOZILLA_PROJECT}.js
${MOZILLA_PROJECT}/defaults/pref/channel-prefs.js
${MOZILLA_PROJECT}/defaults/pref/composer.js
${MOZILLA_PROJECT}/defaults/pref/mailnews.js
${MOZILLA_PROJECT}/defaults/pref/mdn.js
${MOZILLA_PROJECT}/defaults/pref/smime.js
${MOZILLA_PROJECT}/defaults/pref/thunderbird-branding.js
${MOZILLA_PROJECT}/defaults/pref/${MOZILLA_PROJECT}-branding.js
${MOZILLA_PROJECT}/defaults/profile/
${MOZILLA_PROJECT}/defaults/profile/localstore.rdf
${MOZILLA_PROJECT}/defaults/profile/mimeTypes.rdf
@ -477,14 +477,14 @@ ${MOZILLA_PROJECT}/res/ua.css
${MOZILLA_PROJECT}/res/unixcharset.properties
${MOZILLA_PROJECT}/res/viewsource.css
${MOZILLA_PROJECT}/run-mozilla.sh
@bin ${MOZILLA_PROJECT}/thunderbird-bin
@bin ${MOZILLA_PROJECT}/${MOZILLA_PROJECT}-bin
share/applications/${MOZILLA_PROJECT}.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
share/applications/thunderbird.desktop
%%debug%%
!%%debug%%
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database
@exec TEMP=`mktemp -d` && cd %D/mozilla-thunderbird && env HOME=$TEMP LD_LIBRARY_PATH=%D/mozilla-thunderbird ./regxpcom && rm -fr $TEMP
@unexec rm -f %D/mozilla-thunderbird/components/compreg.dat
@unexec rm -f %D/mozilla-thunderbird/components/xpti.dat
@unexec rm -Rf %D/mozilla-thunderbird/updates
@exec TEMP=`mktemp -d` && cd %D/thunderbird && env HOME=$TEMP LD_LIBRARY_PATH=%D/thunderbird ./regxpcom && rm -fr $TEMP
@unexec rm -f %D/thunderbird/components/compreg.dat
@unexec rm -f %D/thunderbird/components/xpti.dat
@unexec rm -Rf %D/thunderbird/updates

View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.184 2011/06/28 15:53:38 landry Exp $
# $OpenBSD: Makefile,v 1.185 2011/07/08 11:07:32 landry Exp $
COMMENT = Mozilla web browser
BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
@ -8,9 +8,9 @@ BROKEN-sparc64 = https://bugzilla.mozilla.org/show_bug.cgi?id=577056
MOZILLA_VERSION = 5.0
MOZILLA_BRANCH = release
MOZILLA_PROJECT = mozilla-firefox
MOZILLA_PROJECT = firefox
MOZILLA_CODENAME = browser
REVISION = 0
REVISION = 1
SO_VERSION = 24.0
NSS_SO_VERSION = 27.0

View File

@ -1,61 +1,62 @@
@comment $OpenBSD: PLIST,v 1.35 2011/06/28 05:43:57 landry Exp $
@comment $OpenBSD: PLIST,v 1.36 2011/07/08 11:07:32 landry Exp $
@conflict firefox3-*
@conflict mozilla-firebird-*
@conflict mozilla-firefox-*
@pkgpath www/firefox3
@pkgpath www/mozilla-firefox,-main
bin/firefox
bin/${MOZILLA_PROJECT}
lib/firefox-${MOZILLA_VERSION}/
lib/firefox-${MOZILLA_VERSION}/README.txt
lib/firefox-${MOZILLA_VERSION}/application.ini
lib/firefox-${MOZILLA_VERSION}/blocklist.xml
lib/firefox-${MOZILLA_VERSION}/chrome/
lib/firefox-${MOZILLA_VERSION}/chrome.manifest
lib/firefox-${MOZILLA_VERSION}/chrome/icons/
lib/firefox-${MOZILLA_VERSION}/chrome/icons/default/
lib/firefox-${MOZILLA_VERSION}/chrome/icons/default/default.png
lib/firefox-${MOZILLA_VERSION}/chrome/icons/default/default16.png
lib/firefox-${MOZILLA_VERSION}/chrome/icons/default/default32.png
lib/firefox-${MOZILLA_VERSION}/chrome/icons/default/default48.png
lib/firefox-${MOZILLA_VERSION}/components/
lib/firefox-${MOZILLA_VERSION}/components/binary.manifest
@lib lib/firefox-${MOZILLA_VERSION}/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION}
lib/firefox-${MOZILLA_VERSION}/defaults/
lib/firefox-${MOZILLA_VERSION}/defaults/pref/
lib/firefox-${MOZILLA_VERSION}/defaults/pref/channel-prefs.js
lib/firefox-${MOZILLA_VERSION}/dependentlibs.list
lib/firefox-${MOZILLA_VERSION}/dictionaries/
lib/firefox-${MOZILLA_VERSION}/dictionaries/en-US.aff
lib/firefox-${MOZILLA_VERSION}/dictionaries/en-US.dic
lib/firefox-${MOZILLA_VERSION}/extensions/
lib/firefox-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
lib/firefox-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/firefox-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/firefox-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
lib/firefox-${MOZILLA_VERSION}/firefox
@bin lib/firefox-${MOZILLA_VERSION}/firefox-bin
lib/firefox-${MOZILLA_VERSION}/icons/
lib/firefox-${MOZILLA_VERSION}/icons/document.png
lib/firefox-${MOZILLA_VERSION}/icons/mozicon128.png
@lib lib/firefox-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
@lib lib/firefox-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
@lib lib/firefox-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}
@bin lib/firefox-${MOZILLA_VERSION}/mozilla-xremote-client
lib/firefox-${MOZILLA_VERSION}/omni.jar
lib/firefox-${MOZILLA_VERSION}/platform.ini
@bin lib/firefox-${MOZILLA_VERSION}/plugin-container
lib/firefox-${MOZILLA_VERSION}/removed-files
lib/firefox-${MOZILLA_VERSION}/run-mozilla.sh
lib/firefox-${MOZILLA_VERSION}/searchplugins/
lib/firefox-${MOZILLA_VERSION}/searchplugins/amazondotcom.xml
lib/firefox-${MOZILLA_VERSION}/searchplugins/bing.xml
lib/firefox-${MOZILLA_VERSION}/searchplugins/eBay.xml
lib/firefox-${MOZILLA_VERSION}/searchplugins/google.xml
lib/firefox-${MOZILLA_VERSION}/searchplugins/wikipedia.xml
lib/firefox-${MOZILLA_VERSION}/searchplugins/yahoo.xml
@man man/man1/firefox.1
bin/mozilla-${MOZILLA_PROJECT}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/README.txt
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/application.ini
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/blocklist.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome.manifest
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default16.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default32.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/chrome/icons/default/default48.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/binary.manifest
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/components/libbrowsercomps.so.${LIBbrowsercomps_VERSION}
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/pref/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/defaults/pref/channel-prefs.js
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dependentlibs.list
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.aff
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/dictionaries/en-US.dic
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/preview.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/${MOZILLA_PROJECT}-bin
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/document.png
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/icons/mozicon128.png
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libmozalloc.so.${LIBmozalloc_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxpcom.so.${LIBxpcom_VERSION}
@lib lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/libxul.so.${LIBxul_VERSION}
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/mozilla-xremote-client
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/omni.jar
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/platform.ini
@bin lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/plugin-container
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/removed-files
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/run-mozilla.sh
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/amazondotcom.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/bing.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/eBay.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/google.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/wikipedia.xml
lib/${MOZILLA_PROJECT}-${MOZILLA_VERSION}/searchplugins/yahoo.xml
@man man/man1/${MOZILLA_PROJECT}.1
share/applications/firefox.desktop
@man man/man1/mozilla-${MOZILLA_PROJECT}.1
share/applications/${MOZILLA_PROJECT}.desktop
share/doc/pkg-readmes/${FULLPKGNAME}
@exec %D/bin/update-desktop-database
@unexec-delete %D/bin/update-desktop-database

View File

@ -1,4 +1,4 @@
# $OpenBSD: mozilla.port.mk,v 1.30 2011/06/07 10:05:07 landry Exp $
# $OpenBSD: mozilla.port.mk,v 1.31 2011/07/08 11:07:32 landry Exp $
SHARED_ONLY = Yes
ONLY_FOR_ARCHS= alpha amd64 arm i386 powerpc sparc64
@ -102,7 +102,7 @@ INSTALL_STRIP =
# from browser/config/mozconfig
CONFIGURE_ARGS +=--enable-application=${MOZILLA_CODENAME}
.if ${MOZILLA_PROJECT} == "mozilla-firefox" || \
.if ${MOZILLA_PROJECT} == "firefox" || \
${MOZILLA_PROJECT} == "firefox35" || \
${MOZILLA_PROJECT} == "firefox36" || \
${MOZILLA_PROJECT} == "xulrunner" || \
@ -159,7 +159,7 @@ pre-configure:
.endfor
# common install target - ports can use post-install for specific stuff
.if (${MOZILLA_PROJECT} == "mozilla-thunderbird" && ${MOZILLA_BRANCH} == "1.9.2") || \
.if (${MOZILLA_PROJECT} == "thunderbird" && ${MOZILLA_BRANCH} == "1.9.2") || \
(${MOZILLA_PROJECT} == "seamonkey" && ${MOZILLA_BRANCH} == "1.9.1") || \
(${MOZILLA_PROJECT} == "xulrunner1.9" && ${MOZILLA_BRANCH} == "1.9.2") || \
${MOZILLA_PROJECT} == "firefox35" || \