merging with changes made since 21th May

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

2 files changed, 260 insertions, 0 deletions

diff --git a/dev/libs/boost/boost.mkbuild b/dev/libs/boost/boost.mkbuild
new file mode 100644
index 0000000..cf56267
--- /dev/null
+++ b/dev/libs/boost/boost.mkbuild
@@ -0,0 +1,235 @@
+#
+#  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
+#
+
+#--------------------
+# Personal variables
+#--------------------
+# Author name
+[[SLACKBUILD AUTHOR]]="Silvio Rhatto"
+
+# Initials author name
+[[SLACKBUILD AUTHOR INITIALS]]="rha"
+
+#------------------------
+# Construction Variables
+#------------------------
+#
+# Complete URL address or URL base address ( without $SRC_NAME-$VERSION... )
+[[DOWNLOAD FOLDER URL]]="http://downloads.sourceforge.net/boost/boost_1_35_0.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]]="boost"
+
+#
+# Package version
+[[VERSION]]="1.35.0"
+
+#
+# Source Name construction string
+# Default value is: $SRC_NAME-$VERSION.tar.$EXTENSION
+[[SOURCE NAME CONSTRUCTION STRING]]="$SRC_NAME"_"1_35_0.tar.$EXTENSION"
+
+# Documentation files. Null ("") to auto-set commom doc-files:
+[[DOCUMENTATION FILES]]="LICENSE_1_0.tx"
+
+#
+# Other configure arguments
+[[OTHER CONFIGURE ARGS]]="--with-libraries=all"
+
+# SlackBuild model
+[[SLACKBUILD MODEL]]="generic.mkSlackBuild"
+
+# SlackBuild PATH in Slack.Sarava tree
+[[SLACKBUILD PATH]]="dev/libs/boost"
+
+#---------------------
+# SlackBuild Sections
+#---------------------
+# Default sections:
+#      head, set_variables, slkflags, start_structure, untar_source,
+#      make_package, install_package, build_package
+# Warning: don't remove '#>>' and "#<<" tags.
+#>> Start SlackBuild Sections:
+ on: head
+ on: slackbuildrc
+ on: set_variables
+ on: slkflags
+ on: error_codes
+ on: start_structure
+off: create_build_user_and_group
+ on: download_source
+off: md5sum_download_and_check_0
+off: md5sum_download_and_check_1
+off: gpg_signature_check
+ on: untar_source
+off: patch_source
+ on: configure
+ on: make_package
+ on: install_package
+ on: strip_binaries
+off: compress_manpages
+off: compress_info_files
+ on: install_documentation
+ on: slackdesc
+off: move_config_files
+off: postinstall_script
+ on: build_package
+ on: clean_builds
+#<< End SlackBuild Sections
+
+#------------------
+# Sections changes
+#------------------
+#>slackdesc
+boost: boost
+boost:
+boost: Boost provides free peer-reviewed portable C++ source libraries.
+boost: 
+boost: We emphasize libraries that work well with the C++ Standard Library. 
+boost: Boost libraries are intended to be widely useful, and usable across 
+boost: a broad spectrum of applications.
+boost:
+boost:
+boost: http://www.boost.org/
+boost:
+#<slackdesc
+
+#>configure
+# Configure
+
+# That's the old way we did
+#CFLAGS="$SLKCFLAGS" \
+#  CXXFLAGS="$SLKCFLAGS" \
+#  ./configure \
+#  --prefix="$PREFIX" --libdir="$LIBDIR" $CONF_OPTIONS || exit $ERROR_CONF
+#
+# Add DESTDIR support into Makefile
+#sed -i -e 's/\$(PREFIX)/\$(DESTDIR)\/\$(PREFIX)/'   \
+#       -e 's/\$(EPREFIX)/\$(DESTDIR)\/\$(EPREFIX)/' \
+#       -e 's/\$(LIBDIR)/\$(DESTDIR)\/\$(LIBDIR)/'   \
+#       -e 's/\$(INCLUDEDIR)/\$(DESTDIR)\/\$(INCLUDEDIR)/' Makefile
+
+# New way, using stuff from http://slackbuilds.org/repository/12.1/development/boost/,
+# wich has the following copyright note:
+
+# Copyright 2007-2008 Eric Hameleers <alien@slackware.com>
+# Copyright 2007-2008 Heinz Wiesinger <HMWiesinger@gmx.at>
+# All rights reserved.
+#
+# Redistribution and use of this script, with or without modification, is
+# permitted provided that the following conditions are met:
+#
+# 1. Redistributions of this script must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED ''AS IS'' AND ANY EXPRESS OR IMPLIED
+# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+# bjam-build system mostly taken from SlackBuild by Eric Hameleers
+
+# Script modified by Robby Workman <rworkman@slackbuilds.org>
+# -- no additional license terms and no copyright
+
+# Small changes from Rhatto <rhatto at riseup.net>
+
+if [ "$ICU" = "YES" ]; then
+    do_icu="-sICU_PATH=/usr"
+else
+    do_icu=""
+fi
+
+# This is the python we build against:
+PYTHON_VERSION=$(python -c 'import sys; print sys.version[:3]')
+PYTHON_FLAGS="-sPYTHON_ROOT=/usr -sPYTHON_VERSION=$PYTHON_VERSION"
+
+# First build bjam, the boost build system:
+cd tools/jam/src
+  CFLAGS="$SLKCFLAGS -fno-strict-aliasing" CC=gcc ./build.sh cc || exit $ERROR_CONF
+cd -
+
+BJAM=$(find tools/jam/src/ -name bjam -a -type f)
+
+# Patch Jamroot to include our custom build rule
+patch -p1 -i $CWD/boost_custom_jam_rule.diff || exit $ERROR_PATCH
+#<configure
+
+#>make_package
+# Build procedure also thanks to slackbuilds.org and with the same copyright
+# note from the configure section above
+
+# Create build subdirectory
+mkdir obj
+
+# Next, we build boost using bjam
+ $BJAM \
+  release \
+  "-sNO_COMPRESSION=0" \
+  "-sZLIB_INCLUDE=/usr/include" \
+  "-sZLIB_LIBPATH=$LIBDIR" \
+  "-sBZIP2_INCLUDE=/usr/include" \
+  "-sBZIP2_LIBPATH=$LIBDIR" \
+  "-sEXPAT_INCLUDE=/usr/include" \
+  "-sEXPAT_LIBPATH=$LIBDIR" \
+  --toolset=gcc \
+  --layout=system \
+  --builddir=obj \
+  --prefix=/usr \
+  --build-type=custom \
+  $PYTHON_FLAGS \
+  $do_icu \
+  ${NUMJOBS} || exit ERROR_MAKE
+#<make_package
+
+#>install_package
+# Install
+
+# That's the old way we did
+#make install DESTDIR="$PKG" || exit $ERROR_INSTALL
+
+# New way, thanks to slackbuilds.org and with the same copyright
+# note from the configure section above
+
+# And then install boost..
+mkdir -p $PKG/usr/{lib,include}
+
+$BJAM \
+  release \
+  "-sEXPAT_INCLUDE=/usr/include" \
+  "-sEXPAT_LIBPATH=$LIBDIR" \
+  --toolset=gcc \
+  --layout=system \
+  --builddir=obj \
+  --prefix=$PKG/usr \
+  --build-type=custom \
+  $PYTHON_FLAGS \
+  $do_icu \
+  install || exit $ERROR_INSTALL
+
+# This is old stuff also
+# Version with underline
+#VERSION_UNDERLINE="`echo $SRC_VERSION | sed -e 's/\./_/g'`"
+#
+# Underline version without minor version if minor version is 0 (workaround)
+#VERSION_UNDERLINE="`echo $VERSION_UNDERLINE | sed -e 's/\([0-9]\+\)_\([0-9]\+\)_0/\1_\2/'`"
+#cd /usr/include && ln -s boost-$VERSION_UNDERLINE/ boost
+#<install_package
diff --git a/dev/libs/boost/boost_custom_jam_rule.diff b/dev/libs/boost/boost_custom_jam_rule.diff
new file mode 100644
index 0000000..49cd519
--- /dev/null
+++ b/dev/libs/boost/boost_custom_jam_rule.diff
@@ -0,0 +1,25 @@
+--- Jamroot	2008-03-25 21:47:24.000000000 +0100
++++ boost_1_35_0/Jamroot	2008-04-02 18:13:48.000000000 +0200
+@@ -127,7 +127,7 @@
+ # which builds only the "release <threading>multi <link>shared" variant.
+ local build-type = [ MATCH "^--build-type=(.*)" : [ modules.peek : ARGV ] ] ;
+ build-type ?= minimal ;
+-if ! ( $(build-type) in minimal complete )
++if ! ( $(build-type) in minimal complete custom )
+ {
+     build-type = minimal ;
+ }
+@@ -145,6 +145,13 @@
+     <link>shared <link>static
+     <runtime-link>shared <runtime-link>static
+     ;
++local default-build,custom =
++    release
++    <optimization>speed <inlining>full
++    <threading>single <threading>multi
++    <link>shared
++    <runtime-link>shared
++    ;
+ 
+ # Set the default build.
+ local default-build = $(default-build,$(build-type)) ;