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

[svn at pcbsd.org]

Author: kris
Date: 2009-01-08 12:28:04 -0800 (Thu, 08 Jan 2009)
New Revision: 3204

Removed:
   pbibuild/modules/googleearth/overlay-dir/bin/googleearth.sh
Modified:
   pbibuild/modules/googleearth/kmenu-dir/googleearth
   pbibuild/modules/googleearth/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/googleearth/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/googleearth/pbi.conf
Log:

Updated google earth to be 100% self-contained, works on my test box



Modified: pbibuild/modules/googleearth/kmenu-dir/googleearth
===================================================================
--- pbibuild/modules/googleearth/kmenu-dir/googleearth	2009-01-08 18:51:45 UTC (rev 3203)
+++ pbibuild/modules/googleearth/kmenu-dir/googleearth	2009-01-08 20:28:04 UTC (rev 3204)
@@ -1,4 +1,4 @@
-ExePath: bin/googleearth.sh
+ExePath: bin/googleearth
 ExeIcon: share/pixmaps/googleearth.png
 ExeDescr: Google Earth
 ExeNoDesktop: 0

Modified: pbibuild/modules/googleearth/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/googleearth/overlay-dir/PBI.RemoveScript.sh	2009-01-08 18:51:45 UTC (rev 3203)
+++ pbibuild/modules/googleearth/overlay-dir/PBI.RemoveScript.sh	2009-01-08 20:28:04 UTC (rev 3204)
@@ -6,11 +6,5 @@
 # ${2} is the username of person performing the deletion.
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
-rm -r /usr/local/share/google-earth
-rm /usr/local/bin/googleearth
-rm -r /compat/linux/usr/share/google-earth
 
 
-
-
-

Modified: pbibuild/modules/googleearth/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/googleearth/overlay-dir/PBI.SetupScript.sh	2009-01-08 18:51:45 UTC (rev 3203)
+++ pbibuild/modules/googleearth/overlay-dir/PBI.SetupScript.sh	2009-01-08 20:28:04 UTC (rev 3204)
@@ -15,16 +15,11 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-PROG_PATH="/Programs/${PROGDIR}"
-sed "s/PROGDIR/${PROGDIR}/g" ${PROG_PATH}/bin/googleearth.sh > ${PROG_PATH}/bin/googleearth.sh.1
-mv ${PROG_PATH}/bin/googleearth.sh.1 ${PROG_PATH}/bin/googleearth.sh
-chmod 7755 ${PROG_PATH}/bin/googleearth*
+# Check which font config we want to link to
+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
 
-#ln -s /Programs/${PROGDIR}/share/google-earth /usr/local/share/google-earth
-#ln -s /Programs/${PROGDIR}/.sbin/googleearth.sh /usr/local/bin/googleearth
-#if [ -f /compat/linux/usr/share/google-earth ]
-#then
-#	rm -r //compat/linux/usr/share/google-earth
-#fi
-#ln -s /Programs/${PROGDIR}/share/google-earth /compat/linux/usr/share/google-earth
-

Modified: pbibuild/modules/googleearth/pbi.conf
===================================================================
--- pbibuild/modules/googleearth/pbi.conf	2009-01-08 18:51:45 UTC (rev 3203)
+++ pbibuild/modules/googleearth/pbi.conf	2009-01-08 20:28:04 UTC (rev 3204)
@@ -35,6 +35,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="03"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY