network/kmldonkey: Updated for version 0.10.1

6 files changed, 67 insertions, 10 deletions

diff --git a/network/kmldonkey/README b/network/kmldonkey/README
index 031ea07cb90f..1b74d06e484b 100644
--- a/network/kmldonkey/README
+++ b/network/kmldonkey/README
@@ -1,2 +1,3 @@
 KMLDonkey is an advanced GUI frontend for the MLDonkey P2P core.
+
 KMLDonkey needs mldonkey (there's a script for it at SlackBuilds.org)
diff --git a/network/kmldonkey/doinst.sh b/network/kmldonkey/doinst.sh
index 720a11ee901e..e0ce2dabffec 100644
--- a/network/kmldonkey/doinst.sh
+++ b/network/kmldonkey/doinst.sh
@@ -7,4 +7,4 @@
 ( if [ -x usr/bin/update-mime-database ]; then
     usr/bin/update-mime-database usr/share/mime >/dev/null 2>&1
   fi
-)                                                                                                              
+)
diff --git a/network/kmldonkey/kmldonkey-0.10.1-failed-dialog-189334.diff b/network/kmldonkey/kmldonkey-0.10.1-failed-dialog-189334.diff
new file mode 100644
index 000000000000..c983ce08a587
--- /dev/null
+++ b/network/kmldonkey/kmldonkey-0.10.1-failed-dialog-189334.diff
@@ -0,0 +1,12 @@
+diff -Naur kmldonkey-0.10.1.orig/src/scripts/submit.cpp kmldonkey-0.10.1/src/scripts/submit.cpp
+--- kmldonkey-0.10.1.orig/src/scripts/submit.cpp	2005-07-26 18:40:40.000000000 +0200
++++ kmldonkey-0.10.1/src/scripts/submit.cpp	2007-09-02 23:36:00.000000000 +0200
+@@ -48,7 +48,7 @@
+ {
+     kdDebug() << "Callback cmd: " << cmd << endl;
+     kdDebug() << "Callback result: " << res << endl;
+-    if (res.lower() != "done" && !res.contains("parsing http url", false)) {
++    if (!res.contains("Added link", false)) {
+ 	/*
+ 	if (res.contains("force_download")) {
+ 	    if (KMessageBox::warningYesNo(0, i18n("Failed to submit URL %1\n\nForce download?")
diff --git a/network/kmldonkey/kmldonkey.SlackBuild b/network/kmldonkey/kmldonkey.SlackBuild
index fec77964594b..e1ba072ba28f 100644
--- a/network/kmldonkey/kmldonkey.SlackBuild
+++ b/network/kmldonkey/kmldonkey.SlackBuild
@@ -1,15 +1,32 @@
 #!/bin/sh
 
 # Slackware build script for kmldonkey
-# Written by core (eroc@linuxmail.org)
 
-set -e
+# Copyright (c) 2008, Antonio Hernández Blas <hba.nihilismus@gmail.com>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 1.- Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY
+# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+# DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
+# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kmldonkey
 VERSION=0.10.1
 ARCH=${ARCH:-i486}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+
 CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
@@ -19,22 +36,39 @@ if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
   SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
+set -e
+
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar -xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
-chown -R root:root . || true
-chmod -R u+w,go+r-w,a-s .
+chown -R root:root .
+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 {} \;
+
+# Bug: "kmldonkey brings up failed dialog unecessarily":
+# http://bugs.gentoo.org/show_bug.cgi?id=189334
+# BTW, kmldonkey is still under development:
+# http://www.kdedevelopers.org/node/2989
+cat $CWD/kmldonkey-0.10.1-failed-dialog-189334.diff | patch -p1
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
-  --enable-shared=yes
+  --enable-shared=yes \
+  --enable-static=no \
+  --build=$ARCH-slackware-linux \
+  --host=$ARCH-slackware-linux
 
 make
 make install DESTDIR=$PKG
@@ -52,6 +86,9 @@ make install DESTDIR=$PKG
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS ChangeLog COPYING INSTALL README TODO \
    $PKG/usr/doc/$PRGNAM-$VERSION
+mv $PKG/usr/share/doc/HTML $PKG/usr/doc
+rmdir $PKG/usr/share/doc
+
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/network/kmldonkey/kmldonkey.info b/network/kmldonkey/kmldonkey.info
index 9ed9979284f1..2eb993d45bcb 100644
--- a/network/kmldonkey/kmldonkey.info
+++ b/network/kmldonkey/kmldonkey.info
@@ -3,6 +3,6 @@ VERSION="0.10.1"
 HOMEPAGE="http://www.kmldonkey.org"
 DOWNLOAD="http://download.savannah.gnu.org/releases/kmldonkey/kmldonkey-0.10.1.tar.bz2"
 MD5SUM="e1932b1455c7a5cec53145b675bdd8d7"
-MAINTAINER="core"
-EMAIL="eroc@linuxmail.org"
-APPROVED="rworkman"
+MAINTAINER="Antonio Hernández Blas"
+EMAIL="hba.nihilismus@gmail.com"
+APPROVED="David Somero"
diff --git a/network/kmldonkey/slack-desc b/network/kmldonkey/slack-desc
index 29c1ee213bf6..b0d8a1a5aa8c 100644
--- a/network/kmldonkey/slack-desc
+++ b/network/kmldonkey/slack-desc
@@ -1,3 +1,10 @@
+# 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--------------------------------------------------|
 kmldonkey: KMLDonkey (A KDE frontend for MLDonkey)
 kmldonkey: