[PC-BSD Commits] r12663 - in pbi/modules/math/scilab: . scripts

[svn at pcbsd.org]

Author: kenmoore
Date: 2011-09-07 06:46:20 -0700 (Wed, 07 Sep 2011)
New Revision: 12663

Modified:
   pbi/modules/math/scilab/pbi.conf
   pbi/modules/math/scilab/scripts/post-install.sh
Log:
Fix the java detection for scilab and rebuild


Modified: pbi/modules/math/scilab/pbi.conf
===================================================================
--- pbi/modules/math/scilab/pbi.conf	2011-09-07 13:44:48 UTC (rev 12662)
+++ pbi/modules/math/scilab/pbi.conf	2011-09-07 13:46:20 UTC (rev 12663)
@@ -23,5 +23,7 @@
  
 # Additional options for make.conf
 PBI_MAKEOPTS="PACKAGE_BUILDING=yes"
+
+PBI_BUILDKEY="01"; export PBI_BUILDKEY
  
 export PBI_PROGNAME PBI_PROGWEB PBI_PROGAUTHOR PBI_PROGICON PBI_MAKEPORT PBI_MAKEOPTS

Modified: pbi/modules/math/scilab/scripts/post-install.sh
===================================================================
--- pbi/modules/math/scilab/scripts/post-install.sh	2011-09-07 13:44:48 UTC (rev 12662)
+++ pbi/modules/math/scilab/scripts/post-install.sh	2011-09-07 13:46:20 UTC (rev 12663)
@@ -2,7 +2,7 @@
 
 
 cd ${PBI_PROGDIRPATH}
-jDir=`ls -d jdk-*`
+jDir=`ls -d jdk*`
 sed -i "" 's|############# JAVA DETECTION ##############|JAVA_HOME=${PBI_PROGDIRPATH}/$jDir/jre|g' ${PBI_PROGDIRPATH}/bin/scilab
 sed -i "" 's|############# JAVA DETECTION ##############|JAVA_HOME=${PBI_PROGDIRPATH}/$jDir/jre|g' ${PBI_PROGDIRPATH}/bin/scilab-cli
 sed -i "" 's|############# JAVA DETECTION ##############|JAVA_HOME=${PBI_PROGDIRPATH}/$jDir/jre|g' ${PBI_PROGDIRPATH}/bin/scilab-adv-cli