aboutsummaryrefslogtreecommitdiff
path: root/system
diff options
context:
space:
mode:
authorB. Watson <urchlay@slackware.uk>2023-07-08 01:39:19 -0400
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2023-07-15 17:30:10 +0700
commit317b7eede52bf5b7031b7268601fa06621d48bdb (patch)
treeca51153e9d3084b961337f8bf3e079fd64cd23cb /system
parent870dd7f561b49633a84f45b278faad5a9a3ec8c2 (diff)
system/wdiff: Handle /usr/info/dir.
Signed-off-by: B. Watson <urchlay@slackware.uk> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
Diffstat (limited to 'system')
-rw-r--r--system/wdiff/doinst.sh6
-rw-r--r--system/wdiff/wdiff.SlackBuild19
2 files changed, 17 insertions, 8 deletions
diff --git a/system/wdiff/doinst.sh b/system/wdiff/doinst.sh
new file mode 100644
index 000000000000..1bef5020286e
--- /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 364bbc1e6bdc..3a410950289e 100644
--- a/system/wdiff/wdiff.SlackBuild
+++ b/system/wdiff/wdiff.SlackBuild
@@ -6,13 +6,14 @@
# 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:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
PKGTYPE=${PKGTYPE:-tgz}
@@ -56,8 +57,8 @@ rm -rf $PRGNAM-$VERSION
tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
cd $PRGNAM-$VERSION
chown -R root:root .
-find -L . -perm /111 -a \! -perm 755 -a -exec chmod 755 {} \+ -o \
- \! -perm /111 -a \! -perm 644 -a -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.
@@ -77,15 +78,17 @@ CXXFLAGS="$SLKCFLAGS" \
make
make install-strip DESTDIR=$PKG
rm -f $PKG/usr/info/dir
-gzip -9 $PKG/usr/man/man1/*.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