merging with changes made since 21th May

git-svn-id: svn+slack://slack.fluxo.info/var/svn/mkbuilds@232 18ef50b8-d735-4ccd-97c1-689132df3dd9

5 files changed, 125 insertions, 42 deletions

diff --git a/dev/db/sqlite/sqlite.mkbuild b/dev/db/sqlite/sqlite.mkbuild
index a1dd67f..d07ed66 100644
--- a/dev/db/sqlite/sqlite.mkbuild
+++ b/dev/db/sqlite/sqlite.mkbuild
@@ -12,7 +12,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://www.sqlite.org/sqlite-3.5.8.tar.gz"
+[[DOWNLOAD FOLDER URL]]="http://www.sqlite.org/sqlite-3.5.9.tar.gz"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
diff --git a/dev/lang/yasm/yasm.mkbuild b/dev/lang/yasm/yasm.mkbuild
index d7a496d..af94b40 100644
--- a/dev/lang/yasm/yasm.mkbuild
+++ b/dev/lang/yasm/yasm.mkbuild
@@ -26,7 +26,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://www.tortall.net/projects/yasm/releases/yasm-0.7.0.tar.gz"
+[[DOWNLOAD FOLDER URL]]="http://www.tortall.net/projects/yasm/releases/yasm-0.7.1.tar.gz"
 
 #
 # Documentation files. Null ("") to auto-set commom doc-files:
diff --git a/dev/python/numpy/numpy.mkbuild b/dev/python/numpy/numpy.mkbuild
index b8e6c0c..129eb22 100644
--- a/dev/python/numpy/numpy.mkbuild
+++ b/dev/python/numpy/numpy.mkbuild
@@ -1,25 +1,16 @@
-#
-#  This mkbuild is free software; you can redistribute it and/or modify it under the
-#  terms of the GNU General Public License as published by the Free Software
-#  Foundation; either version 2 of the License, or any later version.
-#
-#  This mkbuild is distributed in the hope that it will be useful, but WITHOUT ANY
-#  WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-#  A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
-#
-#  You should have received a copy of the GNU General Public License along with
-#  this program; if not, write to the Free Software Foundation, Inc., 59 Temple
-#  Place - Suite 330, Boston, MA 02111-1307, USA
-#
-
+#################################################################
+## Generic template for Mkbuild
+##
+## Version 0.9.0 - Alves ( rudsonalves at yahoo d0t com d0t br )
+#################################################################
 #--------------------
 # Personal variables
 #--------------------
 # Author name
-[[SLACKBUILD AUTHOR]]="Silvio Rhatto"
+[[SLACKBUILD AUTHOR]]="Rudson R. Alves"
 
 # Initials author name
-[[SLACKBUILD AUTHOR INITIALS]]="rha"
+[[SLACKBUILD AUTHOR INITIALS]]="srv"
 
 #------------------------
 # Construction Variables
