New commits:
commit 640665be4d933ca09f241539284fb811a0a8acd1
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>
firefox: Updated to build against xulrunner. Firefox doesn't
provide GECKO any longer. Cleaned up depends and use make install.
Added patch to fix disk usage during build.
suggest_depends_2 firefox-smglwiki '' '' \
'to enable searching the SMGL Wiki from the Search Bar'
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index 8f0fec9..484048d 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,5 +1,12 @@
2008-10-07 George Sherwood <gsherwood AT sourcemage.org>
+ * BUILD: Updated to not use configure. All options set in
+ mozconfig3
+ * DEPENDS: Cleaned up. Now depends on xulrunner
+ * INSTALL: Use make install. Removed older workarounds
+ * PRE_BUILD: Added patch
* PROVIDES: No longer provides GECKO.
+ * firefox-xulrunner.patch: Added patch to skip copy of
+ xulrunner if using libxul. During build was using 4 gig of disk
2008-09-27 Vlad Glagolev <stealth AT sourcemage.org>
* DETAILS: updated spell to 3.0.3
diff --git a/http/firefox/INSTALL b/http/firefox/INSTALL
index 30f7253..4882221 100755
--- a/http/firefox/INSTALL
+++ b/http/firefox/INSTALL
@@ -6,16 +6,9 @@ if spell_ok Firebird; then
dispel Firebird
fi &&
-# Not recommended by http://www.mozilla.org/build to use
-# make install. Manually install the files.
-
-mkdir -p $INSTALL_ROOT/usr/lib/firefox &&
-cp -RLv dist/bin/* $INSTALL_ROOT/usr/lib/firefox/ &&
-mkdir -p $INSTALL_ROOT/usr/include/firefox/ &&
-cp -LfRv dist/include/* $INSTALL_ROOT/usr/include/firefox/ &&
-mkdir -p $INSTALL_ROOT/usr/share/idl/firefox/ &&
-cp -LfRv dist/idl/* $INSTALL_ROOT/usr/share/idl/firefox/ &&
+make install &&
+ln -s $INSTALL_ROOT/usr/lib/firefox-$VERSION $INSTALL_ROOT/usr/lib/firefox &&
#
# Script to set MOZILLA_FIVE_HOME
#
@@ -49,16 +42,6 @@ if test -f $INSTALL_ROOT/usr/lib/libnssckbi.so; then
fi &&
if [[ $FIREFOX_NULLPLUGIN == n ]]; then
rm $FIREFOX_HOME/plugins/libnullplugin.so
-fi &&
+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 $SPELL_DIRECTORY/firefox \
- $INSTALL_ROOT/usr/bin &&
-# fix up permissions, firefox 2.0.0.8 installs stuff non-readable for
-# anyone but root
-chmod -R go+r /usr/lib/firefox &&
-chmod go+x /usr/lib/firefox/run-mozilla.sh
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 60c1760..65cce7b 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,6 +3,8 @@ cd $SOURCE_DIRECTORY &&
unpack_file '' &&
cd mozilla &&