From 733a4933d73ee6a082cf0e5a9ef08c31a27cb048 Mon Sep 17 00:00:00 2001
From: "B. Watson" <yalhcru@gmail.com>
Date: Sun, 25 Oct 2020 14:16:26 -0400
Subject: perl/perl-file-libmagic: Updated for version 1.23.

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

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
---
 perl/perl-file-libmagic/README                     |  5 +++--
 .../perl-file-libmagic.SlackBuild                  | 24 ++++++++++++++--------
 perl/perl-file-libmagic/perl-file-libmagic.info    |  8 +++++---
 3 files changed, 24 insertions(+), 13 deletions(-)

(limited to 'perl/perl-file-libmagic')

diff --git a/perl/perl-file-libmagic/README b/perl/perl-file-libmagic/README
index 54485e1a8e..30a285d487 100644
--- a/perl/perl-file-libmagic/README
+++ b/perl/perl-file-libmagic/README
@@ -1,6 +1,7 @@
-perl-file-libmagic (determine MIME types of data or files using libmagic)
+perl-file-libmagic (determine MIME types of data or files with libmagic)
 
-File::LibMagic is a simple perl interface to libmagic from the file package.
+File::LibMagic is a simple perl interface to libmagic from the file
+package.
 
 perl-Test-Fatal is an optional build-time dependency, required
 for running "make test".
diff --git a/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild b/perl/perl-file-libmagic/perl-file-libmagic.SlackBuild
index 5ec6184957..6ca91ab63c 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
diff --git a/perl/perl-file-libmagic/perl-file-libmagic.info b/perl/perl-file-libmagic/perl-file-libmagic.info
index 4764d2f5d2..c52c122dcf 100644
--- a/perl/perl-file-libmagic/perl-file-libmagic.info
+++ b/perl/perl-file-libmagic/perl-file-libmagic.info
@@ -1,8 +1,10 @@
 PRGNAM="perl-file-libmagic"
-VERSION="1.16"
+VERSION="1.23"
 HOMEPAGE="https://metacpan.org/pod/File::LibMagic"
-DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/File-LibMagic-1.16.tar.gz"
-MD5SUM="de0cc720d1599428be01a7fa50a5cc5b"
+DOWNLOAD="https://cpan.metacpan.org/authors/id/D/DR/DROLSKY/File-LibMagic-1.23.tar.gz \
+          https://fastapi.metacpan.org/source/REHSACK/Config-AutoConf-0.313/lib/Config/AutoConf.pm"
+MD5SUM="7782e6f80a67c931a2682145eca6e832 \
+        233a630ea2ce0e7fdb2adcbb72896002"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
-- 
cgit v1.2.3