Skip to content

Commit

Permalink
p5-File-LibMagic: update to 1.23.
Browse files Browse the repository at this point in the history
1.23     2020-08-28

- Fixed a bug with the Makefile.PL that caused every call to "make" to
  recompile the object file for the package's XS code. Reported by Kent
  Fredric. GH #28.
  • Loading branch information
0-wiz-0 committed Sep 6, 2020
1 parent 7dc8bb2 commit bba80ca
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 29 deletions.
6 changes: 2 additions & 4 deletions devel/p5-File-LibMagic/Makefile
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
# $NetBSD: Makefile,v 1.29 2020/08/31 18:08:02 wiz Exp $
# $NetBSD: Makefile,v 1.30 2020/09/06 23:09:44 wiz Exp $

DISTNAME= File-LibMagic-1.22
DISTNAME= File-LibMagic-1.23
PKGNAME= p5-${DISTNAME}
PKGREVISION= 1
CATEGORIES= devel perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=File/}

Expand All @@ -20,7 +19,6 @@ TEST_DEPENDS+= p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal
# cannot open LibMagic.xs: No such file or directory
MAKE_JOBS_SAFE= no

USE_LANGUAGES= c
PERL5_PACKLIST= auto/File/LibMagic/.packlist

.include "../../devel/zlib/buildlink3.mk"
Expand Down
12 changes: 6 additions & 6 deletions devel/p5-File-LibMagic/distinfo
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
$NetBSD: distinfo,v 1.14 2020/05/04 13:10:16 mef Exp $
$NetBSD: distinfo,v 1.15 2020/09/06 23:09:44 wiz Exp $

SHA1 (File-LibMagic-1.22.tar.gz) = b17fab40f64c4a74743673aec6e967d98a1219ed
RMD160 (File-LibMagic-1.22.tar.gz) = 87689040b444988f94edb8df059a3ea7ce964318
SHA512 (File-LibMagic-1.22.tar.gz) = a5832887025958aec79bfd598c617c9ed1365cec333431179095d826ad8a2c85072ce86da54b78123c2304ac3fc7a96f33a4f421dccc99019aaf38a90e9f3ceb
Size (File-LibMagic-1.22.tar.gz) = 128201 bytes
SHA1 (patch-aa) = 00442a756d3a5759df08a7cabc784257e0b671f0
SHA1 (File-LibMagic-1.23.tar.gz) = 54efc5223c9e2d6368f2631399e30af952545078
RMD160 (File-LibMagic-1.23.tar.gz) = 703e58f89299715783e2607259203c19163d3a8c
SHA512 (File-LibMagic-1.23.tar.gz) = 894ff64051e607f3b788f52568221cae3a99b7386b534c62c33fccc46d1242d3e851970cd9063a1c1535732f76e2bc2111568a8e83b4ed6efecfedd8facc5cbd
Size (File-LibMagic-1.23.tar.gz) = 167761 bytes
SHA1 (patch-aa) = b1a9e14f7584126e1caf5d69d35b2b9e02d5806b
26 changes: 7 additions & 19 deletions devel/p5-File-LibMagic/patches/patch-aa
Original file line number Diff line number Diff line change
@@ -1,27 +1,15 @@
$NetBSD: patch-aa,v 1.8 2016/02/03 05:07:11 mef Exp $
$NetBSD: patch-aa,v 1.9 2020/09/06 23:09:45 wiz Exp $

(1)
Incompatible change in the newer ExtUtils-MakeMaker:
It places .o files where the source file lives (lib/File/ in this case),
whereas the older MakeMaker placed it in the current working dir
(toplevel in this case).
Ensure we use the required ldflags for the platform.

Thanks Matthias Ferdinand
http://mail-index.netbsd.org/pkgsrc-users/2015/09/19/msg022238.html

(2)
-- Ensure we use the required ldflags for the platform.

--- Makefile.PL.orig 2015-09-23 15:35:22.000000000 +0900
+++ Makefile.PL 2015-09-23 15:36:22.000000000 +0900
@@ -21,8 +21,8 @@ my %WriteMakefileArgs = (
--- Makefile.PL.orig 2020-08-29 03:54:44.000000000 +0000
+++ Makefile.PL
@@ -18,7 +18,7 @@ my %WriteMakefileArgs = (
"ExtUtils::MakeMaker" => 0
},
"DISTNAME" => "File-LibMagic",
"INC" => "-I. -Ic",
- "LDFROM" => "LibMagic\$(OBJ_EXT)",
- "LIBS" => "-lmagic",
+ "LDFROM" => "LibMagic\$(OBJ_EXT)",
+ 'LIBS' => "$ENV{LDFLAGS} -lmagic -lz", # e.g., '-lm'
+ "LIBS" => "$ENV{LDFLAGS} -lmagic -lz",
"LICENSE" => "perl",
"MIN_PERL_VERSION" => "5.008",
"NAME" => "File::LibMagic",

0 comments on commit bba80ca

Please sign in to comment.