@@ -28,14 +19,99 @@
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
 [[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/numpy/numpy-1.0.4.tar.gz"
 
-[[SLACK REQUIRED]]="python"
+# Source base name. if different from package name. Null ("") to default value.
+# Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[SOURCE NAME]]=""
 
-# SlackBuild PATH in Slack.Sarava tree
-[[SLACKBUILD PATH]]="dev/python/[[NAME]]"
+# Package name. Null ("") to auto-set
+# Auto-set, get PKG_NAME from URL downcase(SRC_NAME): http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[PACKAGE NAME]]=""
+
+#
+# Package default ARCH
+# Default set is i486
+[[ARCH]]=""
+
+#
+# Package version.  Null ("") to auto-set.
+# Auto-set, get VERSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[VERSION]]=""
+
+#
+# Package extension. Null ("") to auto-set
+# Auto-set, get EXTENSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[EXTENSION]]=""
+
+#
+# Build number.
+# Auto-set to default 1
+[[BUILD NUMBER]]=""
+
+#
+# Source Name construction string
+# Default value is: $SRC_NAME-$VERSION.tar.$EXTENSION
+[[SOURCE NAME CONSTRUCTION STRING]]="$SRC_NAME-$VERSION.tar.$EXTENSION"
+
+#
+# Unpacker programa ("") to auto-set. Default "tar"
+# Unpacke Flags ("") to auto-set. Default flags to tar "--no-same-owner --no-same-permissions -xvf"
+[[UNPACKER]]=""
+[[UNPACKER FLAGS]]=""
+
+#
+# Dependency list input
+# Enter string: "dependency_1 [condiction_1] [versio_1]: dependency_2 [condiction_2] [versio_2]"
+# Example:
+[[SLACK REQUIRED]]="python: lapack"
+
+#
+# Decompress program
+# gz, tgz, bz2, set null ("") to auto-set
+# Auto-set, get DECOMPRESSOR from URL EXTENSION: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
+[[DECOMPRESSOR]]=""
+
+#
+# Decompress check flag
+# gz, tgz, bz2, set null ("") to auto-set
+[[DECOMPRESSOR TEST FLAG]]=""
 
-# Documentation files
+#
+# Documentation files. Null ("") to auto-set commom doc-files:
+# NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING readme.*
 [[DOCUMENTATION FILES]]="COMPATIBILITY DEV_README.txt LICENSE.txt MANIFEST.in PKG-INFO README.txt THANKS.txt"
 
+#
+# ./configure options
+[[OTHER CONFIGURE ARGS]]=""
+
+#
+# PREFIX. Default /usr
+[[PREFIX]]="/usr"
+
+#
+# Number of jobs
+[[NUMBER OF JOBS]]="-j4"
+
+#---------------------
+# Others changes
+#---------------------
+#[[MD5SUM CODE]]=""
+#[[MD5SUM EXTENSION]]=""
+#[[SIGNING KEY]]=""
+#[[SIGNING KEY URL]]=""
+#[[SIGNING KEY ID]]=""
+#[[CONFIG FILES]]=""
+#[[PATCH URLS]]=""
+[[PATCH FILES]]=""
+[[NUMBER OF PREFIX SLASHES TO STRIP]]="1"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+#[[SLACKBUILD PATH]]="others/unclassified/numpy"
+[[SLACKBUILD PATH]]="dev/python/numpy"
+
 #---------------------
 # SlackBuild Sections
 #---------------------
@@ -50,7 +126,9 @@
  on: slkflags
  on: error_codes
  on: start_structure
+off: create_build_user_and_group
  on: download_source
+off: svn_source
 off: md5sum_download_and_check_0
 off: md5sum_download_and_check_1
 off: gpg_signature_check
@@ -58,12 +136,14 @@ off: gpg_signature_check
 off: patch_source
 off: configure
  on: make_package
-off: install_package
+ on: install_package
  on: strip_binaries
 off: compress_manpages
 off: compress_info_files
+off: copy_init_scripts
  on: install_documentation
  on: slackdesc
+off: move_config_files
 off: postinstall_script
  on: build_package
  on: clean_builds
@@ -73,20 +153,23 @@ off: postinstall_script
 # Sections changes
 #------------------
 #>slackdesc
-numpy: NumPy: array processing for numbers, strings, records, and objects.
+numpy: numpy by Slack.Sarava
+numpy:
+numpy: NumPy is a replacement of Numeric Python that adds the features
+numpy: of numarray.
+numpy:
+numpy:
+numpy:
+numpy:
 numpy:
-numpy: NumPy is a general-purpose array-processing package designed to efficiently
-numpy: manipulate large multi-dimensional arrays of arbitrary records without
-numpy: sacrificing too much speed for small multi-dimensional arrays. NumPy is
-numpy: built on the Numeric code base and adds features introduced by numarray as
-numpy: well as an extended C-API and the ability to create arrays of arbitrary
-numpy: type which also makes NumPy suitable for interfacing with general-purpose
-numpy: data-base applications.
 numpy:
 numpy:
 #<slackdesc
 
-#>make_package
-# Build and install package
-python setup.py build install --root=$PKG
-#<make_package
+#p>
+-make $NUMJOBS || exit $ERROR_MAKE
++python setup.py build || exit $ERROR_MAKE
+===
+-make install DESTDIR="$PKG" || exit $ERROR_INSTALL
++python setup.py install --prefix=$PKG/usr || exit $ERROR_INSTALL
+#p<
diff --git a/dev/util/glade/glade.mkbuild b/dev/util/glade/glade.mkbuild
index abb75ea..9152232 100644
--- a/dev/util/glade/glade.mkbuild
+++ b/dev/util/glade/glade.mkbuild
@@ -17,15 +17,15 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://ftp.acc.umu.se/pub/gnome/sources/glade/${VERSION:0:4}/glade-2.12.2.tar.bz2"
+[[DOWNLOAD FOLDER URL]]="http://ftp.gnome.org/pub/GNOME/sources/glade3/3.1/glade3-3.1.5.tar.bz2"
 
 # Source base name. if different from package name. Null ("") to default value.
 # Auto-set, get SRC_NAME from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-[[SOURCE NAME]]=""
+[[SOURCE NAME]]="glade3"
 
 # Package name. Null ("") to auto-set
 # Auto-set, get PKG_NAME from URL downcase(SRC_NAME): http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-[[PACKAGE NAME]]=""
+[[PACKAGE NAME]]="glade"
 
 #
 # Package default ARCH
@@ -35,12 +35,12 @@
 #
 # Package version.  Null ("") to auto-set.
 # Auto-set, get VERSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-[[VERSION]]=""
+[[VERSION]]="3.1.5"
 
 #
 # Package extension. Null ("") to auto-set
 # Auto-set, get EXTENSION from URL: http://.../$SRC_NAME-$VERSION.tar.$EXTENSION'
-[[EXTENSION]]=""
+[[EXTENSION]]="bz2"
 
 #
 # Build number.
@@ -62,7 +62,7 @@
 # Dependency list input
 # Enter string: "dependency_1 [condiction_1] [versio_1]: dependency_2 [condiction_2] [versio_2]"
 # Example:
-[[SLACK REQUIRED]]="scrollkeeper: gtk+2: libxml2"
+[[SLACK REQUIRED]]="gtk+2 >= 2.10.0: libxml2 >= 2.4.1"
 
 #
 # Decompress program
diff --git a/dev/util/scons/scons.mkbuild b/dev/util/scons/scons.mkbuild
index 96644b8..a47a23c 100644
--- a/dev/util/scons/scons.mkbuild
+++ b/dev/util/scons/scons.mkbuild
@@ -26,7 +26,7 @@
 #------------------------
 #
 # Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
-[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/scons/scons-0.98.2.tar.gz"
+[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/scons/scons-0.98.5.tar.gz"
 
 #
 # Documentation files. Null ("") to auto-set commom doc-files: