summaryrefslogtreecommitdiff
path: root/lang/perl5
diff options
context:
space:
mode:
authorobache <obache>2013-06-17 05:21:45 +0000
committerobache <obache>2013-06-17 05:21:45 +0000
commit5b1458787cae6c690c8b6df4bddaa65dcbb7e101 (patch)
treef85376007d5c18a76b6a733f6549b26aaf691a45 /lang/perl5
parent04edab4f5962c1f5a1c6550bb6a6b7741170f852 (diff)
downloadpkgsrc-5b1458787cae6c690c8b6df4bddaa65dcbb7e101.tar.gz
No reason to mark as CONFLICTS with p5-Locale-Maketext-1.[0-9]*{,nb*},
core one is 1.22 whereas misc/p5-Locale-Maketext is 1.23.
Diffstat (limited to 'lang/perl5')
-rw-r--r--lang/perl5/Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile
index 43b48cf327f..7c0f3fe3fa6 100644
--- a/lang/perl5/Makefile
+++ b/lang/perl5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.202 2013/06/06 14:20:14 jperkin Exp $
+# $NetBSD: Makefile,v 1.203 2013/06/17 05:21:45 obache Exp $
.include "license.mk"
.include "Makefile.common"
@@ -10,7 +10,7 @@ CONFLICTS= perl-base-[0-9]* perl-thread-[0-9]* \
p5-Tie-File-0.96{,nb*} \
p5-Memoize-1.01{,nb*} \
p5-I18N-LangTags<0.35 \
- p5-Locale-Maketext-1.[0-9]*{,nb*} \
+ p5-Locale-Maketext<1.22 \
p5-Locale-Maketext-Simple<0.21 \
p5-Digest<=1.16 \
p5-Digest-MD5<=2.39 \