system/wterm: Fix compile, install terminfo, new maintainer.

Signed-off-by: B. Watson <urchlay@slackware.uk>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 33 insertions, 28 deletions

diff --git a/system/wterm/wterm.SlackBuild b/system/wterm/wterm.SlackBuild
index 0879321db4..c28b1efd7e 100644
--- a/system/wterm/wterm.SlackBuild
+++ b/system/wterm/wterm.SlackBuild
@@ -2,7 +2,7 @@
 
 # Slackware build script for Wterm
 
-# Copyright (c) 2014, Yanes Checcacci Balod <yanes@pobox.com>, Brazil
+# Copyright (c) 2014, Yanes Checcacci Balod <email removed>, Brazil
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -22,11 +22,20 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20230613 bkw: BUILD=4, modified by SlackBuilds.org:
+# - fix it so it actually compiles.
+# - clean up the docs a bit.
+# - *not* taking over maintainership. if nobody on the mailing list wants
+#   this build, it will get marked as orphaned and eventually removed,
+#   probably during our dev cycle after 15.1 release.
+# Note: This looks like a fork of rxvt. Some of its docs refer to it
+# as rxvt, still. Not going to patch them.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=wterm
 VERSION=${VERSION:-6.2.9}
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
 TAG=${TAG:-_SBo}
 PKGTYPE=${PKGTYPE:-tgz}
 
@@ -38,9 +47,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -52,16 +58,12 @@ OUTPUT=${OUTPUT:-/tmp}
 
 if [ "$ARCH" = "i586" ]; then
   SLKCFLAGS="-O2 -march=i586 -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
@@ -73,12 +75,10 @@ rm -rf $PRGNAM-$VERSION
 tar xvzf $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 {} +
 
+SLKCFLAGS+=" -fcommon"
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
 ./configure \
@@ -94,19 +94,24 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-xpm-background \
 
 make
+strip src/$PRGNAM
 make install DESTDIR=$PKG
-
-find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
-  | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
-
-mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-
-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
-
-### FIX! Create Utils in /usr/doc/wterm-$VERSION!
-cp -rv doc/* $PKG/usr/doc/$PRGNAM-$VERSION/
+gzip $PKG/usr/man/man*/*
+
+# 20230613 bkw: include the terminfo entry in the package.
+mkdir -p $PKG/usr/share/terminfo
+tic -o $PKG/usr/share/terminfo doc/etc/wterm.terminfo
+
+PKGDOC=$PKG/usr/doc/$PRGNAM-$VERSION
+mkdir -p $PKGDOC
+cat $CWD/$PRGNAM.SlackBuild > $PKGDOC/$PRGNAM.SlackBuild
+
+# 20230613 bkw: don't install everything from doc/, some of it's
+# Makefiles and the source for the HTML, etc. Don't install anything
+# in the doc dir with execute permission.
+cd doc
+chmod -x menu/*
+cp -a BUGS FAQ README* TODO *.txt *.html menu $PKGDOC
 
 mkdir -p $PKG/install
 cat $CWD/slack-desc > $PKG/install/slack-desc
diff --git a/system/wterm/wterm.info b/system/wterm/wterm.info
index aac7bc98c4..ddd0410dc1 100644
--- a/system/wterm/wterm.info
+++ b/system/wterm/wterm.info
@@ -6,5 +6,5 @@ MD5SUM="2d9f1de4c30fb637053dbceb3400aa3d"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Yanes Checcacci Balod"
-EMAIL="yanes@pobox.com"
+MAINTAINER="B. Watson"
+EMAIL="urchlay@slackware.uk"