3 files changed, 34 insertions, 34 deletions
diff --git a/libraries/barry/barry.SlackBuild b/libraries/barry/barry.SlackBuild
index 3484fda22a0d..451e985cc004 100644
--- a/libraries/barry/barry.SlackBuild
+++ b/libraries/barry/barry.SlackBuild
@@ -11,18 +11,25 @@
 ## opensync consideration added thanks
 ##   to "Heinz Wiesinger <HMWiesinger@gmx.at>"
 
-PKGNAME=barry
+# Modified by Robby Workman <rworkman@slackbuilds.org>
+
+PRGNAM=barry
 VERSION=0.14
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
-PKG=$TMP/package-$PKGNAME
+PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-# Enable opensync-plugin
+# If you want to use a group other than "plugdev" for barry,
+# specify it on the command line as BARRY_GROUP - for example:
+#   BARRY_GROUP=barry ./barry.SlackBuild
+BARRY_GROUP=${BARRY_GROUP:-plugdev}
+
+# Enable opensync-plugin?
 OPENSYNC=${OPENSYNC:-no}
 
 if [ "$OPENSYNC" = "no" ]; then
@@ -44,9 +51,9 @@ fi
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PKGNAME-$VERSION
-tar xvf $CWD/$PKGNAME-$VERSION.tar.bz2
-cd $PKGNAME-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
+cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R a-s,u+rw,go+r-w .
 
@@ -55,6 +62,7 @@ CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --mandir=/usr/man \
+  --disable-static \
   --${opensync_opt}able-opensync-plugin \
   --build=$ARCH-slackware-linux
 
@@ -66,22 +74,30 @@ make install DESTDIR=$PKG || exit 1
   find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
 )
 
-gzip -9 $PKG/usr/man/man?/*.?
+( 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
+)
 
-mkdir -p $PKG/usr/doc/$PKGNAME-$VERSION
+mkdir -p $PKG/usr/doc/$PRGNAM-$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-$PKGNAME-perms \
-  $PKG/etc/udev/rules.d/
+  $PKG/usr/doc/$PRGNAM-$VERSION
+
+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
+fi
 
 mkdir -p $PKG/etc/modprobe.d
-echo "blacklist berry-charge" > $PKG/etc/modprobe.d/$PKGNAME.new
+echo "blacklist berry-charge" > $PKG/etc/modprobe.d/barry
 
 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/$PKGNAME-$VERSION-$ARCH-${BUILD}${TAG}.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-${BUILD}${TAG}.tgz
diff --git a/libraries/barry/barry.info b/libraries/barry/barry.info
index d3b0e3846429..d7e317f7984f 100644
--- a/libraries/barry/barry.info
+++ b/libraries/barry/barry.info
@@ -5,4 +5,4 @@ DOWNLOAD="http://downloads.sourceforge.net/barry/barry-0.14.tar.bz2"
 MD5SUM="8c93abd0011568b540b799d1faa9a625"
 MAINTAINER="Vincent Batts"
 EMAIL="vbatts@hashbangbash.com"
-APPROVED="dsomero"
+APPROVED="David Somero"
diff --git a/libraries/barry/doinst.sh b/libraries/barry/doinst.sh
deleted file mode 100644
index f1bc12fcd38f..000000000000
--- a/libraries/barry/doinst.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-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.new
-