1 files changed, 16 insertions, 8 deletions
diff --git a/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild b/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
index 5ec61849573f8..6ca91ab63caa9 100644
--- a/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
+++ b/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
@@ -6,9 +6,11 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20201025 bkw: update for v1.23.
+
 PRGNAM=perl-file-libmagic
 TARNAM=File-LibMagic
-VERSION=${VERSION:-1.16}
+VERSION=${VERSION:-1.23}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -48,11 +50,18 @@ rm -rf $TARNAM-$VERSION
 tar xvf $CWD/$TARNAM-$VERSION.tar.gz
 cd $TARNAM-$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 {} \+
+
+# 20201025 bkw: previous versions shipped a private copy of
+# Config::AutoConf with the source. Upstream removed it, so it would
+# have to be installed separately. Since it's only used at build time,
+# and doesn't affect the package built by this script, I don't want to
+# create and maintain yet another perl SlackBuild for it. So I've made
+# it a 2nd download file, and this stanza makes Makefile.PL use it:
+mkdir -p inc/Config
+cp $CWD/AutoConf.pm inc/Config
+export PERL5LIB=inc
 
 perl Makefile.PL \
   PREFIX=/usr \
@@ -73,8 +82,7 @@ find $PKG -name perllocal.pod \
   | xargs rm -f
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a Changes LICENSE README.md \
-  $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a Changes LICENSE README.md $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install