[PC-BSD Commits] r2659 - in pbibuild/modules/winfirefox2: . overlay-dir/bin

svn at pcbsd.org svn at pcbsd.org
Wed Aug 27 10:05:29 PDT 2008


Author: kris
Date: 2008-08-27 10:05:29 -0700 (Wed, 27 Aug 2008)
New Revision: 2659

Modified:
   pbibuild/modules/winfirefox2/build.sh
   pbibuild/modules/winfirefox2/overlay-dir/bin/winfirefox2
   pbibuild/modules/winfirefox2/pbi.conf
Log:

Fixed winfirefox2 to also update the wine version during the build



Modified: pbibuild/modules/winfirefox2/build.sh
===================================================================
--- pbibuild/modules/winfirefox2/build.sh	2008-08-27 17:02:39 UTC (rev 2658)
+++ pbibuild/modules/winfirefox2/build.sh	2008-08-27 17:05:29 UTC (rev 2659)
@@ -9,7 +9,7 @@
 #   PORTVER = Version number of the port we used to build
 ##############################################################################
 
-# Save the right version number in the removepbi.sh script
-sed -e "s,CHANGEME,WinFirefox2${PORTVER},g" ${PBIDIR}/bin/winfirefox > /tmp/winfirefox
-mv /tmp/winfirefox ${PBIDIR}/bin/winfirefox
-chmod 755 ${PBIDIR}/bin/winfirefox
+# Save the right version number in the winfirefox3 script
+sed -e "s,CHANGEME,${PORTVER},g" ${PBIDIR}/bin/winfirefox2 > /tmp/winfirefox2
+mv /tmp/winfirefox2 ${PBIDIR}/bin/winfirefox2
+chmod 755 ${PBIDIR}/bin/winfirefox2

Modified: pbibuild/modules/winfirefox2/overlay-dir/bin/winfirefox2
===================================================================
--- pbibuild/modules/winfirefox2/overlay-dir/bin/winfirefox2	2008-08-27 17:02:39 UTC (rev 2658)
+++ pbibuild/modules/winfirefox2/overlay-dir/bin/winfirefox2	2008-08-27 17:05:29 UTC (rev 2659)
@@ -1,5 +1,6 @@
 #!/bin/sh
-PROGDIR="WinFirefox21.1.1"
+VER="CHANGEME"
+PROGDIR="WinFirefox2${VER}"
 cd
 export WINEPREFIX="/Programs/${PROGDIR}/WINFF"
 /Programs/${PROGDIR}/bin/wine "/Programs/${PROGDIR}/WINFF/drive_c/Program Files/Mozilla Firefox/firefox.exe" "$@"

Modified: pbibuild/modules/winfirefox2/pbi.conf
===================================================================
--- pbibuild/modules/winfirefox2/pbi.conf	2008-08-27 17:02:39 UTC (rev 2658)
+++ pbibuild/modules/winfirefox2/pbi.conf	2008-08-27 17:05:29 UTC (rev 2659)
@@ -32,7 +32,7 @@
 
 # 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="12"
+BUILDKEY="02"
 
 # Don't build this PBI on certian processors (i386 / amd64)
 ARCHIGNORE="amd64" ; export ARCHIGNORE



More information about the Commits mailing list