diff options
| -rw-r--r-- | misc/dwdiff/README | 15 | ||||
| -rw-r--r-- | misc/dwdiff/dwdiff.SlackBuild | 66 | ||||
| -rw-r--r-- | misc/dwdiff/dwdiff.info | 8 | ||||
| -rw-r--r-- | misc/dwdiff/slack-desc | 19 |
4 files changed, 108 insertions, 0 deletions
diff --git a/misc/dwdiff/README b/misc/dwdiff/README new file mode 100644 index 0000000000000..4848fc43f6161 --- /dev/null +++ b/misc/dwdiff/README @@ -0,0 +1,15 @@ +dwdiff is a front-end for the diff program that operates at the word level +instead of the line level. It is different from wdiff in that it allows the +user to specify what should be considered whitespace, and in that it takes an +optional list of characters that should be considered delimiters. Delimiters +are single characters that are treated as if they are words, even when there is +no whitespace separating them from preceding words or delimiters. dwdiff is +mostly commandline compatible with wdiff. Only the --autopager, --terminal and +--avoid-wraps options are not supported. + +The default output from dwdiff is the new text, with the deleted and inserted +parts annotated with markers. Command line options are available to change both +what is printed, and the markers. + +If you wish to have de localization or nl localization and manpages, pass +'NLS="de nl"' or either one to the SlackBuild. diff --git a/misc/dwdiff/dwdiff.SlackBuild b/misc/dwdiff/dwdiff.SlackBuild new file mode 100644 index 0000000000000..a1bd6fd9c91de --- /dev/null +++ b/misc/dwdiff/dwdiff.SlackBuild @@ -0,0 +1,66 @@ +#!/bin/sh + +# Slackware build script for dwdiff +# Written by slakmagik <jsun@freeshell.org> +# Released under the WTFPL + +PRGNAM=dwdiff +VERSION=1.3 +ARCH=${ARCH:-i486} +BUILD=${BUILD:-1} +TAG=${TAG:-_SBo} + +CWD=$(pwd) +TMP=${TMP:-/tmp/SBo} +PKG=$TMP/package-$PRGNAM +OUTPUT=${OUTPUT:-/tmp} + +if [ "$ARCH" = "i486" ]; then + SLKCFLAGS="-O2 -march=i486 -mtune=i686" +elif [ "$ARCH" = "i686" ]; then + SLKCFLAGS="-O2 -march=i686 -mtune=i686" +fi + +set -e + +rm -rf $PKG +mkdir -p $TMP $PKG $OUTPUT +cd $TMP +rm -rf $PRGNAM-$VERSION +tar xvf $CWD/$PRGNAM-$VERSION.tgz +cd $PRGNAM-$VERSION +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 {} \; + +# This is one messed up makefile +CFLAGS="$SLKCFLAGS" \ +CXXFLAGS="$SLKCFLAGS" \ +./configure --prefix=/usr --mandir='$(prefix)/usr/man' +make LINGUAS="${NLS:=""}" prefix=$PKG/usr +make LINGUAS="${NLS:=""}" prefix=$PKG/usr install +mv $PKG/usr/share/doc $PKG/usr +if [ -z "$NLS" ]; then # share/ will be empty + rmdir $PKG/usr/share +fi + +( 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/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/install +cat $CWD/slack-desc > $PKG/install/slack-desc + +cd $PKG +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.tgz diff --git a/misc/dwdiff/dwdiff.info b/misc/dwdiff/dwdiff.info new file mode 100644 index 0000000000000..03e2867c0aeb3 --- /dev/null +++ b/misc/dwdiff/dwdiff.info @@ -0,0 +1,8 @@ +PRGNAM="dwdiff" +VERSION="1.3" +HOMEPAGE="http://os.ghalkes.nl/dwdiff.html" +DOWNLOAD="http://os.ghalkes.nl/dist/dwdiff-1.3.tgz" +MD5SUM="dddf28ca43a4b490a6999e6b379596da" +MAINTAINER="slakmagik" +EMAIL="jsun@freeshell.org" +APPROVED="rworkman" diff --git a/misc/dwdiff/slack-desc b/misc/dwdiff/slack-desc new file mode 100644 index 0000000000000..0a8a5f07ce7b4 --- /dev/null +++ b/misc/dwdiff/slack-desc @@ -0,0 +1,19 @@ +# 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------------------------------------------------------| +dwdiff: dwdiff (word-level front-end for diff) +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, +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: Homepage: http://os.ghalkes.nl/dwdiff.html |