Sat May 30 20:02:07 2009 UTC ()
Updating patches/patch-aa to remove the Devel::CheckLib usage. First,
pkgsrc checks the dependencies and second, Devel::CheckLib breaks on
AIX.


(sno)
diff -r1.5 -r1.6 pkgsrc/devel/p5-File-LibMagic/distinfo
diff -r1.3 -r1.4 pkgsrc/devel/p5-File-LibMagic/patches/patch-aa
cvs diff -r1.5 -r1.6 pkgsrc/devel/p5-File-LibMagic/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/p5-File-LibMagic/distinfo 2009/05/28 22:48:47 1.5
+++ pkgsrc/devel/p5-File-LibMagic/distinfo 2009/05/30 20:02:07 1.6
@@ -1,6 +1,6 @@ @@ -1,6 +1,6 @@
1$NetBSD: distinfo,v 1.5 2009/05/28 22:48:47 sno Exp $ 1$NetBSD: distinfo,v 1.6 2009/05/30 20:02:07 sno Exp $
2 2
3SHA1 (File-LibMagic-0.96.tgz) = 1624150be5e0994948556f63481f2779b3ffa024 3SHA1 (File-LibMagic-0.96.tgz) = 1624150be5e0994948556f63481f2779b3ffa024
4RMD160 (File-LibMagic-0.96.tgz) = 7df156a037b0e8ccf24cd15b7bf65eb11f74d2b9 4RMD160 (File-LibMagic-0.96.tgz) = 7df156a037b0e8ccf24cd15b7bf65eb11f74d2b9
5Size (File-LibMagic-0.96.tgz) = 16942 bytes 5Size (File-LibMagic-0.96.tgz) = 16942 bytes
6SHA1 (patch-aa) = eac90a443400e92827f1a01c6dd61ae3e0b84a13 6SHA1 (patch-aa) = 55530d7bfe289051124a19c386b018c224e64f5e
cvs diff -r1.3 -r1.4 pkgsrc/devel/p5-File-LibMagic/patches/patch-aa (expand / switch to unified diff)

--- pkgsrc/devel/p5-File-LibMagic/patches/patch-aa 2009/05/17 13:54:38 1.3
+++ pkgsrc/devel/p5-File-LibMagic/patches/patch-aa 2009/05/30 20:02:07 1.4
@@ -1,15 +1,28 @@ @@ -1,15 +1,28 @@
1$NetBSD: patch-aa,v 1.3 2009/05/17 13:54:38 sno Exp $ 1$NetBSD: patch-aa,v 1.4 2009/05/30 20:02:07 sno Exp $
2 2
3Ensure we use the required ldflags for the platform. 3- Remove Devel::CheckLib invocation - it#s useless and won't work
 4 (RT #46543, #43826)
 5- Ensure we use the required ldflags for the platform.
4 6
5--- Makefile.PL.orig 2009-05-12 13:31:06.000000000 +0000 7--- Makefile.PL.orig 2009-05-12 13:31:06.000000000 +0000
6+++ Makefile.PL 2009-05-17 13:36:43.000000000 +0000 8+++ Makefile.PL 2009-05-30 19:47:40.000000000 +0000
7@@ -15,7 +15,7 @@ 9@@ -4,18 +4,13 @@
 10 use ExtUtils::MakeMaker;
 11 use Config qw/%Config/;
 12
 13-use lib qw(inc);
 14-use Devel::CheckLib;
 15-
 16-check_lib_or_exit( lib => 'magic', header => 'magic.h' );
 17-
 18 WriteMakefile(
 19 'NAME' => 'File::LibMagic',
 20 'VERSION_FROM' => 'LibMagic.pm', # finds $VERSION
8 'PREREQ_PM' => { }, 21 'PREREQ_PM' => { },
9 'ABSTRACT_FROM' => 'LibMagic.pm', # retrieve abstract from module 22 'ABSTRACT_FROM' => 'LibMagic.pm', # retrieve abstract from module
10 'AUTHOR' => 'Andreas Fitzner <andreas.fitzner@fv-berlin.de>', 23 'AUTHOR' => 'Andreas Fitzner <andreas.fitzner@fv-berlin.de>',
11- 'LIBS' => ['-lmagic -lz'], # e.g., '-lm' 24- 'LIBS' => ['-lmagic -lz'], # e.g., '-lm'
12+ 'LIBS' => [$ENV{LDFLAGS} . ' -lmagic -lz'], # e.g., '-lm' 25+ 'LIBS' => [$ENV{LDFLAGS} . ' -lmagic -lz'], # e.g., '-lm'
13 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING' 26 'DEFINE' => '', # e.g., '-DHAVE_SOMETHING'
14 'INC' => '-I.', # e.g., '-I. -I/usr/include/other' 27 'INC' => '-I.', # e.g., '-I. -I/usr/include/other'
15 # Un-comment this if you add C files to link with later: 28 # Un-comment this if you add C files to link with later: