4 files changed, 25 insertions, 18 deletions
diff --git a/libraries/libkipi/README b/libraries/libkipi/README
index 35a52e249f..237d99337e 100644
--- a/libraries/libkipi/README
+++ b/libraries/libkipi/README
@@ -3,4 +3,3 @@ for digiKam, KimDaBa, ShowImg, and Gwenview. Its aim is
 to share image plugins among graphic applications. Kipi
 is based on the old digiKam plugins implementation and
 is maintained by the digiKam team.
-
diff --git a/libraries/libkipi/libkipi.SlackBuild b/libraries/libkipi/libkipi.SlackBuild
index d09b310fd5..9f4a8cc9d3 100644
--- a/libraries/libkipi/libkipi.SlackBuild
+++ b/libraries/libkipi/libkipi.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for libKipi
 
-# Copyright 2007  MagicMan <MagicMan07@bluebottle.com>
+# Copyright 2007  Frank Caraballo <fecaraballo{at}gmail{dot}com>
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,23 +22,18 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-# Modified by the SlackBuilds.org project
-
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
-
 PRGNAM=libkipi
 VERSION=0.1.5
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
-CWD=`pwd`
+CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
+KDEPREF=$(kde-config --prefix)
+
 PDOCS="AUTHORS ChangeLog COPYING INSTALL NEWS PACKAGING README RELEASE.rev TODO"
 
 if [ "$ARCH" = "i486" ]; then
@@ -51,17 +46,22 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP || exit 1
 rm -rf $PRGNAM-$VERSION
-tar -xvf $CWD/$PRGNAM-$VERSION.tar.* || exit 1
+tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2 || exit 1
 cd $PRGNAM-$VERSION || exit 1
-
 chown -R root:root .
 chmod -R u+w,go+r-w,a-s .
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
+  --prefix=$KDEPREF \
   --sysconfdir=/etc \
   --localstatedir=/var \
+  --program-prefix="" \
+  --program-suffix="" \
+  --disable-debug \
+  --enable-shared=yes \
+  --enable-static=no \
   || exit 1
 
 make || exit 1
@@ -70,11 +70,11 @@ make install-strip DESTDIR=$PKG || exit 1
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-# Remove empty doc directory structure:
-rm -rf $PKG/opt/kde/share/doc
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
+find $PKG -type d -depth -exec rmdir {} \; 2>/dev/null
+
 cd $PKG
 /sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz
diff --git a/libraries/libkipi/libkipi.info b/libraries/libkipi/libkipi.info
index 144b22cbca..1eb156c77d 100644
--- a/libraries/libkipi/libkipi.info
+++ b/libraries/libkipi/libkipi.info
@@ -1,8 +1,8 @@
 PRGNAM="libkipi"
 VERSION="0.1.5"
 HOMEPAGE="http://extragear.kde.org/apps/kipi/"
-DOWNLOAD="http://dl.sourceforge.net/kipi/libkipi-0.1.5.tar.bz2"
+DOWNLOAD="http://downloads.sourceforge.net/kipi/libkipi-0.1.5.tar.bz2"
 MD5SUM="aef790871583444cd81bd9dea9c3fd0b"
-MAINTAINER="MagicMan"
-EMAIL="MagicMan07@bluebottle.com"
-APPROVED="robw810"
+MAINTAINER="Frank Caraballo"
+EMAIL="fecaraballo{at}gmail{dot}com"
+APPROVED="rworkman"
diff --git a/libraries/libkipi/slack-desc b/libraries/libkipi/slack-desc
index a0ef532929..7bd2964825 100644
--- a/libraries/libkipi/slack-desc
+++ b/libraries/libkipi/slack-desc
@@ -1,3 +1,11 @@
+# HOW TO EDIT THIS FILE:
+# The "handy ruler" below makes it easier to edit a package description.  Line
+# up the first '|' above the ':' following the base package name, and the '|'
+# on the right side marks the last column you can put a character in.  You must
+# make exactly 11 lines for the formatting to be correct.  It's also
+# customary to leave one space after the ':'.
+
+      |-----handy-ruler------------------------------------------------------|
 libkipi: libKipi (KDE Image Plugin Interface)
 libkipi:
 libkipi: Kipi is an effort to develop a common plugin structure