4 files changed, 34 insertions, 26 deletions
diff --git a/system/ivman/README b/system/ivman/README
index 72d8e7efcf25f..8c804a58376d9 100644
--- a/system/ivman/README
+++ b/system/ivman/README
@@ -4,22 +4,19 @@ occur or properties are modified on your hardware (e.g., run a command
 when you close your laptop's lid, run a command when a particular
 device is attached or a particular CD is inserted, etc).
 
-ivman allows you to have automount feature even if you don't use a 
-volume manager like KDE, GNOME, or XFCE includes. Just run ivman in
-background, and if you're not root, be sure to also install pmount
-that allows you to mount without being root and having the devices
-listed on /etc/fstab.
+ivman allows you to have automount feature even if you don't use a volume 
+manager like KDE, GNOME, or XFCE includes. Just run ivman in the background, 
+and if you're not root, be sure to also install pmount, which allows you to 
+mount without being root and having the devices listed on /etc/fstab.
 
 NOTE FROM SUBMITTER:
-I've discovered a bug (possibly known) in ivman with pumount usage,
-since ivman doesn't have maintainer right now and I don't know where
-to report it, I'll explain here how to easily solve it.
-Note that this happens when using pumount as non-root; I haven't
-tried using ivman as root.
-It seems that when you remove a USB device without pumounting it
-(which ivman should care of), ivman locks the device when calling
-pumount. 
-This can be easily fixed by correcting your ivman's config files.
-Set in $HOME/.ivman/IvmConfigBase.xml:
+I've discovered a bug (possibly known) in ivman with pumount usage; since 
+ivman doesn't have maintainer right now and I don't know where to report it, 
+I'll explain here how to easily solve it.  Note that this happens when using 
+pumount as non-root; I haven't tried using ivman as root.
+It seems that when you remove a USB device without pumounting it (which ivman 
+should take care of), ivman locks the device when calling pumount.  This can
+be easily fixed by correcting your ivman's config files.
+Set in ~/.ivman/IvmConfigBase.xml:
 <ivm:Option name="mountcommand" value="pmount-hal '$hal.info.udi$'" />
 <ivm:Option name="umountcommand" value="pumount -l '$hal.block.device$'" />
diff --git a/system/ivman/doinst.sh b/system/ivman/doinst.sh
index 6a0871c4dc64f..817148292ac9a 100644
--- a/system/ivman/doinst.sh
+++ b/system/ivman/doinst.sh
@@ -1,5 +1,3 @@
-#!/bin/sh
-
 config() {
   NEW="$1"
   OLD="$(dirname $NEW)/$(basename $NEW .new)"
diff --git a/system/ivman/ivman.SlackBuild b/system/ivman/ivman.SlackBuild
index cca64e70d7f6d..828e97c344e96 100644
--- a/system/ivman/ivman.SlackBuild
+++ b/system/ivman/ivman.SlackBuild
@@ -25,13 +25,12 @@
 # Modified by Robby Workman  <http://rlworkman.net>
 # No additional license terms added.
 
-set -e
-
 PRGNAM=ivman
 VERSION=0.6.14
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -39,15 +38,22 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "i686" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar -xjvf $CWD/$PRGNAM-$VERSION.tar.bz2
+tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
@@ -56,9 +62,11 @@ CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
+  --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --localstatedir=/var \
-  --mandir=/usr/man
+  --mandir=/usr/man \
+  --build=$ARCH-slackware-linux
 
 make
 make install-strip DESTDIR=$PKG
@@ -71,8 +79,10 @@ make install-strip 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 . | 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
 )
 
 ( cd $PKG/usr/man
@@ -81,8 +91,9 @@ make install-strip DESTDIR=$PKG
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a AUTHORS INSTALL COPYING.GPL2 ABOUT-NLS COPYING ChangeLog NEWS TODO \
-  COPYING.QPL README $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a \
+  AUTHORS INSTALL COPYING* ChangeLog NEWS TODO README \
+    $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
@@ -90,4 +101,4 @@ 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.tgz
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
diff --git a/system/ivman/ivman.info b/system/ivman/ivman.info
index 52e6cf16b85af..fe5d3844ad8e2 100644
--- a/system/ivman/ivman.info
+++ b/system/ivman/ivman.info
@@ -3,6 +3,8 @@ VERSION="0.6.14"
 HOMEPAGE="http://ivman.sourceforge.net/"
 DOWNLOAD="http://downloads.sourceforge.net/ivman/ivman-0.6.14.tar.bz2"
 MD5SUM="ebef12559268e2c5ea932cbb5aaa789e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Guillermo Bonvehi"
 EMAIL="gbonvehi@gmail.com"
 APPROVED="rworkman"