perl/perl-Text-CharWidth: New maintainer.

Signed-off-by: B. Watson <yalhcru@gmail.com>

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

4 files changed, 31 insertions, 71 deletions

diff --git a/perl/perl-Text-CharWidth/README b/perl/perl-Text-CharWidth/README
index 74ca1fc43035..8bdd6339cd96 100644
--- a/perl/perl-Text-CharWidth/README
+++ b/perl/perl-Text-CharWidth/README
@@ -1,13 +1,8 @@
 perl-Text-CharWidth (perl module)
 
-This perl module, Text::CharWidth, gets number of occupied columns of
-a string on a terminal.
-This module supplies features similar as wcwidth(3) and wcswidth(3)
-in C language.
-It computes numbuer of columns occupied on the terminal by a text 
-string, which is not always equal to its number of characters and
-depends on the encoding used.
-
-Parameters are to be given in locale encoding, not always in UTF-8.
+This perl module, Text::CharWidth, gets the number of columns occupied
+by a string on a terminal. This is not always equal to the number
+of characters, depending on the encoding in use. This is similar to
+wcwidth(3) and wcswidth(3) in C.
 
 This perl module is needed by Text::WrapI18N.
diff --git a/perl/perl-Text-CharWidth/perl-Text-CharWidth.SlackBuild b/perl/perl-Text-CharWidth/perl-Text-CharWidth.SlackBuild
index e61ae7ea063b..e1c2b10ff6f6 100644
--- a/perl/perl-Text-CharWidth/perl-Text-CharWidth.SlackBuild
+++ b/perl/perl-Text-CharWidth/perl-Text-CharWidth.SlackBuild
@@ -2,25 +2,15 @@
 
 # Slackware build script for perl-Text-CharWidth
 
-# Copyright 2014 Didier Spaier Paris, France
-# All rights reserved.
-#
-# Redistribution and use of this script, with or without modification, is
-# permitted provided that the following conditions are met:
-#
-# 1. Redistributions of this script must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-#
-#  THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR IMPLIED
-#  WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-#  MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO
-#  EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-#  SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-#  PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-#  OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-#  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-#  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-#  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# Originally written 2014 Didier Spaier Paris, France
+# Now maintained by B. Watson (yalhcru@gmail.com)
+
+# Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
+
+# 20220110 bkw:
+# - take over maintenance.
+# - simplify build.
+# - tweak README and slack-desc.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
@@ -34,15 +24,12 @@ SRCNAM="$(printf $PRGNAM | cut -d- -f2-)"
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   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,20 +39,6 @@ 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
@@ -75,28 +48,20 @@ rm -rf $SRCNAM-$VERSION
 tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
 cd $SRCNAM-$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 {} \+
 
 perl Makefile.PL \
   PREFIX=/usr \
   INSTALLDIRS=vendor \
   INSTALLVENDORMAN3DIR=/usr/man/man3
-make
+make LD="cc -Wl,-s"
 make test
 make install DESTDIR=$PKG
+gzip -9 $PKG/usr/man/man*/*
 
-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
-
-find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | xargs rm -f || true
-
+find $PKG -name perllocal.pod -o -name ".packlist" -o -name "*.bs" | \
+  xargs rm -f || true
 find $PKG -depth -type d -empty -delete || true
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/perl/perl-Text-CharWidth/perl-Text-CharWidth.info b/perl/perl-Text-CharWidth/perl-Text-CharWidth.info
index 0635d4ae5d04..0c46c6915301 100644
--- a/perl/perl-Text-CharWidth/perl-Text-CharWidth.info
+++ b/perl/perl-Text-CharWidth/perl-Text-CharWidth.info
@@ -6,5 +6,5 @@ MD5SUM="37a723df0580c0758c0ee67b37336c15"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-MAINTAINER="Didier Spaier"
-EMAIL="didier at slint dot fr"
+MAINTAINER="B. Watson"
+EMAIL="yalhcru@gmail.com"
diff --git a/perl/perl-Text-CharWidth/slack-desc b/perl/perl-Text-CharWidth/slack-desc
index 7554fff1e204..c458965514a0 100644
--- a/perl/perl-Text-CharWidth/slack-desc
+++ b/perl/perl-Text-CharWidth/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                    |-----handy-ruler------------------------------------------------------|
-perl-Text-CharWidth: perl-Text-CharWidth (Column Computer)
+perl-Text-CharWidth: perl-Text-CharWidth (perl module)
+perl-Text-CharWidth:
+perl-Text-CharWidth: This perl module, Text::CharWidth, gets the number of columns occupied
+perl-Text-CharWidth: by a string on a terminal, which is not always equal to the number
+perl-Text-CharWidth: of characters, depending on the encoding in use. This is similar to
+perl-Text-CharWidth: wcwidth(3) and wcswidth(3) in C.
+perl-Text-CharWidth:
+perl-Text-CharWidth: This perl module is needed by Text::WrapI18N.
+perl-Text-CharWidth:
 perl-Text-CharWidth:
-perl-Text-CharWidth: This perl module, Text::CharWidth, gets number of occupied columns of
-perl-Text-CharWidth: a string on a terminal.
-perl-Text-CharWidth: This module supplies features similar as wcwidth(3) and wcswidth(3)
-perl-Text-CharWidth: in C language.
-perl-Text-CharWidth: It computes number of columns ocuuied on the terminal by a text
-perl-Text-CharWidth: string, which is not always equal to its number of characters and
-perl-Text-CharWidth: depends on the encoding used.
 perl-Text-CharWidth:
-perl-Text-CharWidth: Parameters are to be given in locale encoding, not always in UTF-8.