office/mdbtools: Updated for version 1.0.0.

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

4 files changed, 63 insertions, 27 deletions

diff --git a/office/mdbtools/README b/office/mdbtools/README
index bd31d8cd3b..cf89f99119 100644
--- a/office/mdbtools/README
+++ b/office/mdbtools/README
@@ -1,4 +1,15 @@
-The MDB Tools project is a effort to document the MDB file format 
-used in Microsoft's Access database package, and to provide a set
-of tools and applications to make that data available on other
+The MDB Tools project is a effort to document the MDB and ACCDB file
+formats used in Microsoft's Access database packages, and to provide
+a set of tools and applications to make that data available on other
 platforms.
+
+NOTE: unixOBDC is an optional dependency.
+By default the script will build a driver for use with unixODBC,
+if it is installed. If a driver for iodbc is preferred instead
+you may set the environment variable UNIXODBC_DRIVER to "no". e.g.
+   UNIXODBC_DRIVER="no" ./mdbtools.SlackBuild
+
+This script includes the debugging tools 'prcat', 'prkkd', 'prtable',
+'prdata' and 'prole', preffixed with "mdb-" (e.g. 'mdb-prtable')
+unless the environment varaible DEBUGGING_TOOLS is set to "no". e.g.
+  DEBUGGING_TOOLS="no" ./mdbtools.SlackBuild
diff --git a/office/mdbtools/mdbtools.SlackBuild b/office/mdbtools/mdbtools.SlackBuild
index fc47fe123d..ff9cdcd8cf 100644
--- a/office/mdbtools/mdbtools.SlackBuild
+++ b/office/mdbtools/mdbtools.SlackBuild
@@ -2,7 +2,8 @@
 
 # Slackware build script for mdbtools
 
-# Copyright 2008  Hans Goossen <goosseno@gmail.com>
+# Copyright 2008  Hans Goossen  <goosseno@gmail.com>
+# Copyright 2022  Juan M. Lasca <juanmlasca@gmail.com>
 
 # All rights reserved.
 #
@@ -26,11 +27,16 @@
 # 20220217 bkw: Modified by SlackBuilds.org:
 # - fix build on 15.0.
 # - remove .la files.
+# 20221804 Modified by Juan M. Lasca:
+# - update to version 1.0.0
+# - include bash completions
+# - add option to build iodbc or unixodbc driver if installed
+# - add option to include debugging tools
 
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=mdbtools
-VERSION=${VERSION:-0.5}
+VERSION=${VERSION:-1.0.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
@@ -76,35 +82,54 @@ 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 {} \;
+
+
+with_odbc="";
+[ -f /usr/lib${LIBDIRSUFFIX}/libiodbc.so ] && [ "${UNIXODBC_DRIVER:-yes}" = "no" ] &&
+    with_odbc="--with-iodbc=/usr";
+[ -f /usr/lib${LIBDIRSUFFIX}/libodbc.so ] && [ "${UNIXODBC_DRIVER:-yes}" != "no" ] &&
+    with_odbc="--with-unixodbc=/usr";
 
-SLKCFLAGS+=" -fcommon"
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --libdir=/usr/lib$LIBDIRSUFFIX \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
   --mandir=/usr/man \
-  --enable-sql \
+  --docdir=/usr/doc/$PRGNAM-$VERSION \
   --enable-static=no \
   --enable-shared=yes \
+  $with_odbc \
+  --with-bash-completion-dir=/usr/share/bash-completion/completions \
   --build=$ARCH-slackware-linux
 
 make
-make install-strip DESTDIR=$PKG
-gzip -9 $PKG/usr/man/man*/*
+make install DESTDIR=$PKG
+
+# Does the user wants the debugging tools?
+if [ "${DEBUGGING_TOOLS:-yes}" != "no" ]; then
+    for i in $( find src/util/.libs/ \! -name "mdb-*" -a -type f -printf "%f\n" ); do
+        mv src/util/.libs/$i $PKG/usr/bin/mdb-$i;
+    done;
+fi;
+
+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
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS COPYING ChangeLog NEWS README TODO HACKING $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING COPYING.LIB NEWS README.md HACKING.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-rm -f $PKG/usr/lib*/*.la
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/office/mdbtools/mdbtools.info b/office/mdbtools/mdbtools.info
index 4ffcce5025..695c2e43f7 100644
--- a/office/mdbtools/mdbtools.info
+++ b/office/mdbtools/mdbtools.info
@@ -1,10 +1,10 @@
 PRGNAM="mdbtools"
-VERSION="0.5"
-HOMEPAGE="http://mdbtools.sourceforge.net/"
-DOWNLOAD="http://prdownloads.sourceforge.net/mdbtools/mdbtools-0.5.tar.gz"
-MD5SUM="4a18bf96e67161101cade64526756d22"
+VERSION="1.0.0"
+HOMEPAGE="https://github.com/mdbtools/mdbtools"
+DOWNLOAD="https://github.com/mdbtools/mdbtools/releases/download/v1.0.0/mdbtools-1.0.0.tar.gz"
+MD5SUM="9925e13cc70f3693c1e358da8ea750e5"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Hans Goossen"
-EMAIL="goosseno@gmail.com"
+MAINTAINER="Juan M. Lasca"
+EMAIL="juanmlasca@gmail.com"
diff --git a/office/mdbtools/slack-desc b/office/mdbtools/slack-desc
index ce8a1b2ca8..b8783c9620 100644
--- a/office/mdbtools/slack-desc
+++ b/office/mdbtools/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
         |-----handy-ruler------------------------------------------------------|
-mdbtools: mdbtools (a suite of libraries and utilities to read MDB files)
+mdbtools: mdbtools (libraries and utilities to read MDB and ACCDB files)
 mdbtools:
-mdbtools: The MDB Tools project is a effort to document the MDB file format
-mdbtools: used in Microsoft's Access database package, and to provide a set
-mdbtools: of tools and applications to make that data available on other
+mdbtools: The MDB Tools project is a effort to document the MDB and ACCDB file
+mdbtools: formats used in Microsoft's Access database packages, and to provide
+mdbtools: a set of tools and applications to make that data available on other
 mdbtools: platforms.
 mdbtools:
+mdbtools: https://github.com/mdbtools/mdbtools
 mdbtools:
-mdbtools: http://mdbtools.sourceforge.net/
 mdbtools:
 mdbtools: