diff options
| -rw-r--r-- | devel/p5-File-LibMagic/Makefile | 7 | ||||
| -rw-r--r-- | devel/p5-File-LibMagic/distinfo | 4 | ||||
| -rw-r--r-- | devel/p5-File-LibMagic/patches/patch-aa | 24 |
3 files changed, 26 insertions, 9 deletions
diff --git a/devel/p5-File-LibMagic/Makefile b/devel/p5-File-LibMagic/Makefile index 2fad582ae0e..c78da624023 100644 --- a/devel/p5-File-LibMagic/Makefile +++ b/devel/p5-File-LibMagic/Makefile @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.18 2015/08/22 23:41:00 mef Exp $ +# $NetBSD: Makefile,v 1.19 2015/09/23 06:43:47 mef Exp $ DISTNAME= File-LibMagic-1.13 PKGNAME= p5-${DISTNAME} +PKGREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=File/} @@ -15,6 +16,10 @@ BUILDLINK_API_DEPENDS.file+= file>=5.00 # necessary for test BUILD_DEPENDS+= p5-Test-Fatal-[0-9]*:../../devel/p5-Test-Fatal +# incompatible change in MakeMaker 7.06 vs. 7.04.1 in object file location +# => enforce the new behaviour +BUILD_DEPENDS+= p5-ExtUtils-MakeMaker>=7.06:../../devel/p5-ExtUtils-MakeMaker + # cannot open LibMagic.xs: No such file or directory MAKE_JOBS_SAFE= no diff --git a/devel/p5-File-LibMagic/distinfo b/devel/p5-File-LibMagic/distinfo index c7d316f37fe..728a390ff4c 100644 --- a/devel/p5-File-LibMagic/distinfo +++ b/devel/p5-File-LibMagic/distinfo @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.9 2015/08/22 23:41:00 mef Exp $ +$NetBSD: distinfo,v 1.10 2015/09/23 06:43:47 mef Exp $ SHA1 (File-LibMagic-1.13.tar.gz) = 1f074a7f9fce9ac1e11b1fae41abfb6db51b7ae0 RMD160 (File-LibMagic-1.13.tar.gz) = d4c22be7f59483bebacc3f204e63d216eb186802 Size (File-LibMagic-1.13.tar.gz) = 124384 bytes -SHA1 (patch-aa) = 19d6b1a9affc490478a0081c660bf74e4a8c31ac +SHA1 (patch-aa) = 987e3f1aab290b8c04a84ec7d8b01ddf89684bc6 diff --git a/devel/p5-File-LibMagic/patches/patch-aa b/devel/p5-File-LibMagic/patches/patch-aa index 5d14dbf69b7..5d0cf5f77c5 100644 --- a/devel/p5-File-LibMagic/patches/patch-aa +++ b/devel/p5-File-LibMagic/patches/patch-aa @@ -1,14 +1,26 @@ -$NetBSD: patch-aa,v 1.6 2015/08/22 23:41:00 mef Exp $ +$NetBSD: patch-aa,v 1.7 2015/09/23 06:43:48 mef Exp $ -- Ensure we use the required ldflags for the platform. +(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). ---- Makefile.PL.orig 2015-07-13 02:54:52.000000000 +0900 -+++ Makefile.PL 2015-08-23 08:33:54.000000000 +0900 -@@ -22,7 +22,7 @@ my %WriteMakefileArgs = ( +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 = ( + }, "DISTNAME" => "File-LibMagic", "INC" => "-I. -Ic", - "LDFROM" => "LibMagic\$(OBJ_EXT)", +- "LDFROM" => "LibMagic\$(OBJ_EXT)", - "LIBS" => "-lmagic", ++ "LDFROM" => "lib/File/LibMagic\$(OBJ_EXT)", + 'LIBS' => "$ENV{LDFLAGS} -lmagic -lz", # e.g., '-lm' "LICENSE" => "perl", "MIN_PERL_VERSION" => "5.008", |