1 files changed, 35 insertions, 26 deletions
diff --git a/libraries/luadbi/luadbi.SlackBuild b/libraries/luadbi/luadbi.SlackBuild
index 52778f90b8..18c236c00d 100644
--- a/libraries/luadbi/luadbi.SlackBuild
+++ b/libraries/luadbi/luadbi.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for luadbi
 
@@ -22,20 +22,30 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=luadbi
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-0.7.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -51,8 +61,8 @@ OUTPUT=${OUTPUT:-/tmp}
 
 DBs=${DBs:-mysql sqlite3}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -71,38 +81,37 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-mkdir $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM.$VERSION.tar.gz -C ./$PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find -L . \
- \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 -o -perm 511 \) \
- -exec chmod 755 {} \; -o \
- \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
- -exec chmod 644 {} \;
+ \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
+  -o -perm 511 \) -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-# Getting default cflags from makefile then append slkcflags to 'em and passing to make
-_CFLAGS=`cat Makefile |grep ^CFLAGS |sed "s,CFLAGS\=,,g" |sed "s,\/usr\/include\/postgresql\/,\/usr\/include\/postgresql\/server\/,g"`" "${SLKCFLAGS}
 make \
   $DBs \
-  CFLAGS="$_CFLAGS"
-
-# Installing:
-mkdir -p $PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1
-mkdir -p $PKG/usr/share/lua/5.1/
-for i in dbdmysql.so dbdpostgresql.so dbdsqlite3.so dbddb2.so dbdoracle.so; do
-if [ -f "$i" ]; then
-cp $i $PKG/usr/lib${LIBDIRSUFFIX}/lua/5.1
-fi
+  LUA_V=5.1 \
+  LUA_CDIR=$PKG/usr/lib$LIBDIRSUFFIX/lua/5.1 \
+  LUA_LDIR=$PKG/usr/share/lua/5.1 \
+  CFLAGS="$SLKCFLAGS"
+
+for t in $DBs ; do
+make \
+  install_$t \
+  LUA_V=5.1 \
+  LUA_CDIR=$PKG/usr/lib$LIBDIRSUFFIX/lua/5.1 \
+  LUA_LDIR=$PKG/usr/share/lua/5.1 \
+  CFLAGS="$SLKCFLAGS"
 done
-cp DBI.lua $PKG/usr/share/lua/5.1
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
-  COPYING INSTALL README \
+  COPYING INSTALL README.md \
   $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
@@ -110,4 +119,4 @@ mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE