5 files changed, 102 insertions, 31 deletions
diff --git a/libraries/barry/README b/libraries/barry/README
index ee400d4381..4b0eab4fe0 100644
--- a/libraries/barry/README
+++ b/libraries/barry/README
@@ -8,3 +8,5 @@ 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)
+
+This requires libtar and libglademm.
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild
index cc9fa1a78b..d5f0579a12 100644..100755
--- a/libraries/barry/barry.SlackBuild
+++ b/libraries/barry/barry.SlackBuild
@@ -14,11 +14,20 @@
 # Modified by Robby Workman <rworkman@slackbuilds.org>
 
 PRGNAM=barry
-VERSION=0.14
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-2}
+VERSION=0.16
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
+# Automatically determine the architecture we're building on:
+if [ -z "$ARCH" ]; then
+  case "$( uname -m )" in
+    i?86) export ARCH=i486 ;;
+    arm*) export ARCH=arm ;;
+    # Unless $ARCH is already set, use uname -m for all other archs:
+       *) export ARCH=$( uname -m ) ;;
+  esac
+fi
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -50,8 +59,13 @@ elif [ "$ARCH" = "s390" ]; then
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2"
   LIBDIRSUFFIX="64"
+else
+  SLKCFLAGS="-O2"
+  LIBDIRSUFFIX=""
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
@@ -68,43 +82,69 @@ CXXFLAGS="$SLKCFLAGS" \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --mandir=/usr/man \
   --disable-static \
+  --enable-boost \
+  --enable-gui \
   --${opensync_opt}able-opensync-plugin \
   --build=$ARCH-slackware-linux
 
-make || exit 1
-make install DESTDIR=$PKG || exit 1
+make
+make install DESTDIR=$PKG
 
-( cd $PKG
-  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
-    xargs strip --strip-unneeded 2> /dev/null
-)
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
 
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README TODO COPYING AUTHORS NEWS ChangeLog \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+# Install desktop file and icon for gui
+mkdir -p $PKG/usr/share/{applications,pixmaps}
+cat logo/barry_logo_icon.png > $PKG/usr/share/pixmaps/barry.png
+cat $CWD/barrybackup.desktop > $PKG/usr/share/applications/barrybackup.desktop
 
+# Install ppp scripts and such
+mkdir -p $PKG/etc/ppp/peers
+for i in \
+  rogers verizon sprint o2ireland tmobileus att_cingular chinamobile kpn ; \
+do \
+    sed "s%/etc/chatscripts/%/etc/ppp/peers/%g" ppp/barry-$i > \
+        $PKG/etc/ppp/peers/barry-$i ;
+    cat ppp/barry-$i.chat > $PKG/etc/ppp/peers/barry-$i.chat ;
+done
+
+# berry-charge conflicts with barry
+mkdir -p $PKG/etc/modprobe.d
+printf "blacklist berry-charge\n" > $PKG/etc/modprobe.d/barry.conf.new
+
+# Install udev rules
 mkdir -p $PKG/lib/udev/rules.d/
-sed s/SYSFS/ATTR/g udev/10-blackberry.rules > \
-  $PKG/lib/udev/rules.d/10-blackberry.rules
-sed -e s/SYSFS/ATTR/g udev/99-barry-perms > \
-  $PKG/lib/udev/rules.d/99-barry-permissions.rules
-if [ "$BARRY_GROUP" != "barry" ]; then
-  sed -i "s/GROUP=\"barry\""/GROUP=\"$BARRY_GROUP\"/ \
-    $PKG/lib/udev/rules.d/99-barry-permissions.rules
+cat udev/10-blackberry.rules > $PKG/lib/udev/rules.d/10-blackberry.rules
+cat udev/99-blackberry-perms.rules > $PKG/lib/udev/rules.d/99-blackberry-perms.rules
+if [ "$BARRY_GROUP" != "plugdev" ]; then
+  sed -i "s/GROUP=\"plugdev\""/GROUP=\"$BARRY_GROUP\"/ \
+    $PKG/lib/udev/rules.d/99-blackberry-perms.rules
 fi
 
-mkdir -p $PKG/etc/modprobe.d
-echo "blacklist berry-charge" > $PKG/etc/modprobe.d/barry
+# Install hal stuff
+mkdir -p $PKG/usr/share/hal/fdi/information/10freedesktop
+cat hal/fdi/information/10freedesktop/10-blackberry.fdi > \
+    $PKG/usr/share/hal/fdi/information/10freedesktop/10-blackberry.fdi
+mkdir -p $PKG/usr/share/hal/fdi/policy/10osvendor
+cat hal/fdi/policy/10osvendor/19-blackberry-acl.fdi > \
+    $PKG/usr/share/hal/fdi/policy/10osvendor/19-blackberry-acl.fdi
+cp -a hal/hal-blackberry $PKG/usr/bin
+
+# Install bash completion scripts
+mkdir -p $PKG/etc/bash_completion.d
+cat bash/bjavaloader > $PKG/etc/bash_completion.d/bjavaloader
+cat bash/btool > $PKG/etc/bash_completion.d/btool
+
+mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README TODO COPYING AUTHORS NEWS ChangeLog \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 
 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/libraries/barry/barry.info b/libraries/barry/barry.info
index cb6e8b1267..c769cb79f2 100644
--- a/libraries/barry/barry.info
+++ b/libraries/barry/barry.info
@@ -1,10 +1,10 @@
 PRGNAM="barry"
-VERSION="0.14"
+VERSION="0.16"
 HOMEPAGE="http://sourceforge.net/projects/barry/"
-DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.14.tar.bz2"
-MD5SUM="8c93abd0011568b540b799d1faa9a625"
+DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.16.tar.bz2"
+MD5SUM="1f22bbce27702e116902fc199e239878"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
-APPROVED="dsomero"
+APPROVED="rworkman"
diff --git a/libraries/barry/barrybackup.desktop b/libraries/barry/barrybackup.desktop
new file mode 100644
index 0000000000..f9ec78006a
--- /dev/null
+++ b/libraries/barry/barrybackup.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Version=1.0
+Name=Barry Backup
+Comment=Make backups of your BlackBerry databases
+Exec=barrybackup
+Icon=barry
+Terminal=false
+Type=Application
+StartupNotify=true
+Categories=Office;PDA;
diff --git a/libraries/barry/doinst.sh b/libraries/barry/doinst.sh
new file mode 100644
index 0000000000..4fbe19818e
--- /dev/null
+++ b/libraries/barry/doinst.sh
@@ -0,0 +1,19 @@
+config() {
+  NEW="$1"
+  OLD="$(dirname $NEW)/$(basename $NEW .new)"
+  # If there's no config file by that name, mv it over:
+  if [ ! -r $OLD ]; then
+    mv $NEW $OLD
+  elif [ "$(cat $OLD | md5sum)" = "$(cat $NEW | md5sum)" ]; then
+    # toss the redundant copy
+    rm $NEW
+  fi
+  # Otherwise, we leave the .new copy for the admin to consider...
+}
+
+config etc/modprobe.d/barry.conf.new
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+