development/kdesvn: Updated for version 1.0.4

4 files changed, 45 insertions, 38 deletions

diff --git a/development/kdesvn/README b/development/kdesvn/README
index 88fb592aed..251c95fc55 100644
--- a/development/kdesvn/README
+++ b/development/kdesvn/README
@@ -1,7 +1,9 @@
-kdesvn is client for subversion. It uses native KDE API instead of a 
-extra lib like GAMBAS and it is using the native subversion 
-delevelopment API instead of just parsing the output of the 
-commandline tool like most other clients do.
+kdesvn is a kde client for subversion. It uses native KDE API instead of 
+an extra lib like GAMBAS, and it is using the native subversion 
+development API instead of parsing the output of the commandline tool 
+like most other clients do.
 
 It tries to setup a look and feel like the standard filemanager of
 KDE and is integrated into it via KPart.
+
+kdesvn requires sqlite, which is also available from SlackBuilds.org.
diff --git a/development/kdesvn/doinst.sh b/development/kdesvn/doinst.sh
index 55d469fb0d..abca0bed02 100644
--- a/development/kdesvn/doinst.sh
+++ b/development/kdesvn/doinst.sh
@@ -1,4 +1,4 @@
-if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q usr/share/applications
+if [ -x /usr/bin/update-desktop-database ]; then
+    /usr/bin/update-desktop-database -q usr/share/applications
 fi
-  
\ No newline at end of file
+  
diff --git a/development/kdesvn/kdesvn.SlackBuild b/development/kdesvn/kdesvn.SlackBuild
index ace37b13d3..fe345f25ab 100644
--- a/development/kdesvn/kdesvn.SlackBuild
+++ b/development/kdesvn/kdesvn.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for kdesvn
 
-# Copyright  2007 Michiel van Wessem (http://michielvwessem.wordpress.com)
+# Copyright 2007-2008  Michiel van Wessem, Manchester, United Kingdom
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,7 +23,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=kdesvn
-VERSION=0.14.2
+VERSION=${VERSION:-1.0.4}
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -33,12 +33,12 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-DOCFILES="AUTHORS COPYING* ChangeLog GPL.txt INSTALL-cmake NEWS README TODO*"
-
 if [ "$ARCH" = "i486" ]; then
-    SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
 elif [ "$ARCH" = "i686" ]; then
-    SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+elif [ "$ARCH" = "x86_64" ]; then
+  SLKCFLAGS="-O2 -fPIC"
 fi
 
 set -e
@@ -50,33 +50,37 @@ rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tar.bz2
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
-
-cmake \
- -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
- -DCMAKE_INSTALL_PREFIX=/usr .
-
-make VERBOSE=1
-make install VERBOSE=1 DESTDIR=$PKG
-
-( 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
-)
-
-( cd $PKG/usr/
-  mv share/man .
-  mv share/doc .
-)
-
+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 {} \;
+
+mkdir build 
+cd build
+  cmake \
+   -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+   -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+   -DCMAKE_INSTALL_PREFIX=/usr \
+   -DMAN_INSTALL_DIR=/usr/man \
+   ..
+  make VERBOSE=1
+  make install VERBOSE=1 DESTDIR=$PKG
+cd -
+
+find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
+  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
+
+# mandir setting above seems ignored
+mv $PKG/usr/share/man $PKG/usr
 ( 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/$PRGNAM-$VERSION
-cp -a $DOCFILES $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a AUTHORS COPYING* ChangeLog GPL.txt INSTALL-cmake NEWS README TODO* \
+  $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install
diff --git a/development/kdesvn/kdesvn.info b/development/kdesvn/kdesvn.info
index 94a25ab0a7..7bc886d166 100644
--- a/development/kdesvn/kdesvn.info
+++ b/development/kdesvn/kdesvn.info
@@ -1,8 +1,9 @@
 PRGNAM="kdesvn"
-VERSION="0.14.2"
+VERSION="1.0.4"
 HOMEPAGE="http://www.alwins-world.de/wiki/programs/kdesvn"
-DOWNLOAD="http://kdesvn.alwins-world.de/trac.fcgi/downloads/kdesvn-0.14.2.tar.bz2"
-MD5SUM="da4a71add6c14d24ebec56dd64bf6b7c"
+DOWNLOAD="http://kdesvn.alwins-world.de/trac.fcgi/downloads/kdesvn-1.0.4.tar.bz2"
+MD5SUM="ee52dc38434ad122eaeebe25c1b8cb21"
 MAINTAINER="Michiel van Wessem"
 EMAIL="michiel@slackbuilds.org"
-APPROVED="David Somero"
+APPROVED="dsomero"
+