development/esvn: Updated for version 0.6.12.1

5 files changed, 44 insertions, 18 deletions

diff --git a/development/esvn/README b/development/esvn/README
index 063c497d47..3032be8a85 100644
--- a/development/esvn/README
+++ b/development/esvn/README
@@ -6,3 +6,6 @@ In addition to the the standard svn commands it features:
 - showing changed items
 - performing quick diff, external diff and 3-way diff
 - showing the status of files/directories in real time
+
+eSvn won't build on Slackware 13.0 without the Qt3 compatibility
+package from /extra/kde3-compat.
diff --git a/development/esvn/doinst.sh b/development/esvn/doinst.sh
index 34be13eb65..4e8ba7071d 100644
--- a/development/esvn/doinst.sh
+++ b/development/esvn/doinst.sh
@@ -1,3 +1,4 @@
-if [ -x usr/bin/update-desktop-database ]; then
-  usr/bin/update-desktop-database usr/share/applications >/dev/null 2>&1
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database -q usr/share/applications >/dev/null 2>&1
 fi
+
diff --git a/development/esvn/esvn.SlackBuild b/development/esvn/esvn.SlackBuild
index cb82fa677c..13e6f3f210 100644
--- a/development/esvn/esvn.SlackBuild
+++ b/development/esvn/esvn.SlackBuild
@@ -5,7 +5,7 @@
 
 PRGNAM=esvn
 VERSION=0.6.12.1
-PKGVERSION=0.6.12-1
+SRCVERSION=0.6.12-1
 ARCH=${ARCH:-i486}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -19,8 +19,13 @@ DOCUMENTATION="AUTHORS ChangeLog COPYING html-docs/ docs/ LICENSE README"
 
 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
@@ -29,24 +34,39 @@ rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
 rm -rf $PRGNAM-$VERSION
-tar xvf $CWD/$PRGNAM-$PKGVERSION.tar.gz
+tar xvf $CWD/$PRGNAM-$SRCVERSION.tar.gz
 mv $PRGNAM $PRGNAM-$VERSION
 cd $PRGNAM-$VERSION
 chown -R root:root .
-chmod -R u+w,go+r-w,a-s .
+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 {} \;
 
 # This patch enables the use of Slackware compile flags and fixes the
 # binary install targets (esvn and esvn-diff-wrapper) in the .mak files
 patch -p0 < $CWD/esvn-Makefile.diff
 
-qmake "QMAKE_CXXFLAGS+=$SLKCFLAGS" "QMAKE_CFLAGS+=$SLKCFLAGS" esvn.pro
-qmake "QMAKE_CXXFLAGS+=$SLKCFLAGS" "QMAKE_CFLAGS+=$SLKCFLAGS" esvn-diff-wrapper.pro
+PATH=$QTDIR"/bin":$PATH \
+  qmake \
+  "QMAKE_CXXFLAGS+=$SLKCFLAGS" \
+  "QMAKE_CFLAGS+=$SLKCFLAGS" \
+  esvn.pro
+PATH=$QTDIR"/bin":$PATH \
+  qmake \
+  "QMAKE_CXXFLAGS+=$SLKCFLAGS" \
+  "QMAKE_CFLAGS+=$SLKCFLAGS" \
+  esvn-diff-wrapper.pro
+
 make
 make install INSTALL_ROOT=$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
+  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
 )
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
@@ -58,4 +78,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/development/esvn/esvn.info b/development/esvn/esvn.info
index e75aba674e..1216d69cd4 100644
--- a/development/esvn/esvn.info
+++ b/development/esvn/esvn.info
@@ -3,6 +3,8 @@ VERSION="0.6.12.1"
 HOMEPAGE="http://zoneit.free.fr/esvn/"
 DOWNLOAD="http://downloads.sourceforge.net/esvn/esvn-0.6.12-1.tar.gz"
 MD5SUM="c46ffee6188dc28604c7cc9e5dbf082e"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
 MAINTAINER="Iskar Enev"
 EMAIL="<iskar.enev[@]gmail.com>"
-APPROVED="David Somero"
+APPROVED="rworkman"
diff --git a/development/esvn/slack-desc b/development/esvn/slack-desc
index fca6bcae9b..2d02f00353 100644
--- a/development/esvn/slack-desc
+++ b/development/esvn/slack-desc
@@ -9,11 +9,11 @@
 esvn: eSvn (QT GUI frontend for Subversion)
 esvn:
 esvn: esvn is a QT GUI frontend to the Subversion revision system
-esvn: 
-esvn: 
-esvn:  
-esvn: 
-esvn: 
-esvn: 
-esvn: 
+esvn:
+esvn:
+esvn:
+esvn:
+esvn:
+esvn:
+esvn:
 esvn: