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

[svn at pcbsd.org]

Author: kris
Date: 2009-01-12 11:17:11 -0800 (Mon, 12 Jan 2009)
New Revision: 3229

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

Updated scilab, should build properly now



Modified: pbibuild/modules/scilab/overlay-dir/PBI.RemoveScript.sh
===================================================================
--- pbibuild/modules/scilab/overlay-dir/PBI.RemoveScript.sh	2009-01-12 18:18:53 UTC (rev 3228)
+++ pbibuild/modules/scilab/overlay-dir/PBI.RemoveScript.sh	2009-01-12 19:17:11 UTC (rev 3229)
@@ -7,16 +7,3 @@
 # TIP: 'kdialog' should be used for user interaction. 
 #########################################
 
-rm /Programs/SciLab
-rm /usr/local/bin/scilab
-rm /usr/local/bin/intersci
-rm /usr/local/bin/intersci-n
-rm /usr/local/lib/scilab
-
-ls -al /usr/local/libexec/gnome-pty-helper | grep Scilab >/dev/null 2>/dev/null
-if [ "$?" = "0" ]
-then
-  rm /usr/local/libexec/gnome-pty-helper
-fi
-
-

Modified: pbibuild/modules/scilab/overlay-dir/PBI.SetupScript.sh
===================================================================
--- pbibuild/modules/scilab/overlay-dir/PBI.SetupScript.sh	2009-01-12 18:18:53 UTC (rev 3228)
+++ pbibuild/modules/scilab/overlay-dir/PBI.SetupScript.sh	2009-01-12 19:17:11 UTC (rev 3229)
@@ -14,14 +14,15 @@
 # echo 'SETSTEPS: <num>' # Set the current progress of the progress bar
 # echo 'MSG: <text>' # Display this text above progress bar
 #########################################
-ln -s /Programs/${PROGDIR} /Programs/SciLab
-ln -s /Programs/${PROGDIR}/.sbin/scilab /usr/local/bin/scilab
-ln -s /Programs/${PROGDIR}/.sbin/intersci /usr/local/bin/intersci
-ln -s /Programs/${PROGDIR}/.sbin/intersci-n /usr/local/bin/intersci
-ln -s /Programs/${PROGDIR}/autolibs/scilab /usr/local/lib/scilab
-ln -s /Programs/${PROGDIR}/autolibs/pvm /usr/local/lib/pvm
-ln -s /Programs/SciLab/libexec/gnome-pty-helper /usr/local/libexec/gnome-pty-helper
 
-echo "LAUNCHCLOSE: /usr/local/bin/scilab"
+# 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
 
+echo "LAUNCHCLOSE: /Programs/bin/scilab"
 
+

Modified: pbibuild/modules/scilab/pbi.conf
===================================================================
--- pbibuild/modules/scilab/pbi.conf	2009-01-12 18:18:53 UTC (rev 3228)
+++ pbibuild/modules/scilab/pbi.conf	2009-01-12 19:17:11 UTC (rev 3229)
@@ -29,12 +29,10 @@
 /usr/ports/math/scilab-toolbox-swt"
 
 # Enter your custom make options here
-MAKEOPTS="LDFLAGS=\"-Wl,--rpath=/Programs/SciLab/autolibs\"
-PREFIX=/Programs/SciLab
-WITHOUT_GNOME=yes"
+MAKEOPTS="WITHOUT_GNOME=yes"
 
 # 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="11"
+BUILDKEY="01"
 
 export PBIPORT MAKEOPTS PROGNAME PROGWEB PROGAUTHOR OTHERPORT PROGICON PROGLIBS PBIUPDATE BUILDKEY

Modified: pbibuild/modules/scilab/preportmake.sh
===================================================================
--- pbibuild/modules/scilab/preportmake.sh	2009-01-12 18:18:53 UTC (rev 3228)
+++ pbibuild/modules/scilab/preportmake.sh	2009-01-12 19:17:11 UTC (rev 3229)
@@ -1,7 +1,3 @@
 #!/bin/sh
 
-rm -rf /Programs/SciLab
-mkdir /Programs
-ln -s /usr/local /Programs/SciLab
-~