4 files changed, 25 insertions, 54 deletions
diff --git a/perl/perl-Encode-EUCJPASCII/README b/perl/perl-Encode-EUCJPASCII/README
index e8a5d73dec7f1..4a8b3d0c44015 100644
--- a/perl/perl-Encode-EUCJPASCII/README
+++ b/perl/perl-Encode-EUCJPASCII/README
@@ -1,5 +1,5 @@
-perl-Encode-EUCJPASCII (An eucJP-open mapping)
+perl-Encode-EUCJPASCII (eucJP-open mapping)
 
-Extended mappings by Japanese codepages
+Perl module that provides extended mappings for Japanese codepages.
 
 This perl package is an optional dependency of perl-MIME-Charset.
diff --git a/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.SlackBuild b/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.SlackBuild
index 6cc4e61b2e2f1..3afd55de0e74c 100644
--- a/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.SlackBuild
+++ b/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.SlackBuild
@@ -2,25 +2,16 @@
 
 # Slackware build script for perl-Encode-EUCJPASCII
 
-# 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 by 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.
+# - relicense as WTFPL, with permission from Didier.
+# - simplify build.
+# - minor README and slack-desc tweaks.
 
 cd $(dirname $0) ; CWD=$(pwd)
 
@@ -34,15 +25,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,19 +40,8 @@ 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
+# No need for SLKCFLAGS here: the generated Makefile will use the
+# correct lib|lib64 dir, and the CFLAGS perl was compiled with.
 
 set -e
 
@@ -75,25 +52,19 @@ 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
 
-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 -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-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.info b/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.info
index a969899074f1a..1579f998bff7d 100644
--- a/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.info
+++ b/perl/perl-Encode-EUCJPASCII/perl-Encode-EUCJPASCII.info
@@ -6,5 +6,5 @@ MD5SUM="5daa65f55b7c2050bb0713d9e95f239d"
 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-Encode-EUCJPASCII/slack-desc b/perl/perl-Encode-EUCJPASCII/slack-desc
index 55b8d3bee9aa3..5c5fa387f5048 100644
--- a/perl/perl-Encode-EUCJPASCII/slack-desc
+++ b/perl/perl-Encode-EUCJPASCII/slack-desc
@@ -6,11 +6,11 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
                       |-----handy-ruler------------------------------------------------------|
-perl-Encode-EUCJPASCII: perl-Encode-EUCJPASCII (An eucJP-open mapping)
+perl-Encode-EUCJPASCII: perl-Encode-EUCJPASCII (eucJP-open mapping)
 perl-Encode-EUCJPASCII:
-perl-Encode-EUCJPASCII: Extended mappings by Japanese codepages
+perl-Encode-EUCJPASCII: Perl module that provides extended mappings for Japanese codepages.
 perl-Encode-EUCJPASCII:
-perl-Encode-EUCJPASCII: homepage: https://metacpan.org/release/NEZUMI/Encode-EUCJPASCII-0.03
+perl-Encode-EUCJPASCII: This perl package is an optional dependency of perl-MIME-Charset.
 perl-Encode-EUCJPASCII:
 perl-Encode-EUCJPASCII:
 perl-Encode-EUCJPASCII: