libraries/libdbi-drivers: Updated for version 0.8.3_1

4 files changed, 39 insertions, 14 deletions

diff --git a/libraries/libdbi-drivers/README b/libraries/libdbi-drivers/README
index 373c2951965b4..4f5ed1d6d58b5 100644
--- a/libraries/libdbi-drivers/README
+++ b/libraries/libdbi-drivers/README
@@ -2,4 +2,8 @@ The libdbi-drivers project maintains drivers for the libdbi database
 abstraction layer written in C. Drivers are distributed seperately
 from the library itself.
 
+This includes the drivers for mysql and sqlite by default. 
+if the PGSQL="true" variable is set, then postgresql will is 
+required and will be built as well.
+
 This requires libdbi.
diff --git a/libraries/libdbi-drivers/libdbi-drivers.SlackBuild b/libraries/libdbi-drivers/libdbi-drivers.SlackBuild
index 5e8e645549992..eeca6725d4768 100644
--- a/libraries/libdbi-drivers/libdbi-drivers.SlackBuild
+++ b/libraries/libdbi-drivers/libdbi-drivers.SlackBuild
@@ -2,11 +2,12 @@
 
 # Slackware build script for libdbi-drivers
 # Written by Michal Bialozor <bialyy@o2.pl>
+# Modified by  Vincent Batts, vbatts@hashbangbash.com, http://hashbangbash.com/
 
 PRGNAM=libdbi-drivers
 VERSION=0.8.3_1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 SRCVERSION=$(echo $VERSION | tr _ -)
@@ -16,36 +17,54 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+PGSQL=${PGSQL:-false}
+OPT_ARGS=""
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
+fi
+
+if [ "$PGSQL" = "true" ] ; then
+  OPT_ARGS=" --with-pgsql --with-pgsql-dir=/usr/lib${LIBDIRSUFFIX}/pgsql "
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
-cd $TMP || exit 1
+cd $TMP
 rm -rf $PRGNAM-$SRCVERSION
-tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz || exit 1
-cd $PRGNAM-$SRCVERSION || exit 1
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
+cd $PRGNAM-$SRCVERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
+  --with-dbi-libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --enable-static=no \
   --enable-shared=yes \
-  --build=$ARCH-slackware-linux \
   --with-mysql \
-  || exit 1
+  --with-mysql-incdir=/usr/include/mysql \
+  --with-mysql-libdir=/usr/lib${LIBDIRSUFFIX}/mysql \
+  --with-sqlite3 \
+  --with-sqlite3-dir=/usr/lib${LIBDIRSUFFIX} \
+  --build=$ARCH-slackware-linux \
+  $OPT_ARGS
 
-make docdir=/usr/doc/$PRGNAM-$VERSION || exit 1
-make docdir=/usr/doc/$PRGNAM-$VERSION install-strip DESTDIR=$PKG || exit 1
+make docdir=/usr/doc/$PRGNAM-$VERSION
+make docdir=/usr/doc/$PRGNAM-$VERSION install-strip DESTDIR=$PKG
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a \
@@ -57,4 +76,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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/libraries/libdbi-drivers/libdbi-drivers.info b/libraries/libdbi-drivers/libdbi-drivers.info
index 26142c5edbbfa..bd97cf37d12b4 100644
--- a/libraries/libdbi-drivers/libdbi-drivers.info
+++ b/libraries/libdbi-drivers/libdbi-drivers.info
@@ -1,8 +1,10 @@
 PRGNAM="libdbi-drivers"
-VERSION="0.8.3-1"
+VERSION="0.8.3_1"
 HOMEPAGE="http://libdbi-drivers.sourceforge.net"
 DOWNLOAD="http://downloads.sourceforge.net/libdbi-drivers/libdbi-drivers-0.8.3-1.tar.gz"
 MD5SUM="4de79b323162a5a7652b65b608eca6cd"
-MAINTAINER="Michal Bialozor"
-EMAIL="bialyy@o2.pl"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Vincent Batts"
+EMAIL="vbatts@hashbangbash.com"
 APPROVED="rworkman"
diff --git a/libraries/libdbi-drivers/slack-desc b/libraries/libdbi-drivers/slack-desc
index 3bdd6b8db5bda..a794b2e7343e5 100644
--- a/libraries/libdbi-drivers/slack-desc
+++ b/libraries/libdbi-drivers/slack-desc
@@ -9,10 +9,10 @@
 libdbi-drivers: libdbi-drivers (Database Independent Abstraction Layer for C)
 libdbi-drivers:
 libdbi-drivers: The libdbi-drivers project maintains drivers for the libdbi 
-libdbi-drivers: database abstraction layer written in C. Drivers are 
+libdbi-drivers: database abstraction layer written in C.  Drivers are 
 libdbi-drivers: distributed seperately from the library itself.
 libdbi-drivers:
-libdbi-drivers: It can be obtained from http://libdbi-drivers.sourceforge.net
+libdbi-drivers: Homepage: http://libdbi-drivers.sourceforge.net
 libdbi-drivers:
 libdbi-drivers:
 libdbi-drivers: