From 2cd81aedce1f3e0cf3a1c597e2420110a5a7894a Mon Sep 17 00:00:00 2001
From: rhatto <rhatto@370017ae-e619-0410-ac65-c121f96126d4>
Date: Thu, 27 Nov 2008 16:05:54 +0000
Subject: packages now shipping with slack-required

git-svn-id: svn+slack://slack.fluxo.info/var/svn/slackbuilds@1980 370017ae-e619-0410-ac65-c121f96126d4
---
 dev/python/dbus-python/dbus-python.SlackBuild   | 27 +++++++++++++++---------
 dev/python/epsilon/epsilon.SlackBuild           |  8 ++++++-
 dev/python/genshi/Genshi.SlackBuild             | 10 +++++++--
 dev/python/kiwi/kiwi.SlackBuild                 | 10 +++++++--
 dev/python/mysql-python/MySQL-python.SlackBuild |  8 ++++++-
 dev/python/nevow/Nevow.SlackBuild               |  8 ++++++-
 dev/python/numpy/numpy.SlackBuild               |  8 ++++++-
 dev/python/pycairo/pycairo.SlackBuild           | 23 +++++++++++++-------
 dev/python/pycrypto/pycrypto.SlackBuild         | 28 +++++++++++++++----------
 dev/python/pygame/pygame.SlackBuild             |  8 ++++++-
 dev/python/pygtk/pygtk.SlackBuild               | 23 +++++++++++++-------
 dev/python/pysqlite/pysqlite.SlackBuild         | 23 +++++++++++++-------
 dev/python/simplejson/simplejson.SlackBuild     |  8 ++++++-
 dev/python/twisted/Twisted.SlackBuild           |  8 ++++++-
 dev/python/visual/visual.SlackBuild             |  8 ++++++-
 dev/python/wxpython/wxPython.SlackBuild         | 28 +++++++++++++++----------
 16 files changed, 168 insertions(+), 68 deletions(-)

(limited to 'dev/python')

diff --git a/dev/python/dbus-python/dbus-python.SlackBuild b/dev/python/dbus-python/dbus-python.SlackBuild
index 8b308c47..2700769a 100644
--- a/dev/python/dbus-python/dbus-python.SlackBuild
+++ b/dev/python/dbus-python/dbus-python.SlackBuild
@@ -10,13 +10,13 @@
 #  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
+#  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
 #
 # slackbuild for dbus-python, by Rudson R. Alves
 # requires: dbus dbus-glib glib2 glibc-solibs python 
-# tested: dbus-python-0.82.3, 0.82.4
+# tested: dbus-python-0.82.3
 #
 
 # Look for slackbuildrc
@@ -31,7 +31,7 @@ CWD="$(pwd)"
 SRC_NAME="dbus-python"
 PKG_NAME="dbus-python"
 ARCH=${ARCH:=i486}
-SRC_VERSION=${VERSION:=0.82.4}
+SRC_VERSION=${VERSION:=0.82.3}
 PKG_VERSION="$(echo "$SRC_VERSION" | tr '[[:blank:]-]' '_')"
 BUILD=${BUILD:=1rra}
 SRC_DIR=${SRC_DIR:=$CWD}/$PKG_NAME
@@ -55,8 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -86,7 +87,7 @@ fi
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +123,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -142,11 +143,17 @@ dbus-python:
 dbus-python:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/epsilon/epsilon.SlackBuild b/dev/python/epsilon/epsilon.SlackBuild
index 2ff23a48..4c7ea8e4 100755
--- a/dev/python/epsilon/epsilon.SlackBuild
+++ b/dev/python/epsilon/epsilon.SlackBuild
@@ -150,11 +150,17 @@ epsilon:
 epsilon:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/genshi/Genshi.SlackBuild b/dev/python/genshi/Genshi.SlackBuild
index c6b8fbb2..9516ad86 100755
--- a/dev/python/genshi/Genshi.SlackBuild
+++ b/dev/python/genshi/Genshi.SlackBuild
@@ -91,7 +91,7 @@ PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Build and install package
-python setup.py build install --root=$PKG
+python setup.py build install --root=$PKG || exit $ERROR_INSTALL
 
 # Strip binaries
 ( cd "$PKG"
@@ -134,11 +134,17 @@ Genshi:
 Genshi: 
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/kiwi/kiwi.SlackBuild b/dev/python/kiwi/kiwi.SlackBuild
index 75c2f739..3605f875 100644
--- a/dev/python/kiwi/kiwi.SlackBuild
+++ b/dev/python/kiwi/kiwi.SlackBuild
@@ -94,7 +94,7 @@ cd "$PKG_SRC"
 # Adjust docdir
 sed -i "s,share/doc/${PKG_NAME},doc/${PKG_NAME}-${PKG_VERSION},g" setup.py
 
-python setup.py install --root=$PKG
+python setup.py install --root=$PKG || exit $ERROR_INSTALL
 
 # Install documentation
 DOCS="AUTHORS COPYING ChangeLog MANIFEST.in NEWS PKG-INFO README"
@@ -129,11 +129,17 @@ kiwi:
 kiwi:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/mysql-python/MySQL-python.SlackBuild b/dev/python/mysql-python/MySQL-python.SlackBuild
index a844a867..b5da1598 100644
--- a/dev/python/mysql-python/MySQL-python.SlackBuild
+++ b/dev/python/mysql-python/MySQL-python.SlackBuild
@@ -134,11 +134,17 @@ MySQL-python: supported.
 MySQL-python:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/nevow/Nevow.SlackBuild b/dev/python/nevow/Nevow.SlackBuild
index 353ae477..f922522a 100755
--- a/dev/python/nevow/Nevow.SlackBuild
+++ b/dev/python/nevow/Nevow.SlackBuild
@@ -134,11 +134,17 @@ Nevow:
 Nevow: 
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/numpy/numpy.SlackBuild b/dev/python/numpy/numpy.SlackBuild
index 2ff9a012..7009dec7 100755
--- a/dev/python/numpy/numpy.SlackBuild
+++ b/dev/python/numpy/numpy.SlackBuild
@@ -137,11 +137,17 @@ numpy:
 numpy:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/pycairo/pycairo.SlackBuild b/dev/python/pycairo/pycairo.SlackBuild
index a461fe4b..69730c28 100644
--- a/dev/python/pycairo/pycairo.SlackBuild
+++ b/dev/python/pycairo/pycairo.SlackBuild
@@ -10,9 +10,9 @@
 #  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
+#  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
 #
 # slackbuild for pycairo, by Rudson R. Alves
 # requires: cairo python 
@@ -55,8 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -86,7 +87,7 @@ fi
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -123,9 +124,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -143,11 +144,17 @@ pycairo:
 pycairo:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/pycrypto/pycrypto.SlackBuild b/dev/python/pycrypto/pycrypto.SlackBuild
index effa9af1..3322a427 100755
--- a/dev/python/pycrypto/pycrypto.SlackBuild
+++ b/dev/python/pycrypto/pycrypto.SlackBuild
@@ -10,12 +10,12 @@
 #  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
+#  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
 #
 # slackbuild for pycrypto, by Silvio Rhatto
-# requires: python
+# requires: python 
 # tested: pycrypto-2.0.1
 #
 
@@ -55,8 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -83,15 +84,14 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! gunzip -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC=`ls -l | awk '/^d/ { print $8 }'`
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Build and install package
-python setup.py build install --root=$PKG
+python setup.py build install --root=$PKG || exit $ERROR_INSTALL
 
 # Strip binaries
 ( cd "$PKG"
@@ -114,9 +114,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -134,11 +134,17 @@ pycrypto:
 pycrypto: 
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/pygame/pygame.SlackBuild b/dev/python/pygame/pygame.SlackBuild
index 7c828786..53a79408 100644
--- a/dev/python/pygame/pygame.SlackBuild
+++ b/dev/python/pygame/pygame.SlackBuild
@@ -137,11 +137,17 @@ pygame:
 pygame:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/pygtk/pygtk.SlackBuild b/dev/python/pygtk/pygtk.SlackBuild
index dd86f707..09a6d15e 100755
--- a/dev/python/pygtk/pygtk.SlackBuild
+++ b/dev/python/pygtk/pygtk.SlackBuild
@@ -10,9 +10,9 @@
 #  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
+#  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
 #
 # slackbuild for pygtk, by Rudson R. Alves
 # requires: pygobject 
@@ -55,8 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -86,7 +87,7 @@ fi
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Configure
@@ -122,9 +123,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -142,11 +143,17 @@ pygtk:
 pygtk:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/pysqlite/pysqlite.SlackBuild b/dev/python/pysqlite/pysqlite.SlackBuild
index e084a435..0434c30f 100755
--- a/dev/python/pysqlite/pysqlite.SlackBuild
+++ b/dev/python/pysqlite/pysqlite.SlackBuild
@@ -10,9 +10,9 @@
 #  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
+#  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
 #
 # slackbuild for pysqlite, by Silvio Rhatto
 # requires: sqlite 
@@ -57,6 +57,7 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -86,11 +87,11 @@ fi
 # Untar
 cd "$PKG_WORK"
 tar --no-same-owner --no-same-permissions -xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
-PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $8 }'`"
+PKG_SRC="$PWD/`ls -l | awk '/^d/ { print $NF }'`"
 cd "$PKG_SRC"
 
 # Build and install package
-python setup.py build install --root=$PKG
+python setup.py build install --root=$PKG || exit $ERROR_INSTALL
 
 # Strip binaries
 ( cd "$PKG"
@@ -115,9 +116,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -135,11 +136,17 @@ pysqlite:
 pysqlite:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/simplejson/simplejson.SlackBuild b/dev/python/simplejson/simplejson.SlackBuild
index d22e3445..3acb6b3b 100755
--- a/dev/python/simplejson/simplejson.SlackBuild
+++ b/dev/python/simplejson/simplejson.SlackBuild
@@ -134,11 +134,17 @@ simplejson:
 simplejson: 
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/twisted/Twisted.SlackBuild b/dev/python/twisted/Twisted.SlackBuild
index 2b8dec27..6c789b30 100644
--- a/dev/python/twisted/Twisted.SlackBuild
+++ b/dev/python/twisted/Twisted.SlackBuild
@@ -134,11 +134,17 @@ Twisted:
 Twisted:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/visual/visual.SlackBuild b/dev/python/visual/visual.SlackBuild
index 8d38ade6..86e2950a 100644
--- a/dev/python/visual/visual.SlackBuild
+++ b/dev/python/visual/visual.SlackBuild
@@ -143,11 +143,17 @@ visual:
 visual:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
diff --git a/dev/python/wxpython/wxPython.SlackBuild b/dev/python/wxpython/wxPython.SlackBuild
index fce3a047..04f598d6 100755
--- a/dev/python/wxpython/wxPython.SlackBuild
+++ b/dev/python/wxpython/wxPython.SlackBuild
@@ -10,12 +10,12 @@
 #  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
+#  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
 #
 # slackbuild for wxPython, by Silvio Rhatto
-# requires: python wxWidgets
+# requires: python wxWidgets 
 # tested: wxPython-2.8.7.1
 #
 
@@ -55,8 +55,9 @@ elif [ "$ARCH" = "i686" ]; then
 elif [ "$ARCH" = "s390" ]; then
   SLKCFLAGS="-O2"
 elif [ "$ARCH" = "x86_64" ]; then
-  SLKCFLAGS="-O2"
+  SLKCFLAGS="-O2 -fPIC"
   LIBDIR="$PREFIX/lib64"
+  LDFLAGS="-L/lib64 -L/usr/lib64"
 fi
 
 # Set error codes (used by createpkg)
@@ -83,7 +84,6 @@ if [ ! -s "$SRC_DIR/$SRC" ] || ! bunzip2 -t "$SRC_DIR/$SRC" 2> /dev/null; then
   wget "$URL" -O "$SRC_DIR/$SRC" || exit $ERROR_WGET
 fi
 
-
 # Untar
 cd "$PKG_WORK"
 tar xvf "$SRC_DIR/$SRC" || exit $ERROR_TAR
@@ -91,7 +91,7 @@ PKG_SRC=`ls -l | awk '/^d/ { print $8 }'`
 cd "$PKG_SRC/$PKG_NAME"
 
 # Build and install package
-python setup.py build install --root=$PKG
+python setup.py build install --root=$PKG || exit $ERROR_INSTALL
 
 # Strip binaries
 ( cd "$PKG"
@@ -102,7 +102,7 @@ python setup.py build install --root=$PKG
 )
 
 # Install documentation
-DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING readme.*"
+DOCS="NEWS TODO README AUTHORS INSTALL ChangeLog MAINTAINERS COPYING LICENSE SIGNATURE readme.*"
 mkdir -p "$PKG/usr/doc/$PKG_NAME-$PKG_VERSION" || exit $ERROR_MKDIR
 for doc in $DOCS; do
   if [ -f "$doc" ]; then
@@ -114,9 +114,9 @@ done
 mkdir -p "$PKG/install" || exit $ERROR_MKDIR
 cat << EODESC > "$PKG/install/slack-desc"
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
+# on the right side marks the last column you can put a character in. You must
 # make exactly 11 lines for the formatting to be correct.  It's also
 # customary to leave one space after the ':'.
 
@@ -134,11 +134,17 @@ wxPython:
 wxPython:
 EODESC
 
+# Copy slack-required
+mkdir -p "$PKG/install" || exit $ERROR_MKDIR
+if [ -f "$CWD/slack-required" ]; then
+  cp $CWD/slack-required $PKG/install
+fi
+
 # Build the package
 cd "$PKG"
 makepkg -l y -c n "$REPOS/$PKG_NAME-$PKG_VERSION-$ARCH-$BUILD.tgz" || exit $ERROR_MKPKG
 
 # Delete source and build directories if requested
-if [ "$CLEANUP" == "yes" ]; then
+if [ "$CLEANUP" == "yes" ] || [ "$1" = "--cleanup" ]; then
   rm -rf "$PKG_WORK" "$PKG"
 fi
-- 
cgit v1.2.3