Update Phoenix to 0.5, the last release named Phoenix. Fixes a lot a bugs,

adds some features, there is at least one crasher I've hit so far but I don't
know if it is anomoly or not yet.

Approved by:	kris

2 files changed, 49 insertions, 52 deletions

diff --git a/www/firefox36/files/mkdistfile b/www/firefox36/files/mkdistfile
index b178f4830686..a49174ae7b5d 100644
--- a/www/firefox36/files/mkdistfile
+++ b/www/firefox36/files/mkdistfile
@@ -119,56 +119,53 @@ done
 test $# -eq 1 || usage 1
 
 REV=$1
-test ${REV#*.} = today && REV=${REV%.*}.$DATE
+test ${REV##*.} = today && REV=${REV%.*}.$DATE
 
+status "pruning tree..."
 exfile=$(tmpfile)
 cat >>$exfile <<'EOF'
-*/CVS
-*/CVS/*
-*/macbuild
-*/macbuild/*
-*/package
-*/package/*
-*/.cvsignore
-*/windows
-*/windows/*
-*/activex
-*/activex/*
-*/os2
-*/os2/*
-*/solaris
-*/solaris/*
-*/gc
-*/gc/*
-mozilla/apache
-mozilla/calendar
-mozilla/cck
-mozilla/chimera
-mozilla/ef
-mozilla/embed.mak
-mozilla/embed.mk
-mozilla/gconfig
-mozilla/gfx2
-mozilla/grendel
-mozilla/java
-mozilla/js2
-mozilla/mail
-mozilla/mailnews
-mozilla/mozilla
-mozilla/mozilla.kdevprj
-mozilla/mozilla.lsm
-mozilla/msgsdk
-mozilla/mstone
-mozilla/nglayout.mac
-mozilla/nunet
-mozilla/other-licenses
-mozilla/privacy
-mozilla/silentdl
-mozilla/timer
-mozilla/trex.mak
-mozilla/trex.mk
-mozilla/webtools
+^.*/CVS($|/)
+^.*/macbuild($|/)
+^.*/package($|/)
+^.*/.cvsignore($|/)
+^.*/windows($|/)
+^.*/activex($|/)
+^.*/os2($|/)
+^.*/solaris($|/)
+^.*/gc($|/)
+^mozilla/apache($|/)
+^mozilla/calendar($|/)
+^mozilla/cck($|/)
+^mozilla/chimera($|/)
+^mozilla/ef($|/)
+^mozilla/embed.mak($|/)
+^mozilla/embed.mk($|/)
+^mozilla/gconfig($|/)
+^mozilla/gfx2($|/)
+^mozilla/grendel($|/)
+^mozilla/java($|/)
+^mozilla/js2($|/)
+^mozilla/mail($|/)
+^mozilla/mailnews($|/)
+^mozilla/mozilla($|/)
+^mozilla/mozilla.kdevprj($|/)
+^mozilla/mozilla.lsm($|/)
+^mozilla/msgsdk($|/)
+^mozilla/mstone($|/)
+^mozilla/nglayout.mac($|/)
+^mozilla/nunet($|/)
+^mozilla/other-licenses($|/)
+^mozilla/privacy($|/)
+^mozilla/silentdl($|/)
+^mozilla/timer($|/)
+^mozilla/trex.mak($|/)
+^mozilla/trex.mk($|/)
+^mozilla/webtools($|/)
 EOF
-tar -cjp -X $exfile -f phoenix-$REV.tar.bz2 mozilla
+test -d mozilla || die "No mozilla dir here."
+find mozilla 2>/dev/null | egrep -f $exfile | xargs rm -fr
 rm -f $exfile
+status "making phoenix-$REV.tar.bz2 ..."
+tar -cjpf phoenix-$REV.tar.bz2 mozilla
+status "done."
 #EOF
diff --git a/www/firefox36/files/mozconfig.in b/www/firefox36/files/mozconfig.in
index 88823ea75c24..c6beb3bb3703 100644
--- a/www/firefox36/files/mozconfig.in
+++ b/www/firefox36/files/mozconfig.in
@@ -36,17 +36,17 @@ ac_add_options --with-system-mng=@LOCALBASE@
 # enable features
 ac_add_options --with-pthreads
 ac_add_options --enable-xft
-ac_add_options --enable-xinerama
 ac_add_options --enable-reorder
 ac_add_options --enable-strip
 #ac_add_options --enable-crash-on-assert
 ######################################################################
 # disable unneeded to speed up and/or save space
+ac_add_options --disable-auto-deps
+ac_add_options --disable-bidi
+ac_add_options --disable-dtd-debug
+ac_add_options --disable-jsd
 ac_add_options --disable-ldap
 ac_add_options --disable-logging
-ac_add_options --disable-dtd-debug
-ac_add_options --disable-auto-deps
 ac_add_options --disable-pedantic
-ac_add_options --disable-jsd
-ac_add_options --disable-bidi
+ac_add_options --disable-xinerama
 ######################################################################