# These were the GTK+2 option in the GTK version conditional, perhaps
# the flags need a closer look.
diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index c4a9834..c90409e 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,13 +1,13 @@
SPELL=firefox
if [[ $FIREFOX_CVS == y ]]; then
- VERSION=3.0rc3
+ VERSION=3.0
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/mozilla.org/$SPELL/releases/$VERSION/source/$SOURCE
SOURCE2_URL[0]=$SOURCE_URL.asc
else
- VERSION=2.0.0.14
+ VERSION=3.0
SOURCE=$SPELL-$VERSION-source.tar.bz2
SOURCE2=$SOURCE.asc
SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 86b76c0..71b3479 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,10 @@
+2008-06-17 Vlad Glagolev <stealth AT sourcemage.org>
+ * DETAILS: Firefox 3.0, updated 2.0 branch too
+ * INSTALL: added bashism, removed useless brackets and spaces
+ * PRE_BUILD: removed useless patches cause we don't have 2.0 anymore,
+ SPELL > SCRIPT, `sed -i' > `sedit', cleaned up
+ * DEPENDS: no 2.0 branch => no stupid depends
+
2008-06-12 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated FIREFOX_CVS=y to 3.0rc3
-if [ "$FIREFOX_CVS" == "n" ]; then
- #fix install directories in *.pc files.
- sed -i s#usr/local#usr# build/unix/firefox-* &&
- sed -i s#-${VERSION}## build/unix/firefox-* &&
- cp build/unix/firefox*.pc $INSTALL_ROOT/usr/lib/pkgconfig
-fi &&
-
#
# Script to set MOZILLA_FIVE_HOME
#
-cp ${SCRIPT_DIRECTORY}/${SPELL}.sh $INSTALL_ROOT/etc/profile.d &&
+cp -v $SPELL_DIRECTORY/$SPELL.sh $INSTALL_ROOT/etc/profile.d &&
#
# Create symlink to mozilla for hardwired applications
# Only create if /usr/bin/mozilla does not exist or is
# already a symlink
#
-if [ "$FIREFOX_MOZLINK" = "y" ]; then
+if [[ $FIREFOX_MOZLINK == y ]]; then
if ! test -f $INSTALL_ROOT/usr/bin/mozilla ||
test -h $INSTALL_ROOT/usr/bin/mozilla ; then
ln -sf $TRACK_ROOT/usr/bin/firefox /usr/bin/mozilla
@@ -52,30 +45,19 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
if ! test -f $FIREFOX_HOME/libnssckbi.so ||
test -h $FIREFOX_HOME/libnssckbi.so; then
ln -sf $TRACK_ROOT/usr/lib/libnssckbi.so $FIREFOX_HOME/libnssckbi.so
- fi
+ fi
fi &&
-if [[ "$FIREFOX_NULLPLUGIN" == "n" ]]
-then
+if [[ $FIREFOX_NULLPLUGIN == n ]]; then
rm $FIREFOX_HOME/plugins/libnullplugin.so
fi &&
-
#
# install firefox script so it loads properly even if MOZILLA_FIVE_HOME is
# not set or set to a different mozilla/firefox directory
#
-install -m 755 -o root -g root $SCRIPT_DIRECTORY/firefox \
+install -m 755 -o root -g root $SPELL_DIRECTORY/firefox \
$INSTALL_ROOT/usr/bin &&
-if [ "$FIREFOX_CVS" == "n" ]; then
- # make the pkgconfig files reference the nspr from the standalone nspr
spell
- sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-nss.pc &&
- sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-js.pc &&
- sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-xpcom.pc &&
- sedit "s/nspr/mozilla-nspr/"
${INSTALL_ROOT}/usr/lib/pkgconfig/firefox-plugin.pc
-fi &&
-
-
# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
# anyone but root
chmod -R go+r /usr/lib/firefox &&
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 5bf88d7..60c1760 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,17 +3,8 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla &&