[PC-BSD Commits] r2599 - pbibuild/modules/firefox3

[svn at pcbsd.org]

Author: kris
Date: 2008-08-14 11:19:07 -0700 (Thu, 14 Aug 2008)
New Revision: 2599

Modified:
   pbibuild/modules/firefox3/build.sh
   pbibuild/modules/firefox3/pbi.conf
Log:

Update the firefox3 module a bit, to make sure we have e-mail client prefs added properly



Modified: pbibuild/modules/firefox3/build.sh
===================================================================
--- pbibuild/modules/firefox3/build.sh	2008-08-14 17:21:07 UTC (rev 2598)
+++ pbibuild/modules/firefox3/build.sh	2008-08-14 18:19:07 UTC (rev 2599)
@@ -9,37 +9,16 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# We need to modify the bin/firefox script to point to the PBI directory
-# properly
-
-rm /tmp/ff-fixed
-while read line
-do
-
-  echo $line | grep '^moz_libdir=' >/dev/null 2>/dev/null 
-  if [ "$?" = "0" ]
-  then
-    echo "moz_libdir=\"/Programs/Firefox${PORTVER}/autolibs/firefox\"" >>/tmp/ff-fixed
-  else
-    echo "${line}" >> /tmp/ff-fixed 
-  fi
-
-done < ${PBIDIR}/bin/firefox
-
-cp /tmp/ff-fixed ${PBIDIR}/bin/firefox
-chmod 755 ${PBIDIR}/bin/firefox
-
-
 # Save the right version number in the removepbi.sh script
 sed -e "s,CHANGEME,Firefox${PORTVER},g" ${PBIDIR}/scripts/removepbi.sh > /tmp/removepbi.sh
 mv /tmp/removepbi.sh ${PBIDIR}/scripts/removepbi.sh
 chmod 755 ${PBIDIR}/scripts/removepbi.sh
 
-rm -rf /${PBIDIR}/autolibs/firefox/extensions/lang*
+rm -rf /${PBIDIR}/autolibs/firefox3/extensions/lang*
 
 # Copy over the lang-packs
-tar cvf - -C /usr/local/lib/xpi/ . | tar xvf - -C ${PBIDIR}/autolibs/firefox/extensions/
+tar cvf - -C /usr/local/lib/xpi/ . | tar xvf - -C ${PBIDIR}/autolibs/firefox3/extensions/
 
 # Now append our prefs file with the default email script
-echo "pref(\"network.protocol-handler.app.mailto\", \"/Programs/Firefox${PORTVER}/bin/defaultemail\");" >> ${PBIDIR}/autolibs/firefox/greprefs/all.js
+echo "pref(\"network.protocol-handler.app.mailto\", \"/Programs/Firefox${PORTVER}/bin/defaultemail\");" >> ${PBIDIR}/autolibs/firefox3/greprefs/all.js
 

Modified: pbibuild/modules/firefox3/pbi.conf
===================================================================
--- pbibuild/modules/firefox3/pbi.conf	2008-08-14 17:21:07 UTC (rev 2598)
+++ pbibuild/modules/firefox3/pbi.conf	2008-08-14 18:19:07 UTC (rev 2599)
@@ -32,6 +32,6 @@
 
 # Build Key - Change this to anything else to trigger a rebuild 
 #           - The rebuild will take place even if port is still the same ver
-BUILDKEY="01"
+BUILDKEY="21"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY