diff options
| -rw-r--r-- | development/kdiff3/kdiff3.SlackBuild | 61 | ||||
| -rw-r--r-- | development/kdiff3/kdiff3.info | 8 |
2 files changed, 42 insertions, 27 deletions
diff --git a/development/kdiff3/kdiff3.SlackBuild b/development/kdiff3/kdiff3.SlackBuild index c0595517af..7edfe0a40e 100644 --- a/development/kdiff3/kdiff3.SlackBuild +++ b/development/kdiff3/kdiff3.SlackBuild @@ -1,9 +1,7 @@ #!/bin/sh # Slackware build script for: kdiff3 -# Written by (Michiel van Wessem <BP{k}>) (michiel@slackbuilds.org) - -# Copyright 2007 Michiel van Wessem (http://michielvwessem.wordpress.com) +# Copyright 2007-2009 Michiel van Wessem, Manchester, United Kingdom # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -23,25 +21,31 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - PRGNAM=kdiff3 -VERSION=0.9.92 +VERSION=${VERSION:-0.9.95} ARCH=${ARCH:-i486} BUILD=${BUILD:-1} TAG=${TAG:-_SBo} + CWD=$(pwd) TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} - -set -e 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 # Exit on most errors + + rm -rf $PKG mkdir -p $TMP $PKG $OUTPUT cd $TMP @@ -49,24 +53,33 @@ rm -rf $TMP/$PRGNAM-$VERSION tar -xzvf $CWD/$PRGNAM-$VERSION.tar.gz 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 {} \; + +mkdir build +cd build + cmake \ + -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DLIB_SUFFIX=${LIBDIRSUFFIX} \ + -DMAN_INSTALL_DIR=/usr/man \ + -DCMAKE_BUILD_TYPE=Release .. -KDEPREF=$(kde-config --prefix) -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ - --prefix=$KDEPREF \ - --sysconfdir=/etc \ - --docdir=/usr/doc \ - --mandir=/usr/man \ - --htmldir=/usr/doc \ - --localstatedir=/var \ - --program-prefix="" \ - --program-suffix="" \ - --disable-debug + make VERBOSE=1 + make install VERBOSE=1 DESTDIR=$PKG +cd - + +( 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 +) -make -make install-strip DESTDIR=$PKG ( cd $PKG/usr/man find . -type f -exec gzip -9 {} \; @@ -83,4 +96,4 @@ mkdir $PKG/install 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/development/kdiff3/kdiff3.info b/development/kdiff3/kdiff3.info index 80e6ba331b..4ee5f9a59e 100644 --- a/development/kdiff3/kdiff3.info +++ b/development/kdiff3/kdiff3.info @@ -1,8 +1,10 @@ PRGNAM="kdiff3" -VERSION="0.9.92" +VERSION="0.9.95" HOMEPAGE="http://kdiff3.sourceforge.net" -DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.92.tar.gz" -MD5SUM="c7b52bfee6a085393de0c4f83732e8f0" +DOWNLOAD="http://downloads.sourceforge.net/kdiff3/kdiff3-0.9.95.tar.gz" +MD5SUM="652a98bf79ba762a8a646d4a0fddb323" +DOWNLOAD_x86_64="" +MD5SUM_x86_64="" MAINTAINER="Michiel van Wessem" EMAIL="michiel@slackbuilds.org" APPROVED="rworkman" |