From 9d1e3bc469a07819011923fc4e952b6cfcfd3a95 Mon Sep 17 00:00:00 2001
From: rudson <rudson@18ef50b8-d735-4ccd-97c1-689132df3dd9>
Date: Tue, 22 Jan 2008 19:47:12 +0000
Subject: git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@59
 18ef50b8-d735-4ccd-97c1-689132df3dd9

---
 sci/mathematics/octave/octave.mkbuild |  2 +-
 sci/mathematics/scilab/scilab.mkbuild | 70 ++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 35 deletions(-)

(limited to 'sci')

diff --git a/sci/mathematics/octave/octave.mkbuild b/sci/mathematics/octave/octave.mkbuild
index 59e3ef9..20ced22 100644
--- a/sci/mathematics/octave/octave.mkbuild
+++ b/sci/mathematics/octave/octave.mkbuild
@@ -31,7 +31,7 @@
 
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="ftp://ftp.octave.org/pub/octave/octave-2.9.13.tar.bz2"
+[[DOWNLOAD FOLDER URL]]="ftp://ftp.octave.org/pub/octave/octave-3.0.0.tar.bz2"
 
 #
 # Package version.  Null ("") to auto-set.
diff --git a/sci/mathematics/scilab/scilab.mkbuild b/sci/mathematics/scilab/scilab.mkbuild
index 5877871..e26e50f 100644
--- a/sci/mathematics/scilab/scilab.mkbuild
+++ b/sci/mathematics/scilab/scilab.mkbuild
@@ -159,37 +159,39 @@ scilab: being used in educational and industrial environments around the
 scilab: world.
 #<slackdesc
 
-#>make_package
-# Compile
-make all || exit $ERROR_MAKE
-#<make_package
-
-#>install_package
-# Change intall path
-eval "sed -i 's¦^PREFIX=$PREFIX¦PREFIX=$PKG/${PREFIX:1}¦' Makefile"
-make install
-
-cd $PKG
-for i in `grep -Rl '/tmp/package-scilab' usr/*`; do 
-    sed -i 's:/tmp/package-scilab::g' $i
-done
-
-cd - >/dev/null
-
-# Make Scilab.desktop
-mkdir -p $PKG/usr/share/applications/ 2>/dev/null
-cat << EOF_KDE > $PKG/usr/share/applications/Scilab.desktop
-[Desktop Entry]
-Encoding=UTF-8
-Categories=Education;Math;
-Exec=scilab
-Icon=$PREFIX/lib/$PKG_NAME-$VERSION/X11_defaults/scilab.xpm
-StartupNotify=true
-Terminal=false
-Type=Application
-Name=Scilab
-GenericName=Scilab
-Comment=
-EOF_KDE
-
-#<install_package
+#p>
+ # Compile
+-make $NUMJOBS || exit $ERROR_MAKE
++make all || exit $ERROR_MAKE
+===
+ <install_package> off
++# Change intall path
++eval "sed -i 's¦^PREFIX=$PREFIX¦PREFIX=$PKG/${PREFIX:1}¦' Makefile"
+===
+ # Install
+-make install DESTDIR="$PKG" || exit $ERROR_INSTALL
++make install || exit $ERROR_INSTALL
++
++cd $PKG
++for i in `grep -Rl '/tmp/package-scilab' usr/*`; do 
++    sed -i 's:/tmp/package-scilab::g' $i
++done
++
++cd - >/dev/null
++
++# Make Scilab.desktop
++mkdir -p $PKG/usr/share/applications/ 2>/dev/null
++cat << EOF_KDE > $PKG/usr/share/applications/Scilab.desktop
++[Desktop Entry]
++Encoding=UTF-8
++Categories=Education;Math;
++Exec=scilab
++Icon=$PREFIX/lib/$PKG_NAME-$VERSION/X11_defaults/scilab.xpm
++StartupNotify=true
++Terminal=false
++Type=Application
++Name=Scilab
++GenericName=Scilab
++Comment=
++EOF_KDE
+#p<
-- 
cgit v1.2.3