1 files changed, 16 insertions, 16 deletions
diff --git a/academic/bibus/bibus.SlackBuild b/academic/bibus/bibus.SlackBuild
index 82f1865117..35f9bff785 100644
--- a/academic/bibus/bibus.SlackBuild
+++ b/academic/bibus/bibus.SlackBuild
@@ -8,7 +8,7 @@
 # Modified by the SlackBuilds.org project
 
 PRGNAM=bibus
-VERSION=${VERSION:-1.4.3.2}
+VERSION=${VERSION:-1.5.1}
 ARCH=${ARCH:-noarch}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -18,8 +18,6 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-SRC_VERSION=${SRC_VERSION:-1.4.3}
-
 set -e 
 
 rm -rf $PKG
@@ -27,7 +25,6 @@ mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
-mv $PRGNAM-$SRC_VERSION $PRGNAM-$VERSION 
 cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
@@ -36,18 +33,21 @@ find . \
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
-#patch the makefile to install to PKGDIR
-patch Makefile < $CWD/Makefile.patch
+# Patch the Makefile to install to PKGDIR
+patch -p1 < $CWD/Makefile.patch
+
+make \
+  PKGDIR=$PKG \
+  DESTDIR=/usr \
+  mandir=/usr/man \
+  sysconfdir=/etc \
+  docdir=/usr/doc/$PRGNAM-$VERSION \
+  oopath=/opt/openoffice.org3/program \
+  ooure=/opt/openoffice.org3/basis-link/ure-link/lib \
+  oobasis=/opt/openoffice.org3/basis-link/program
 
-# Compile the application and install it into the $PKG directory
-make PKGDIR=$PKG \
-DESTDIR=/usr \
-mandir=/usr/man \
-sysconfdir=/etc \
-docdir=/usr/doc/$PRGNAM-$VERSION \
-oopath=/opt/openoffice.org3/program \
-ooure=/opt/openoffice.org3/basis-link/ure-link/lib \
-oobasis=/opt/openoffice.org3/basis-link/program
+# Don't clobber the config file
+mv $PKG/etc/bibus.config $PKG/etc/bibus.config.new
 
 ( cd $PKG/usr/man
   find . -type f -exec gzip -9 {} \;
@@ -63,4 +63,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 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}