2 files changed, 42 insertions, 31 deletions
diff --git a/system/smbldap-tools/smbldap-tools.SlackBuild b/system/smbldap-tools/smbldap-tools.SlackBuild
index e3e2fb8747252..bfe3736893b81 100644
--- a/system/smbldap-tools/smbldap-tools.SlackBuild
+++ b/system/smbldap-tools/smbldap-tools.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for smbldap-tools
 
-# Copyright (c) 2009  Chris Walker <kris240376@gmail.com> 
+# Copyright (c) 2009-2011  Chris Walker <kris240376@gmail.com> 
 # All rights reserved.
 # 
 # Redistribution and use in source and binary forms, with or without
@@ -32,11 +32,12 @@
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=smbldap-tools
-VERSION=0.9.5
-ARCH=noarch
-BUILD=${BUILD:-2}
+VERSION=0.9.7
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+ARCH=noarch
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -47,43 +48,53 @@ set -e
 rm -rf $TMP/$PRGNAM-$VERSION $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-tar xvf $CWD/$PRGNAM-$VERSION.tgz
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .   
 
-# Install openldap and samba config examples
-mkdir -p $PKG/etc/{openldap,samba}
-cat doc/slapd.conf > $PKG/etc/openldap/slapd.conf-smbldap-tools
-cat doc/smb.conf > $PKG/etc/samba/smb.conf-smbldap-tools
+PERLDIR=$(perl -V:installvendorlib | cut -d\' -f2)
+
+./configure \
+  --prefix=/usr \
+  --localstatedir=/var \
+  --sysconfdir=/etc \
+  --mandir=/usr/man \
+  --with-perl-libdir=$PERLDIR
+
+make
+make DESTDIR=$PKG install
 
 # Install smbldap-tools config files
 mkdir -p $PKG/etc/smbldap-tools
-cp -a configure.pl $PKG/etc/smbldap-tools
 cat smbldap.conf > $PKG/etc/smbldap-tools/smbldap.conf.new
 cat smbldap_bind.conf > $PKG/etc/smbldap-tools/smbldap_bind.conf.new
 
-# Install scripts
-mkdir -p $PKG/usr/sbin
-cp -a \
-  smbldap-groupadd smbldap-groupdel smbldap-groupmod smbldap-groupshow \
-  smbldap-passwd smbldap-populate smbldap-useradd smbldap-userdel \
-  smbldap-userinfo smbldap-userlist smbldap-usermod smbldap-usershow \
-  smbldap_tools.pm doc/migration_scripts/smbldap-migrate-pwdump-accounts \
-  doc/migration_scripts/smbldap-migrate-pwdump-groups \
-  doc/migration_scripts/smbldap-migrate-unix-accounts \
-  doc/migration_scripts/smbldap-migrate-unix-groups \
-  $PKG/usr/sbin
-
-mkdir -p $PKG/install
-cat $CWD/slack-desc > $PKG/install/slack-desc 
-cat $CWD/doinst.sh > $PKG/install/doinst.sh
+# Install man pages
+mkdir -p $PKG/usr/man/man8
+install -o root -g root -m 644 *.8 $PKG/usr/man/man8
+find $PKG/usr/man -type f -exec gzip -9 {} \;
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a \
+install -o root -g root -m 644 \
   CONTRIBUTORS COPYING ChangeLog FILES INFRA INSTALL README TODO \
-  doc/smbldap-tools.pdf doc/smbldap-tools.html \
+  doc/smbldap-tools.pdf doc/smbldap-tools.html $CWD/$PRGNAM.SlackBuild \
   $PKG/usr/doc/$PRGNAM-$VERSION
 
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/conf
+install -o root -g root -m 644 \
+  doc/slapd.conf.example doc/smb.conf.example doc/smb.conf.tmpl \
+  doc/smb.smbldap.conf.example doc/smb.smbldap.conf.tmpl \
+  $PKG/usr/doc/$PRGNAM-$VERSION/conf
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION/migration_scripts
+install -o root -g root -m 755 \
+  doc/migration_scripts/* \
+  $PKG/usr/doc/$PRGNAM-$VERSION/migration_scripts
+
+mkdir -p $PKG/install
+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.${PKGTYPE:-tgz}
diff --git a/system/smbldap-tools/smbldap-tools.info b/system/smbldap-tools/smbldap-tools.info
index ee27c449a31f5..060fd1865ab36 100644
--- a/system/smbldap-tools/smbldap-tools.info
+++ b/system/smbldap-tools/smbldap-tools.info
@@ -1,8 +1,8 @@
 PRGNAM="smbldap-tools"
-VERSION="0.9.5"
-HOMEPAGE="http://freshmeat.net/projects/smbldap-tools/"
-DOWNLOAD="http://freshmeat.net/urls/af7cbdd717205137623080a133362b0e"
-MD5SUM="2a9a84c657af35b9c9734a5b1bc5fe8f"
+VERSION="0.9.7"
+HOMEPAGE="https://gna.org/projects/smbldap-tools/"
+DOWNLOAD="http://download.gna.org/smbldap-tools/sources/0.9.7/smbldap-tools-0.9.7.tar.gz"
+MD5SUM="d9f169a77b527672778e4307091bec36"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Christopher Walker"