libraries/barry: Updated for version 0.14

3 files changed, 38 insertions, 18 deletions

diff --git a/libraries/barry/README b/libraries/barry/README
index 722e4db2730ff..ee400d4381ce7 100644
--- a/libraries/barry/README
+++ b/libraries/barry/README
@@ -2,3 +2,9 @@ Barry is a GPL C++ library for interfacing with the RIM BlackBerry
 Handheld. It comes with a command line tool for exploring the device
 and a GUI for making quick backups. This project's goal is to create
 a fully functional syncing mechanism on Linux.
+
+FYI, this slackbuild can take a variable of OPENSYNC (in addition to 
+the standard ARCH, TMP, BUILD, etc.), by default compiling barry with
+opensync is disabled. passing OPENSYNC=<anything that isn't 'no'> will
+compile barry with opensync support, which will require that opensync
+already be installed (libopensync is in the SBo repository as well)
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild
index 142ad54fc812e..3484fda22a0de 100644
--- a/libraries/barry/barry.SlackBuild
+++ b/libraries/barry/barry.SlackBuild
@@ -7,17 +7,30 @@
 ## http://sourceforge.net/projects/barry/
 ##
 ## Written by "Vincent Batts <vbatts@batts.mine.nu>"
+##
+## opensync consideration added thanks
+##   to "Heinz Wiesinger <HMWiesinger@gmx.at>"
 
-VERSION=0.11
+PKGNAME=barry
+VERSION=0.14
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-barry
+PKG=$TMP/package-$PKGNAME
 OUTPUT=${OUTPUT:-/tmp}
 
+# Enable opensync-plugin
+OPENSYNC=${OPENSYNC:-no}
+
+if [ "$OPENSYNC" = "no" ]; then
+  opensync_opt="dis"
+else
+  opensync_opt="en"
+fi
+
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
@@ -31,9 +44,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf barry-$VERSION
-tar xvf $CWD/barry-$VERSION.tar.bz2
-cd barry-$VERSION
+rm -rf $PKGNAME-$VERSION
+tar xvf $CWD/$PKGNAME-$VERSION.tar.bz2
+cd $PKGNAME-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 
@@ -42,7 +55,8 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
-  --build=i486-slackware-linux
+  --${opensync_opt}able-opensync-plugin \
+  --build=$ARCH-slackware-linux
 
 make || exit 1
 make install DESTDIR=$PKG || exit 1
@@ -54,20 +68,20 @@ make install DESTDIR=$PKG || exit 1
 
 gzip -9 $PKG/usr/man/man?/*.?
 
-mkdir -p $PKG/usr/doc/barry-$VERSION
-cp -a README INSTALL TODO COPYING AUTHORS NEWS ChangeLog \
-  $PKG/usr/doc/barry-$VERSION
+mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
+cp -a README TODO COPYING AUTHORS NEWS ChangeLog \
+  $PKG/usr/doc/$PKGNAME-$VERSION
 
 mkdir -p $PKG/etc/udev/rules.d/
-cp -a udev/10-blackberry.rules udev/99-barry-perms \
+cp -a udev/10-blackberry.rules udev/99-$PKGNAME-perms \
   $PKG/etc/udev/rules.d/
 
 mkdir -p $PKG/etc/modprobe.d
-echo "blacklist berry-charge" > $PKG/etc/modprobe.d/barry.new
+echo "blacklist berry-charge" > $PKG/etc/modprobe.d/$PKGNAME.new
 
 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/barry-$VERSION-$ARCH-$BUILD$TAG.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PKGNAME-$VERSION-$ARCH-${BUILD}${TAG}.tgz
diff --git a/libraries/barry/barry.info b/libraries/barry/barry.info
index c220ccab9f0ba..d3b0e38464296 100644
--- a/libraries/barry/barry.info
+++ b/libraries/barry/barry.info
@@ -1,8 +1,8 @@
 PRGNAM="barry"
-VERSION="0.11"
+VERSION="0.14"
 HOMEPAGE="http://sourceforge.net/projects/barry/"
-DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.11.tar.bz2"
-MD5SUM="a42db74aa7f900958d5d2a527b55f50c"
+DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.14.tar.bz2"
+MD5SUM="8c93abd0011568b540b799d1faa9a625"
 MAINTAINER="Vincent Batts"
-EMAIL="vbatts@batts.mine.nu"
-APPROVED="rworkman"
+EMAIL="vbatts@hashbangbash.com"
+APPROVED="dsomero"