[PC-BSD Commits] r2238 - in pbibuild/modules/firefox3: . kmenu-dir overlay-dir overlay-dir/bin

[svn at pcbsd.org]

Author: kris
Date: 2008-07-02 09:21:46 -0700 (Wed, 02 Jul 2008)
New Revision: 2238

Added:
   pbibuild/modules/firefox3/overlay-dir/bin/firefox3-safemode
Removed:
   pbibuild/modules/firefox3/overlay-dir/bin/firefox-safemode
Modified:
   pbibuild/modules/firefox3/copy-files
   pbibuild/modules/firefox3/kmenu-dir/firefox
   pbibuild/modules/firefox3/kmenu-dir/firefox-safe
   pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/firefox3/pbi.conf
Log:

Updated FireFox3 module, now builds + runs properly. No i18n support yet
though, appears that the module for i18n isn't updated in ports yet



Modified: pbibuild/modules/firefox3/copy-files
===================================================================
--- pbibuild/modules/firefox3/copy-files	2008-07-02 15:43:11 UTC (rev 2237)
+++ pbibuild/modules/firefox3/copy-files	2008-07-02 16:21:46 UTC (rev 2238)
@@ -22,16 +22,15 @@
 /usr/local/bin/desktop-file-validate bin/
 /usr/local/bin/p7env bin/
 /usr/local/bin/update-desktop-database bin/
-/usr/local/bin/firefox bin/
+/usr/local/bin/firefox3 bin/
 /usr/local/bin/p7sign bin/
 /usr/local/bin/vfychain bin/
-/usr/local/bin/firefox-config bin/
 /usr/local/bin/p7verify bin/
 /usr/local/bin/vfyserv bin/
 /usr/local/bin/makepqg bin/
 /usr/local/bin/pk12util bin/
-/usr/local/lib/firefox/firefox-bin bin/
-/usr/local/lib/firefox autolibs/firefox
+/usr/local/lib/firefox3/firefox-bin bin/
+/usr/local/lib/firefox3 autolibs/firefox3
 /usr/local/lib/nss/* autolibs/
 /usr/local/lib/libnnss3* autolibs/
 /usr/local/lib/libnssckpi* autolibs/

Modified: pbibuild/modules/firefox3/kmenu-dir/firefox
===================================================================
--- pbibuild/modules/firefox3/kmenu-dir/firefox	2008-07-02 15:43:11 UTC (rev 2237)
+++ pbibuild/modules/firefox3/kmenu-dir/firefox	2008-07-02 16:21:46 UTC (rev 2238)
@@ -1,4 +1,4 @@
-ExePath: bin/firefox
+ExePath: bin/firefox3
 ExeIcon: share/pixmaps/FireFox-128.png
 ExeDescr: FireFox
 ExeNoDesktop: 0

Modified: pbibuild/modules/firefox3/kmenu-dir/firefox-safe
===================================================================
--- pbibuild/modules/firefox3/kmenu-dir/firefox-safe	2008-07-02 15:43:11 UTC (rev 2237)
+++ pbibuild/modules/firefox3/kmenu-dir/firefox-safe	2008-07-02 16:21:46 UTC (rev 2238)
@@ -1,4 +1,4 @@
-ExePath: bin/firefox-safemode
+ExePath: bin/firefox3-safemode
 ExeIcon: share/pixmaps/FireFox-128.png
 ExeDescr: FireFox (Safe Mode)
 ExeNoDesktop: 1

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh	2008-07-02 15:43:11 UTC (rev 2237)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.RemoveScript.sh	2008-07-02 16:21:46 UTC (rev 2238)
@@ -9,8 +9,9 @@
 
 chflags -R noschg /Programs/${1}
 
+rm /usr/local/bin/firefox3
 rm /usr/local/bin/firefox
-rm /usr/local/lib/firefox
+rm /usr/local/lib/firefox3
 
 
 if [ ! -z "$DISPLAY" ]

Modified: pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2008-07-02 15:43:11 UTC (rev 2237)
+++ pbibuild/modules/firefox3/overlay-dir/PBI.SetupScript.sh	2008-07-02 16:21:46 UTC (rev 2238)
@@ -14,8 +14,9 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # 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
+ln -fs /Programs/${PROGDIR}/.sbin/firefox3 /usr/local/bin/firefox
+ln -fs /Programs/${PROGDIR}/.sbin/firefox3 /usr/local/bin/firefox3
+ln -fs /Programs/${PROGDIR}/autolibs/firefox3 /usr/local/lib/firefox3
 
 
 if [ ! -z "$DISPLAY" ]
@@ -43,7 +44,7 @@
          if [ "$line" = "[General]" ]
          then
            echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
-           echo "BrowserApplication=!/usr/local/bin/firefox" >> ${HOMEDIR}/.kdeglobals.new2
+           echo "BrowserApplication=!/usr/local/bin/firefox3" >> ${HOMEDIR}/.kdeglobals.new2
     	 else
        	   echo "$line" >> ${HOMEDIR}/.kdeglobals.new2
   	 fi
@@ -57,4 +58,4 @@
 
 fi
 
-echo "LAUNCHCLOSE: /usr/local/bin/firefox"
+echo "LAUNCHCLOSE: /usr/local/bin/firefox3"

Deleted: pbibuild/modules/firefox3/overlay-dir/bin/firefox-safemode

Added: pbibuild/modules/firefox3/overlay-dir/bin/firefox3-safemode


Property changes on: pbibuild/modules/firefox3/overlay-dir/bin/firefox3-safemode
___________________________________________________________________
Name: svn:executable
   + *

Modified: pbibuild/modules/firefox3/pbi.conf
===================================================================
--- pbibuild/modules/firefox3/pbi.conf	2008-07-02 15:43:11 UTC (rev 2237)
+++ pbibuild/modules/firefox3/pbi.conf	2008-07-02 16:21:46 UTC (rev 2238)
@@ -4,7 +4,7 @@
 ##############################################################################
 
 # Program Name
-PROGNAME="Firefox3"
+PROGNAME="Firefox"
 
 # Program Website
 PROGWEB="http://www.mozilla.com"
@@ -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="11"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY