Source Mage code commit list

[George Sherwood <scm AT sourcemage.org>]

GIT changes to master grimoire by George Sherwood <gsherwood AT sourcemage.org>:

 http/firefox/DETAILS     |   10 +++++-----
 http/firefox/HISTORY     |    5 +++++
 http/firefox/PRE_BUILD   |    4 +++-
 http/firefox/mozconfig31 |    4 ++--
 4 files changed, 15 insertions(+), 8 deletions(-)

New commits:
commit aae01f95f269fa00a18cced834f7a7a6645521e0
Author: George Sherwood <gsherwood AT sourcemage.org>
Commit: George Sherwood <gsherwood AT sourcemage.org>

    firefox: Updated devel to version 3.5b4

diff --git a/http/firefox/DETAILS b/http/firefox/DETAILS
index dfde888..a35b912 100755
--- a/http/firefox/DETAILS
+++ b/http/firefox/DETAILS
@@ -1,12 +1,12 @@
            SPELL=firefox
 if [[ $FIREFOX_CVS == y ]]; then
-         VERSION=3.1b2
+         VERSION=3.5b4
           SOURCE=$SPELL-$VERSION-source.tar.bz2
-#         SOURCE2=$SOURCE.asc
-#      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
+         SOURCE2=$SOURCE.asc
+      SOURCE_GPG=firefox.gpg:$SOURCE2:UPSTREAM_KEY
    
SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/$SPELL/releases/$VERSION/source/$SOURCE
-     
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
-#  SOURCE2_URL[0]=$SOURCE_URL.asc
+#     
SOURCE_HASH=sha512:eb38349212a352718987e611315405c869fad9ebd6026ce4662bbbb12c5914178c6d348ea12686a7efbb046870e44238a1b46e20fe3d9eb323e3d6ab8f9dfacc
+  SOURCE2_URL[0]=$SOURCE_URL.asc
 else
          VERSION=3.0.10
           SOURCE=$SPELL-$VERSION-source.tar.bz2
diff --git a/http/firefox/HISTORY b/http/firefox/HISTORY
index c3d8721..001cc8f 100644
--- a/http/firefox/HISTORY
+++ b/http/firefox/HISTORY
@@ -1,3 +1,8 @@
+2009-04-28 George Sherwood <gsherwood AT sourcemage.org>
+       * DETAILS: Updated devel to version 3.5b4.
+       * PRE_BUILD: Do not apply xulrunner patch to devel
+       * moconfig31: Doesn't like system nspr/nss
+
 2009-04-27 George Sherwood <gsherwood AT sourcemage.org>
        * DETAILS: Updated stable to version 3.0.10. SECURITY_PATCH++
 
diff --git a/http/firefox/PRE_BUILD b/http/firefox/PRE_BUILD
index 0f0e63d..4e0b155 100755
--- a/http/firefox/PRE_BUILD
+++ b/http/firefox/PRE_BUILD
@@ -3,7 +3,9 @@ cd  $SOURCE_DIRECTORY             &&
 unpack_file  ''                   &&
 cd  mozilla*                       &&
 
-patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch &&
+if [[ "$FIREFOX_CVS" == "n" ]]; then
+patch -p0 < $SCRIPT_DIRECTORY/firefox-xulrunner.patch
+fi &&
 
 if [[ "$FIREFOX_CVS" == "n" ]]; then
 cp -v $SPELL_DIRECTORY/mozconfig3 .mozconfig
diff --git a/http/firefox/mozconfig31 b/http/firefox/mozconfig31
index 002bdef..adaadc1 100644
--- a/http/firefox/mozconfig31
+++ b/http/firefox/mozconfig31
@@ -7,8 +7,8 @@ mk_add_options MOZ_CO_PROJECT=browser
 
 # Options for 'configure' (same as command-line options).
 ac_add_options --with-pthreads
-ac_add_options --with-system-nspr
-ac_add_options --without-system-nss
+#ac_add_options --with-system-nspr
+#ac_add_options --without-system-nss
 ac_add_options --with-system-jpeg=/usr/lib
 ac_add_options --with-system-zlib=/usr/lib
 ac_add_options --with-system-png=/usr/lib