[PC-BSD Commits] r3296 - in pbibuild/modules/foldingathome: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2009-01-20 10:56:56 -0800 (Tue, 20 Jan 2009)
New Revision: 3296

Modified:
   pbibuild/modules/foldingathome/overlay-dir/PBI.FirstRun.sh
   pbibuild/modules/foldingathome/overlay-dir/PBI.RemoveScript.sh
   pbibuild/modules/foldingathome/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/foldingathome/pbi.conf
Log:

Updating folding at home, 100% self-contained now



Modified: pbibuild/modules/foldingathome/overlay-dir/PBI.FirstRun.sh
===================================================================
--- pbibuild/modules/foldingathome/overlay-dir/PBI.FirstRun.sh	2009-01-20 18:12:46 UTC (rev 3295)
+++ pbibuild/modules/foldingathome/overlay-dir/PBI.FirstRun.sh	2009-01-20 18:56:56 UTC (rev 3296)
@@ -16,9 +16,3 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-
-if [ -e "/usr/local/bin/FoldingAtHome" ]
-then
-  kdialog -error "FoldingAtHome is already installed! Please remove it before re-installing!"
-  exit 2
-fi

Modified: pbibuild/modules/foldingathome/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/foldingathome/overlay-dir/PBI.RemoveScript.sh	2009-01-20 18:12:46 UTC (rev 3295)
+++ pbibuild/modules/foldingathome/overlay-dir/PBI.RemoveScript.sh	2009-01-20 18:56:56 UTC (rev 3296)
@@ -7,10 +7,7 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /usr/local/bin/FoldingAtHome
-rm /usr/local/share/foldingathome
 
-
 if [ ! -z "$DISPLAY" ]
 then
  # Ask if we want to remove the user profiles

Modified: pbibuild/modules/foldingathome/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/foldingathome/overlay-dir/PBI.SetupScript.sh	2009-01-20 18:12:46 UTC (rev 3295)
+++ pbibuild/modules/foldingathome/overlay-dir/PBI.SetupScript.sh	2009-01-20 18:56:56 UTC (rev 3296)
@@ -15,8 +15,13 @@
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
 
-ln -fs /Programs/${PROGDIR}/.sbin/FoldingAtHome /usr/local/bin/FoldingAtHome
-ln -fs /Programs/${PROGDIR}/share/foldingathome /usr/local/share/foldingathome
+# 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
 
-rm -rf /Programs/${PROGDIR}/autolibs
-mkdir /Programs/${PROGDIR}/autolibs
+
+

Modified: pbibuild/modules/foldingathome/pbi.conf
===================================================================
--- pbibuild/modules/foldingathome/pbi.conf	2009-01-20 18:12:46 UTC (rev 3295)
+++ pbibuild/modules/foldingathome/pbi.conf	2009-01-20 18:56:56 UTC (rev 3296)
@@ -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="06"
+BUILDKEY="29"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY