pkgsrc-Bugs archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

Re: pkg/50996: p5-Getopt-Long-2.46nb1 fails with Conflicting PLIST with p5-Perl4-CoreLibs-0.003nb5



My instant fix is attached.
  - Add DEPENDS+= p5-Perl4-CoreLibs
  - Remove newgetopt.pl from Getopt-Long.pm
    (Fortunately the files are exactly the same as v1.18)
---
mef%NetBSD.org@localhost
Makoto Fujiwara, 
Chiba, Japan, Narita Airport and Disneyland prefecture.

Index: devel/p5-Getopt-Long/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/devel/p5-Getopt-Long/Makefile,v
retrieving revision 1.24
diff -u -u -p -r1.24 Makefile
--- devel/p5-Getopt-Long/Makefile	15 Nov 2015 04:54:38 -0000	1.24
+++ devel/p5-Getopt-Long/Makefile	25 Apr 2016 13:03:00 -0000
@@ -10,6 +10,8 @@ HOMEPAGE=		http://search.cpan.org/dist/G
 COMMENT=		Extended processing of command line options
 LICENSE=		${PERL5_LICENSE}
 
+DEPENDS+=	p5-Perl4-CoreLibs-[0-9]*:../../devel/p5-Perl4-CoreLibs
+
 REPLACE_PERL+=	lib/Getopt/Long.pm
 
 USE_LANGUAGES=	# empty
Index: devel/p5-Getopt-Long/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/devel/p5-Getopt-Long/distinfo,v
retrieving revision 1.13
diff -u -u -p -r1.13 distinfo
--- devel/p5-Getopt-Long/distinfo	15 Nov 2015 04:54:38 -0000	1.13
+++ devel/p5-Getopt-Long/distinfo	25 Apr 2016 13:03:00 -0000
@@ -4,3 +4,4 @@ SHA1 (Getopt-Long-2.48.tar.gz) = ede3083
 RMD160 (Getopt-Long-2.48.tar.gz) = f8a517d271ef8325f206d0fe719230d051229e1f
 SHA512 (Getopt-Long-2.48.tar.gz) = 29e15d0e931225886cfcc31efc3b37501aa9453d5f5655ff116286faa7015712770d4da22b4bcecb775cdd8af1ceb535c0f03aeab55244de1acc51886ae835c8
 Size (Getopt-Long-2.48.tar.gz) = 42740 bytes
+SHA1 (patch-Makefile.PL) = 6be5f0773432d6a28c5f1b43afdcf6fed0fd0b54
Index: devel/p5-Getopt-Long/patches/patch-Makefile.PL
===================================================================
RCS file: devel/p5-Getopt-Long/patches/patch-Makefile.PL
diff -N devel/p5-Getopt-Long/patches/patch-Makefile.PL
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ devel/p5-Getopt-Long/patches/patch-Makefile.PL	25 Apr 2016 13:03:00 -0000
@@ -0,0 +1,16 @@
+$NetBSD$
+
+newgetopt.pl does exist in p5-Perl4-CoreLibs. To co-exist
+with that,
+
+--- Makefile.PL.orig	2013-07-08 15:14:42.000000000 +0900
++++ Makefile.PL	2016-04-25 22:02:20.000000000 +0900
+@@ -89,7 +89,7 @@ WriteMakefile(
+         ),
+ 
+ 	INSTALLDIRS => ($] < 5.011 ? 'perl' : 'site'),
+-	PM 	  => { "lib/newgetopt.pl"  => '$(INST_LIB)/newgetopt.pl',
++	PM 	  => { 
+ 		       "lib/Getopt/Long.pm" => '$(INST_LIB)/Getopt/Long.pm',
+ 		     },
+ 	dist      => { COMPRESS => 'gzip', SUFFIX => 'gz',


Home | Main Index | Thread Index | Old Index