[PC-BSD Commits] r3153 - in pbibuild/modules/firefox: . overlay-dir

svn at pcbsd.org svn at pcbsd.org
Mon Dec 29 13:13:57 PST 2008


Author: kris
Date: 2008-12-29 13:13:57 -0800 (Mon, 29 Dec 2008)
New Revision: 3153

Modified:
   pbibuild/modules/firefox/copy-files
   pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/firefox/pbi.conf
Log:

Updated the firefox module (for FF2) to use the new PBIv2 schema



Modified: pbibuild/modules/firefox/copy-files
===================================================================
--- pbibuild/modules/firefox/copy-files	2008-12-29 20:54:18 UTC (rev 3152)
+++ pbibuild/modules/firefox/copy-files	2008-12-29 21:13:57 UTC (rev 3153)
@@ -41,3 +41,4 @@
 /usr/local/lib/libsoftokn3* autolibs/
 /usr/local/lib/libsssl3* autolibs/
 /usr/local/share/idl/firefox* share/idl/
+/usr/local/share/themes share/

Modified: pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh	2008-12-29 20:54:18 UTC (rev 3152)
+++ pbibuild/modules/firefox/overlay-dir/PBI.RemoveScript.sh	2008-12-29 21:13:57 UTC (rev 3153)
@@ -7,12 +7,8 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-chflags -R noschg /Programs/${1}
-
 rm /usr/local/bin/firefox
-rm /usr/local/lib/firefox
 
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh	2008-12-29 20:54:18 UTC (rev 3152)
+++ pbibuild/modules/firefox/overlay-dir/PBI.SetupScript.sh	2008-12-29 21:13:57 UTC (rev 3153)
@@ -15,8 +15,15 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 ln -s /Programs/${PROGDIR}/.sbin/firefox /usr/local/bin/firefox
-ln -s /Programs/${PROGDIR}/autolibs/firefox /usr/local/lib/firefox
 
+# Check which font config we want to link to
+mkdir /Programs/${PROGDIR}/etc
+if [ -d "/PCBSD/local/etc/fonts" ]
+then
+  ln -s /PCBSD/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+else
+  ln -s /usr/local/etc/fonts /Programs/${PROGDIR}/etc/fonts
+fi
 
 if [ ! -z "$DISPLAY" ]
 then

Modified: pbibuild/modules/firefox/pbi.conf
===================================================================
--- pbibuild/modules/firefox/pbi.conf	2008-12-29 20:54:18 UTC (rev 3152)
+++ pbibuild/modules/firefox/pbi.conf	2008-12-29 21:13:57 UTC (rev 3153)
@@ -25,13 +25,14 @@
 PBIUPDATE="http://update.pbidir.com"
 
 # Other Ports we need built (One per line)
-OTHERPORT="/usr/ports/www/firefox-i18n/"
+OTHERPORT="/usr/ports/www/firefox-i18n/
+/usr/ports/x11-themes/qtcurve-gtk2"
 
 # Enter your custom make options here
 MAKEOPTS=""
 
 # 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="11"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY



More information about the Commits mailing list