From owner-svn-ports-head@FreeBSD.ORG Wed Oct 23 10:51:04 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 74E66156; Wed, 23 Oct 2013 10:51:04 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4828924F9; Wed, 23 Oct 2013 10:51:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NAp465032517; Wed, 23 Oct 2013 10:51:04 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NAp3j6032513; Wed, 23 Oct 2013 10:51:03 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201310231051.r9NAp3j6032513@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 23 Oct 2013 10:51:03 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 10:51:04 -0000 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)