Fri Sep 4 14:07:51 2020 UTC ()
perl5: remove bogus CONFLICTS

The perl modules install into the vendor_perl subdirectory, so there is no
actual conflict.

Bump PKGREVISION.


(wiz)
diff -r1.266 -r1.267 pkgsrc/lang/perl5/Makefile
cvs diff -r1.266 -r1.267 pkgsrc/lang/perl5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/perl5/Makefile 2020/09/04 10:44:33 1.266
+++ pkgsrc/lang/perl5/Makefile 2020/09/04 14:07:51 1.267
@@ -1,91 +1,27 @@ @@ -1,91 +1,27 @@
1# $NetBSD: Makefile,v 1.266 2020/09/04 10:44:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.267 2020/09/04 14:07:51 wiz Exp $
2 2
3.include "license.mk" 3.include "license.mk"
4.include "Makefile.common" 4.include "Makefile.common"
5 5
 6PKGREVISION= 1
 7
6COMMENT= Practical Extraction and Report Language 8COMMENT= Practical Extraction and Report Language
7 9
8CONFLICTS+= perl-base-[0-9]* perl-thread-[0-9]* 10CONFLICTS+= perl-base-[0-9]* perl-thread-[0-9]*
9 11
10# CONFLICTS packages older than CORE modules version. 12# when updating perl, you can remove packages that are included
11# based on 'corelist -v ${PKGVERSION}' 13# in perl core, see
12# update based on 'corelist -diff ${PREV_PKGVERSION} ${PKGVERSION}' 14# corelist -diff ${PREV_PKGVERSION} ${PKGVERSION}
13CONFLICTS+= p5-Archive-Tar<2.36 
14CONFLICTS+= p5-Attribute-Handlers<1.01 
15CONFLICTS+= p5-AutoLoader<5.74 
16CONFLICTS+= p5-CPAN<2.2700 # 2.27 
17CONFLICTS+= p5-CPAN-Meta<2.150010 
18CONFLICTS+= p5-CPAN-Meta-Requirements<2.140 
19CONFLICTS+= p5-CPAN-Meta-YAML<0.018 
20CONFLICTS+= p5-Compress-Raw-Bzip2<2.093 
21CONFLICTS+= p5-Compress-Raw-Zlib<2.093 
22CONFLICTS+= p5-DB_File<1.853 
23CONFLICTS+= p5-Devel-PPPort<3.57 
24CONFLICTS+= p5-Digest<1.17.01 
25CONFLICTS+= p5-Digest-MD5<2.55.01 
26CONFLICTS+= p5-Digest-SHA<6.02 
27CONFLICTS+= p5-Encode<3.06 
28CONFLICTS+= p5-ExtUtils-CBuilder<0.28.02.34 # 0.280234 
29CONFLICTS+= p5-ExtUtils-Command<7.44 
30CONFLICTS+= p5-ExtUtils-Embed<1.35 
31CONFLICTS+= p5-ExtUtils-Install<2.14 
32CONFLICTS+= p5-ExtUtils-MakeMaker<7.44 
33CONFLICTS+= p5-ExtUtils-Manifest<1.72 
34CONFLICTS+= p5-ExtUtils-ParseXS<3.40 
35CONFLICTS+= p5-File-Path<2.16 
36CONFLICTS+= p5-File-Temp<0.23.09 # 0.2309 
37CONFLICTS+= p5-Getopt-Long<2.51 
38CONFLICTS+= p5-HTTP-Tiny<0.076 
39CONFLICTS+= p5-I18N-LangTags<0.44 
40CONFLICTS+= p5-IO<1.4300 # 1.43 
41CONFLICTS+= p5-IO-Compress<2.093 # IO::Compress::*, Compress::* 
42CONFLICTS+= p5-IO-Zlib<1.10 
43CONFLICTS+= p5-IPC-Cmd<1.04 
44CONFLICTS+= p5-IPC-SysV<2.07 
45CONFLICTS+= p5-JSON-PP<4.04 
46CONFLICTS+= p5-Locale-Maketext<1.29 
47CONFLICTS+= p5-Locale-Maketext-Simple<0.21.01 
48CONFLICTS+= p5-MIME-Base64<3.15 
49CONFLICTS+= p5-Math-Complex<1.59.01 
50CONFLICTS+= p5-Memoize<1.03.01 
51CONFLICTS+= p5-Module-CoreList<5.202006200 
52CONFLICTS+= p5-Module-Load<0.34 
53CONFLICTS+= p5-NEXT<0.67.01 
54CONFLICTS+= p5-Parse-CPAN-Meta<2.150010 
55CONFLICTS+= p5-Pod-Escapes<1.07 
56CONFLICTS+= p5-Pod-Simple<3.40 
57CONFLICTS+= p5-Pod-Usage<1.69 
58CONFLICTS+= p5-Storable<3.21 
59CONFLICTS+= p5-Sys-Syslog<0.36 
60CONFLICTS+= p5-Term-ANSIColor<5.01 
61CONFLICTS+= p5-Term-Cap<1.17 
62CONFLICTS+= p5-Term-ReadLine<1.17 
63# older for sysutils/shelldap 
64CONFLICTS+= p5-Test-Harness<3.42 
65CONFLICTS+= p5-Test-Simple<1.302175 
66CONFLICTS+= p5-Tie-File<1.06 
67CONFLICTS+= p5-Tie-RefHash<1.39 
68CONFLICTS+= p5-Time-HiRes<1.9764 
69CONFLICTS+= p5-Time-Local<1.28 
70CONFLICTS+= p5-Time-Piece<1.34.01 
71CONFLICTS+= p5-Unicode-Collate<1.27 
72CONFLICTS+= p5-Unicode-Normalize<1.27 
73CONFLICTS+= p5-XSLoader<0.30 
74CONFLICTS+= p5-autodie<2.32 
75CONFLICTS+= p5-constant<1.33 
76CONFLICTS+= p5-experimental<0.020 
77CONFLICTS+= p5-parent<0.238 
78CONFLICTS+= p5-version<0.9924 
79 15
80SUPERSEDES+= p5-Tie-File<=0.99 16SUPERSEDES+= p5-Tie-File<=0.99
81SUPERSEDES+= p5-Time-HiRes-[0-9]* 17SUPERSEDES+= p5-Time-HiRes-[0-9]*
82SUPERSEDES+= p5-DB_File-[0-9]* 18SUPERSEDES+= p5-DB_File-[0-9]*
83SUPERSEDES+= p5-Memoize<=1.03 19SUPERSEDES+= p5-Memoize<=1.03
84SUPERSEDES+= p5-I18N-LangTags<=0.39 20SUPERSEDES+= p5-I18N-LangTags<=0.39
85SUPERSEDES+= p5-Locale-Maketext<=1.23 21SUPERSEDES+= p5-Locale-Maketext<=1.23
86SUPERSEDES+= p5-experimental<=0.007 22SUPERSEDES+= p5-experimental<=0.007
87 23
88# XXX: requires that gcc use an external perl to avoid circular dependencies 24# XXX: requires that gcc use an external perl to avoid circular dependencies
89USE_GCC_RUNTIME= yes 25USE_GCC_RUNTIME= yes
90USE_LANGUAGES= c c99 26USE_LANGUAGES= c c99
91 27