libraries/barry: Updated for version 0.17.1.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>

4 files changed, 15 insertions, 31 deletions

diff --git a/libraries/barry/README b/libraries/barry/README
index 4b0eab4fe0..45e51f7778 100644
--- a/libraries/barry/README
+++ b/libraries/barry/README
@@ -9,4 +9,5 @@ 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.
+This requires libsigc++, cairomm, glibmm, pangomm, atkmm, mm-common,
+gtkmm, libglademm and libtar (probably in that order :^)
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild
index ac0ae69d42..12ad5e2ce5 100644
--- a/libraries/barry/barry.SlackBuild
+++ b/libraries/barry/barry.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh -e
+#!/bin/sh
 
 ## Barry is a GPL C++ library for interfacing with the RIM BlackBerry
 ## Handheld. It comes with a command line tool for exploring the device
@@ -12,18 +12,17 @@
 ##   to "Heinz Wiesinger <HMWiesinger@gmx.at>"
 
 # Modified by Robby Workman <rworkman@slackbuilds.org>
+# Updated by mario <mario@slackverse.org>
 
 PRGNAM=barry
-VERSION=0.16
+VERSION=${VERSION:-0.17.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
-# Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
     i?86) ARCH=i486 ;;
     arm*) ARCH=arm ;;
-    # Unless $ARCH is already set, use uname -m for all other archs:
        *) ARCH=$( uname -m ) ;;
   esac
 fi
@@ -41,11 +40,10 @@ BARRY_GROUP=${BARRY_GROUP:-plugdev}
 # Enable opensync-plugin?
 OPENSYNC=${OPENSYNC:-no}
 
-if [ "$OPENSYNC" = "no" ]; then
-  opensync_opt="dis"
-else
-  opensync_opt="en"
-fi
+case "$OPENSYNC" in
+  no) opensync_opt="dis" ;;
+   *) opensync_opt="en" ;;
+esac
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -113,7 +111,7 @@ done
 
 # berry-charge conflicts with barry
 mkdir -p $PKG/etc/modprobe.d
-printf "blacklist berry-charge\n" > $PKG/etc/modprobe.d/barry.conf.new
+printf "blacklist berry-charge\n" > $PKG/etc/modprobe.d/barry.conf
 
 # Install udev rules
 mkdir -p $PKG/lib/udev/rules.d/
diff --git a/libraries/barry/barry.info b/libraries/barry/barry.info
index c769cb79f2..b3d1c69e0a 100644
--- a/libraries/barry/barry.info
+++ b/libraries/barry/barry.info
@@ -1,10 +1,10 @@
 PRGNAM="barry"
-VERSION="0.16"
+VERSION="0.17.1"
 HOMEPAGE="http://sourceforge.net/projects/barry/"
-DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.16.tar.bz2"
-MD5SUM="1f22bbce27702e116902fc199e239878"
+DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.17.1.tar.bz2"
+MD5SUM="645b2816c79584ac36f63ce69dbbfd24"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
-MAINTAINER="Vincent Batts"
-EMAIL="vbatts@hashbangbash.com"
+MAINTAINER="mario"
+EMAIL="mario@slackverse.org"
 APPROVED="rworkman"
diff --git a/libraries/barry/doinst.sh b/libraries/barry/doinst.sh
index 4fbe19818e..4e8ba7071d 100644
--- a/libraries/barry/doinst.sh
+++ b/libraries/barry/doinst.sh
@@ -1,18 +1,3 @@
-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