[PC-BSD Commits] r7850 - in pbibuild/modules/math/scilab: . overlay-dir

[svn at pcbsd.org]

Author: kris
Date: 2010-10-18 08:15:03 -0700 (Mon, 18 Oct 2010)
New Revision: 7850

Modified:
   pbibuild/modules/math/scilab/overlay-dir/PBI.SetupScript.sh
   pbibuild/modules/math/scilab/pbi.conf
Log:

Rebuild scilab, fix issue locating JAVA_HOME



Modified: pbibuild/modules/math/scilab/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/math/scilab/overlay-dir/PBI.SetupScript.sh	2010-10-18 10:45:04 UTC (rev 7849)
+++ pbibuild/modules/math/scilab/overlay-dir/PBI.SetupScript.sh	2010-10-18 15:15:03 UTC (rev 7850)
@@ -17,3 +17,10 @@
 ln -fs /Programs/${PROGDIR}/.sbin/scilab-bin /Programs/bin/scilab-bin
 ln -fs /Programs/${PROGDIR}/.sbin/scilab-cli /Programs/bin/scilab-cli
 ln -fs /Programs/${PROGDIR}/.sbin/scilab-cli-bin /Programs/bin/scilab-cli-bin
+
+# Fix scilab JAVA_HOME
+cd /Programs/${PROGDIR}
+jDir=`ls -d jdk-*`
+sed -i "" 's|############# JAVA DETECTION ##############|JAVA_HOME=/Programs/${PROGDIR}/$jDir/jre|g' /Programs/${PROGDIR}/bin/scilab
+sed -i "" 's|############# JAVA DETECTION ##############|JAVA_HOME=/Programs/${PROGDIR}/$jDir/jre|g' /Programs/${PROGDIR}/bin/scilab-cli
+sed -i "" 's|############# JAVA DETECTION ##############|JAVA_HOME=/Programs/${PROGDIR}/$jDir/jre|g' /Programs/${PROGDIR}/bin/scilab-adv-cli

Modified: pbibuild/modules/math/scilab/pbi.conf
===================================================================
--- pbibuild/modules/math/scilab/pbi.conf	2010-10-18 10:45:04 UTC (rev 7849)
+++ pbibuild/modules/math/scilab/pbi.conf	2010-10-18 15:15:03 UTC (rev 7850)
@@ -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="01"
+BUILDKEY="02"
 
 # If this port has a non-standard port version variable in Makefile, then
 # list the key here such as "OOOVERSION="