Date: Wed, 23 Oct 2013 10:51:03 +0000 (UTC) From: Mathieu Arnold <mat@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331368 - in head/lang: perl5.12 perl5.14 perl5.16 perl5.18 Message-ID: <201310231051.r9NAp3j6032513@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mat Date: Wed Oct 23 10:51:03 2013 New Revision: 331368 URL: http://svnweb.freebsd.org/changeset/ports/331368 Log: Ah, mixed up CONFLICTS and CONFLICTS_INSTALL. Submitted by: az Modified: head/lang/perl5.12/Makefile head/lang/perl5.14/Makefile head/lang/perl5.16/Makefile head/lang/perl5.18/Makefile Modified: head/lang/perl5.12/Makefile ============================================================================== --- head/lang/perl5.12/Makefile Wed Oct 23 10:49:47 2013 (r331367) +++ head/lang/perl5.12/Makefile Wed Oct 23 10:51:03 2013 (r331368) @@ -79,7 +79,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[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) Modified: head/lang/perl5.14/Makefile ============================================================================== --- head/lang/perl5.14/Makefile Wed Oct 23 10:49:47 2013 (r331367) +++ head/lang/perl5.14/Makefile Wed Oct 23 10:51:03 2013 (r331368) @@ -76,7 +76,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[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) Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Wed Oct 23 10:49:47 2013 (r331367) +++ head/lang/perl5.16/Makefile Wed Oct 23 10:51:03 2013 (r331368) @@ -75,7 +75,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[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) Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Wed Oct 23 10:49:47 2013 (r331367) +++ head/lang/perl5.18/Makefile Wed Oct 23 10:51:03 2013 (r331368) @@ -94,7 +94,7 @@ PKGNAMESUFFIX= ${PERL_VERSION:C/\.[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)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201310231051.r9NAp3j6032513>