aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--misc/dwdiff/dwdiff.SlackBuild9
-rw-r--r--misc/dwdiff/dwdiff.info8
-rw-r--r--misc/dwdiff/slack-desc4
3 files changed, 13 insertions, 8 deletions
diff --git a/misc/dwdiff/dwdiff.SlackBuild b/misc/dwdiff/dwdiff.SlackBuild
index 3953478a18ab..290fa7503880 100644
--- a/misc/dwdiff/dwdiff.SlackBuild
+++ b/misc/dwdiff/dwdiff.SlackBuild
@@ -5,7 +5,7 @@
# Released under the WTFPL
PRGNAM=dwdiff
-VERSION=${VERSION:-1.5.2}
+VERSION=${VERSION:-1.6.1}
ARCH=${ARCH:-i486}
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
@@ -17,10 +17,13 @@ OUTPUT=${OUTPUT:-/tmp}
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
if [[ -z $UNICODE ]]; then
@@ -52,7 +55,7 @@ CXXFLAGS="$SLKCFLAGS" \
--prefix=/usr \
--mandir='$(prefix)/man'
-make LINGUAS="${NLS:=""}" prefix=$PKG/usr
+make LINGUAS="${NLS:=""}" prefix=/usr
make LINGUAS="${NLS:=""}" prefix=$PKG/usr install
mv $PKG/usr/share/doc $PKG/usr
@@ -78,4 +81,4 @@ mkdir -p $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/misc/dwdiff/dwdiff.info b/misc/dwdiff/dwdiff.info
index 89d3c97f9bf9..610183caa68a 100644
--- a/misc/dwdiff/dwdiff.info
+++ b/misc/dwdiff/dwdiff.info
@@ -1,8 +1,10 @@
PRGNAM="dwdiff"
-VERSION="1.5.2"
+VERSION="1.6.1"
HOMEPAGE="http://os.ghalkes.nl/dwdiff.html"
-DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-1.5.2.tgz"
-MD5SUM="f745fc3a965b9716ed49c8dac77d689a"
+DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-1.6.1.tgz"
+MD5SUM="e7bf94f579ce764c2070c17cc5a24332"
+DOWNLOAD_x86_64=""
+MD5SUM_x86_64=""
MAINTAINER="slakmagik"
EMAIL="jsun@freeshell.org"
APPROVED="dsomero"
diff --git a/misc/dwdiff/slack-desc b/misc/dwdiff/slack-desc
index 0a8a5f07ce7b..ef6737a7d51a 100644
--- a/misc/dwdiff/slack-desc
+++ b/misc/dwdiff/slack-desc
@@ -7,7 +7,7 @@
|-----handy-ruler------------------------------------------------------|
dwdiff: dwdiff (word-level front-end for diff)
-dwdiff:
+dwdiff:
dwdiff: dwdiff is a front-end for the diff program that operates at the word
dwdiff: level instead of the line level. It is different from wdiff in that
dwdiff: it allows the user to specify what should be considered whitespace,
@@ -15,5 +15,5 @@ dwdiff: and in that it takes an optional list of characters that should
dwdiff: be considered delimiters. Delimiters are single characters that
dwdiff: are treated as if they are words, even when there is no whitespace
dwdiff: separating them from preceding words or delimiters.
-dwdiff:
+dwdiff:
dwdiff: Homepage: http://os.ghalkes.nl/dwdiff.html