diff options
Diffstat (limited to 'system/wdiff')
| -rw-r--r-- | system/wdiff/README | 14 | ||||
| -rw-r--r-- | system/wdiff/doinst.sh | 6 | ||||
| -rw-r--r-- | system/wdiff/wdiff.SlackBuild | 42 | ||||
| -rw-r--r-- | system/wdiff/wdiff.info | 4 |
4 files changed, 42 insertions, 24 deletions
diff --git a/system/wdiff/README b/system/wdiff/README index 4529bc8c0c..2067f6fbb7 100644 --- a/system/wdiff/README +++ b/system/wdiff/README @@ -1,9 +1,9 @@ wdiff (display word differences between text files) -The GNU wdiff program is a front end to diff for comparing files on a word -per word basis. A word is anything between whitespace. This is useful for -comparing two texts in which a few words have been changed and for which -paragraphs have been refilled. It works by creating two temporary files, -one word per line, and then executes diff on these files. It collects the -diff output and uses it to produce a nicer display of word differences -between the original files. +The GNU wdiff program is a front end to diff for comparing files on +a word per word basis. A word is anything between whitespace. This is +useful for comparing two texts in which a few words have been changed +and for which paragraphs have been refilled. It works by creating two +temporary files, one word per line, and then executes diff on these +files. It collects the diff output and uses it to produce a nicer +display of word differences between the original files. diff --git a/system/wdiff/doinst.sh b/system/wdiff/doinst.sh new file mode 100644 index 0000000000..1bef502028 --- /dev/null +++ b/system/wdiff/doinst.sh @@ -0,0 +1,6 @@ +if [ -x /usr/bin/install-info -a -d usr/info ]; then + ( cd usr/info + rm -f dir + for i in *.info*; do /usr/bin/install-info $i dir 2>/dev/null; done + ) +fi diff --git a/system/wdiff/wdiff.SlackBuild b/system/wdiff/wdiff.SlackBuild index dc7e353457..3a41095028 100644 --- a/system/wdiff/wdiff.SlackBuild +++ b/system/wdiff/wdiff.SlackBuild @@ -1,15 +1,21 @@ -#!/bin/sh +#!/bin/bash # Slackware build script for wdiff -# Written by B. Watson (yalhcru@gmail.com) +# Written by B. Watson (urchlay@slackware.uk) # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details. +# 20230708 bkw: BUILD=3, add doinst/douninst for .info files. +# 20210809 bkw: BUILD=2, --enable-experimental + +cd $(dirname $0) ; CWD=$(pwd) + PRGNAM=wdiff VERSION=${VERSION:-1.2.2} -BUILD=${BUILD:-1} +BUILD=${BUILD:-3} TAG=${TAG:-_SBo} +PKGTYPE=${PKGTYPE:-tgz} if [ -z "$ARCH" ]; then case "$( uname -m )" in @@ -19,7 +25,11 @@ if [ -z "$ARCH" ]; then esac fi -CWD=$(pwd) +if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then + echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE" + exit 0 +fi + TMP=${TMP:-/tmp/SBo} PKG=$TMP/package-$PRGNAM OUTPUT=${OUTPUT:-/tmp} @@ -47,15 +57,15 @@ rm -rf $PRGNAM-$VERSION tar xvf $CWD/$PRGNAM-$VERSION.tar.gz cd $PRGNAM-$VERSION chown -R root:root . -find -L . \ - \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \ - -o -perm 511 \) -exec chmod 755 {} \; -o \ - \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ - -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} + -o \ + \! -perm /111 -a \! -perm 644 -a -exec chmod 644 {} + +# The --enable-experimental option builds mdiff, wdiff2, and unify. These +# look useful enough to include in the build. CFLAGS="$SLKCFLAGS" \ CXXFLAGS="$SLKCFLAGS" \ ./configure \ + --enable-experimental \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --sysconfdir=/etc \ @@ -68,15 +78,17 @@ CXXFLAGS="$SLKCFLAGS" \ make make install-strip DESTDIR=$PKG rm -f $PKG/usr/info/dir -gzip -9 $PKG/usr/man/man1/$PRGNAM.1 +gzip -9 $PKG/usr/man/man1/*.1 $PKG/usr/info/* -mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION -cp -a AUTHORS BACKLOG COPYING ChangeLog NEWS README THANKS TODO \ - $PKG/usr/doc/$PRGNAM-$VERSION -cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild +PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION +mkdir -p $PKGDOC +cp -a AUTHORS BACKLOG COPYING ChangeLog NEWS README THANKS TODO $PKGDOC +cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild mkdir -p $PKG/install cat $CWD/slack-desc > $PKG/install/slack-desc +cat $CWD/doinst.sh > $PKG/install/doinst.sh +cat $CWD/doinst.sh > $PKG/install/douninst.sh cd $PKG -/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz} +/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE diff --git a/system/wdiff/wdiff.info b/system/wdiff/wdiff.info index 34dc1f18b6..e90e800950 100644 --- a/system/wdiff/wdiff.info +++ b/system/wdiff/wdiff.info @@ -1,10 +1,10 @@ PRGNAM="wdiff" VERSION="1.2.2" HOMEPAGE="https://www.gnu.org/software/wdiff/" -DOWNLOAD="http://ftp.gnu.org/gnu/wdiff/wdiff-1.2.2.tar.gz" +DOWNLOAD="https://ftp.gnu.org/gnu/wdiff/wdiff-1.2.2.tar.gz" MD5SUM="1c6ddd1f3106139ff9fe00e934df715f" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="" MAINTAINER="B. Watson" -EMAIL="yalhcru@gmail.com" +EMAIL="urchlay@slackware.uk" |