From f098c1b95fee3f26533933e7db8257fdcfc3a12f Mon Sep 17 00:00:00 2001 From: mat Date: Wed, 23 Oct 2013 10:51:03 +0000 Subject: Ah, mixed up CONFLICTS and CONFLICTS_INSTALL. Submitted by: az --- lang/perl5.12/Makefile | 2 +- lang/perl5.14/Makefile | 2 +- lang/perl5.16/Makefile | 2 +- lang/perl5.18/Makefile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'lang') diff --git a/lang/perl5.12/Makefile b/lang/perl5.12/Makefile index f1d7f36d4599..7d26e8685b2c 100644 --- a/lang/perl5.12/Makefile +++ b/lang/perl5.12/Makefile @@ -79,7 +79,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} # make PKGNAME unique among other lang/perl5.x PKGNAMESUFFIX= ${PERL_VER} # always add default perl5 pkgname to conflicts -CONFLICTS+= perl5-* +CONFLICTS_INSTALL+= perl5-* .endif .if defined(PERL_VENDOR_PREFIX) diff --git a/lang/perl5.14/Makefile b/lang/perl5.14/Makefile index 43253bfbe5f5..d46930bfb42a 100644 --- a/lang/perl5.14/Makefile +++ b/lang/perl5.14/Makefile @@ -76,7 +76,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} # make PKGNAME unique among other lang/perl5.x PKGNAMESUFFIX= ${PERL_VER} # always add default perl5 pkgname to conflicts -CONFLICTS+= perl5-* +CONFLICTS_INSTALL+= perl5-* .endif .if defined(PERL_VENDOR_PREFIX) diff --git a/lang/perl5.16/Makefile b/lang/perl5.16/Makefile index 1ef2e05c6985..ac330f312245 100644 --- a/lang/perl5.16/Makefile +++ b/lang/perl5.16/Makefile @@ -75,7 +75,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} # make PKGNAME unique among other lang/perl5.x PKGNAMESUFFIX= ${PERL_VER} # always add default perl5 pkgname to conflicts -CONFLICTS+= perl5-* +CONFLICTS_INSTALL+= perl5-* .endif .if defined(PERL_VENDOR_PREFIX) diff --git a/lang/perl5.18/Makefile b/lang/perl5.18/Makefile index 5eb0e7b5e7db..9523cbc68841 100644 --- a/lang/perl5.18/Makefile +++ b/lang/perl5.18/Makefile @@ -94,7 +94,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} # make PKGNAME unique among other lang/perl5.x PKGNAMESUFFIX= ${PERL_VER} # always add default perl5 pkgname to conflicts -CONFLICTS+= perl5-* +CONFLICTS_INSTALL+= perl5-* .endif .if defined(PERL_VENDOR_PREFIX) -- cgit