3 files changed, 36 insertions, 42 deletions
diff --git a/development/texi2html/README b/development/texi2html/README
index a1de0aa84a..c0afd88eab 100644
--- a/development/texi2html/README
+++ b/development/texi2html/README
@@ -1,6 +1,6 @@
 texi2html converts texinfo documents to HTML, Info, docbook, and XML.
 
-This conflicts with the tetex package shipped with Slackware, as
-an older texi2html comes with it.  However, if you plan to replace
-tetex with texlive, you will need a standalone installation of 
-texi2html, so this is intended to serve that purpose.
+Consider texi2html to be deprecated: according to its homepage,
+"the route forward for authors is, in most cases, to alter manuals
+and build processes as necessary to use the new features of the
+makeinfo/texi2any implementation of GNU Texinfo.
diff --git a/development/texi2html/doinst.sh b/development/texi2html/doinst.sh
new file mode 100644
index 0000000000..1bef502028
--- /dev/null
+++ b/development/texi2html/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/development/texi2html/texi2html.SlackBuild b/development/texi2html/texi2html.SlackBuild
index 4e3021608e..a748626d92 100644
--- a/development/texi2html/texi2html.SlackBuild
+++ b/development/texi2html/texi2html.SlackBuild
@@ -1,8 +1,8 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for texi2html
 
-# Copyright 2013  Robby Workman, Northport, Alabama, USA
+# Copyright 2013-2021  Robby Workman, Tuscaloosa, Alabama, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,38 +22,31 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230701 bkw: Modified by SlackBuilds.org, BUILD=2:
+# - ARCH=noarch (no compiled code here, nor use of /usr/lib64).
+# - add doinst/douninst to handle /usr/info/dir.
+# Note: during the build, if I have a *.UTF-8 locale, msgexec complains
+# about it. But, using C or en_US doesn't get rid of the warnings. Not
+# sure how to tell if it even matters.
+
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=texi2html
 VERSION=${VERSION:-5.0}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
+ARCH=noarch
 
-if [ -z "$ARCH" ]; then
-  case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
-    arm*) ARCH=arm ;;
-       *) ARCH=$( uname -m ) ;;
-  esac
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
 fi
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 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"
-else
-  SLKCFLAGS="-O2"
-  LIBDIRSUFFIX=""
-fi
-
 set -e
 
 rm -rf $PKG
@@ -65,37 +58,32 @@ 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 \
+ -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 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} +
 
-CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --bindir=/usr/bin \
   --mandir=/usr/man \
-  --infodir=/usr/info \
-  --build=$ARCH-slackware-linux
+  --infodir=/usr/info
 
 make
-make install DESTDIR=$PKG
+make install-strip DESTDIR=$PKG
+
+gzip -9 $PKG/usr/man/man*/*
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a AUTHORS COPYING ChangeLog NEWS README TODO $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
-find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \
-  grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-find $PKG/usr/man -type f -exec gzip -9 {} \;
-for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-
 rm -f $PKG/usr/info/dir
 gzip -9 $PKG/usr/info/*.info*
 
 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/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