5 files changed, 73 insertions, 42 deletions
diff --git a/multimedia/k9copy/README b/multimedia/k9copy/README
index 25e856aa501b4..4b4048c45166a 100644
--- a/multimedia/k9copy/README
+++ b/multimedia/k9copy/README
@@ -1,7 +1,7 @@
-k9copy is DVD backup utility which allow the copy of one or more
-titles from a DVD9 to a DVD5. The DVD video stream is compressed
-by the program Vamps.
+k9copy is DVD backup utility which allows the copy of one or more
+titles from a DVD9 to a DVD5.
 
-K9Copy requires DVDAuthor, libdvdnav, and mencoder/mplayer;
-all of these are available at SlackBuilds.org.
-NOTE: mencoder is part of mplayer.
+This requires libmpeg2 and ffmpeg to build.
+
+Additional (optional) runtime deps are libdvdcss (for DVD Backup action)
+and mjpegtools and twolame (for DVD Author action).
diff --git a/multimedia/k9copy/doinst.sh b/multimedia/k9copy/doinst.sh
new file mode 100644
index 0000000000000..1f8ff67dedb29
--- /dev/null
+++ b/multimedia/k9copy/doinst.sh
@@ -0,0 +1,10 @@
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
+fi
+
+if [ -e usr/share/icons/hicolor/icon-theme.cache ]; then
+  if [ -x /usr/bin/gtk-update-icon-cache ]; then
+    /usr/bin/gtk-update-icon-cache usr/share/icons/hicolor >/dev/null 2>&1
+  fi
+fi
+
diff --git a/multimedia/k9copy/k9copy.SlackBuild b/multimedia/k9copy/k9copy.SlackBuild
index 5f9ad08f91247..dc63eaf928470 100644
--- a/multimedia/k9copy/k9copy.SlackBuild
+++ b/multimedia/k9copy/k9copy.SlackBuild
@@ -22,56 +22,75 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-if [ "$(id -u)" != "0" ]; then
-    echo "This script must be run as root!"
-    exit 1
-fi
+# Modified by Roberto Neri <rneri@libero.it> for version 2 (KDE 4)
+# Project Homepage: http://k9copy.sourceforge.net/
 
 PRGNAM=k9copy
-VERSION=1.1.1.3
-SRCDIR=1.1.1-3
+VERSION=${VERSION:-2.3.5}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-PDOCS="AUTHORS ChangeLog COPYING INSTALL NEWS README TODO"
-
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  LIBDIRSUFFIX=""
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  LIBDIRSUFFIX=""
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
+  LIBDIRSUFFIX="64"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $PRGNAM-$SRCDIR
-tar -xzvf $CWD/$PRGNAM-$SRCDIR.tar.gz || exit 1
-cd $PRGNAM-$SRCDIR
+rm -rf $PRGNAM-$VERSION-Source
+tar xvf $CWD/$PRGNAM-$VERSION-Source.tar.gz
+cd $PRGNAM-$VERSION-Source
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-KDEPREF=$(kde-config --prefix) || true
+find . \
+ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
+ -exec chmod 755 {} \; -o \
+ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
+ -exec chmod 644 {} \;
 
-CFLAGS="$SLKCFLAGS" \
-CXXFLAGS="$SLKCFLAGS" \
-./configure \
-  --prefix=$KDEPREF \
-  || exit 1
+mkdir build
+cd build
+  cmake \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+  make
+  make install DESTDIR=$PKG
+cd ..
 
-make || exit 1
-make install-strip DESTDIR=$PKG || exit 1
+( cd $PKG
+  find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+  find . | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | \
+    xargs strip --strip-unneeded 2> /dev/null || true
+)
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a $PDOCS $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
+cat $CWD/doinst.sh > $PKG/install/doinst.sh
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 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/multimedia/k9copy/k9copy.info b/multimedia/k9copy/k9copy.info
index 5a504742b1e8b..28a36fe1c69f4 100644
--- a/multimedia/k9copy/k9copy.info
+++ b/multimedia/k9copy/k9copy.info
@@ -1,8 +1,10 @@
 PRGNAM="k9copy"
-VERSION="1.1.1.3"
+VERSION="2.3.5"
 HOMEPAGE="http://k9copy.sourceforge.net/"
-DOWNLOAD="http://downloads.sourceforge.net/k9copy/k9copy-1.1.1-3.tar.gz"
-MD5SUM="5b868bf5e0509ecc399c7b18cb2d7a6d"
-MAINTAINER="Brian Reichert"
-EMAIL="rignes@pobox.com"
-APPROVED="BP{k}"
+DOWNLOAD="http://downloads.sourceforge.net/k9copy/k9copy-2.3.5-Source.tar.gz"
+MD5SUM="808382988bc87c58d7149da97637e57d"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
+MAINTAINER="Roberto Neri"
+EMAIL="rneri@libero.it"
+APPROVED="dsomero"
diff --git a/multimedia/k9copy/slack-desc b/multimedia/k9copy/slack-desc
index 1107147492a2d..a16482e4d7354 100644
--- a/multimedia/k9copy/slack-desc
+++ b/multimedia/k9copy/slack-desc
@@ -6,14 +6,14 @@
 # leave one space after the ':'.
 
       |-----handy-ruler------------------------------------------------------|
-k9copy: k9copy (A Linux DVD Shring)
+k9copy: k9copy (a Linux DVD shrink)
+k9copy:
+k9copy: K9Copy is a small utility which allows copying DVDs on Linux.
+k9copy:
+k9copy: Homepage: http://k9copy.sourceforge.net/
+k9copy:
+k9copy:
 k9copy:
-k9copy: k9copy is DVD backup utility which allow the copy of one or more
-k9copy: titles from a DVD9 to a DVD5. The DVD video stream is compressed
-k9copy: by the program Vamps.
 k9copy:
-k9copy: 
 k9copy:
 k9copy:
-k9copy: Homepage: http://k9copy.sourceforge.net/
-k9copy: