From owner-svn-ports-all@FreeBSD.ORG Wed Oct 23 10:29:06 2013 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 64E2D726; Wed, 23 Oct 2013 10:29:06 +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 43588237C; Wed, 23 Oct 2013 10:29:06 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r9NAT6Ga023367; Wed, 23 Oct 2013 10:29:06 GMT (envelope-from mat@svn.freebsd.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id r9NAT57x023363; Wed, 23 Oct 2013 10:29:05 GMT (envelope-from mat@svn.freebsd.org) Message-Id: <201310231029.r9NAT57x023363@svn.freebsd.org> From: Mathieu Arnold Date: Wed, 23 Oct 2013 10:29:05 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r331363 - 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-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 23 Oct 2013 10:29:06 -0000 Author: mat Date: Wed Oct 23 10:29:05 2013 New Revision: 331363 URL: http://svnweb.freebsd.org/changeset/ports/331363 Log: Have perl ports use different package names so that they don't conflict. Submitted by: az Approved by: az,bapt 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:26:46 2013 (r331362) +++ head/lang/perl5.12/Makefile Wed Oct 23 10:29:05 2013 (r331363) @@ -20,9 +20,7 @@ COMMENT= Practical Extraction and Report LICENSE= ART10 GPLv1 LICENSE_COMB= dual -CONFLICTS= perl-5.14.* perl-threaded-5.14.* \ - perl-5.16.* perl-threaded-5.16.* \ - perl-5.18.* perl-threaded-5.18.* +CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL @@ -71,6 +69,18 @@ CONFIGURE_ENV+= ${LOCALE_CLEANUP} UNAME_ MAKE_ENV+= ${LOCALE_CLEANUP} .include +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +# if this port is default due PERL5_DEFAULT +# change PKGNAME to reflect this +.if ${PERL_VER} == ${PERL5_DEFAULT} +PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +.else +# make PKGNAME unique among other lang/perl5.x +PKGNAMESUFFIX= ${PERL_VER} +# always add default perl5 pkgname to conflicts +CONFLICTS+= perl5-* +.endif .if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ Modified: head/lang/perl5.14/Makefile ============================================================================== --- head/lang/perl5.14/Makefile Wed Oct 23 10:26:46 2013 (r331362) +++ head/lang/perl5.14/Makefile Wed Oct 23 10:29:05 2013 (r331363) @@ -20,9 +20,7 @@ COMMENT= Practical Extraction and Report LICENSE= ART10 GPLv1 LICENSE_COMB= dual -CONFLICTS= perl-5.12.* perl-threaded-5.12.* \ - perl-5.16.* perl-threaded-5.16.* \ - perl-5.18.* perl-threaded-5.18.* +CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL @@ -68,6 +66,18 @@ CONFIGURE_ENV+= ${LOCALE_CLEANUP} UNAME_ MAKE_ENV+= ${LOCALE_CLEANUP} .include +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +# if this port is default due PERL5_DEFAULT +# change PKGNAME to reflect this +.if ${PERL_VER} == ${PERL5_DEFAULT} +PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +.else +# make PKGNAME unique among other lang/perl5.x +PKGNAMESUFFIX= ${PERL_VER} +# always add default perl5 pkgname to conflicts +CONFLICTS+= perl5-* +.endif .if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ Modified: head/lang/perl5.16/Makefile ============================================================================== --- head/lang/perl5.16/Makefile Wed Oct 23 10:26:46 2013 (r331362) +++ head/lang/perl5.16/Makefile Wed Oct 23 10:29:05 2013 (r331363) @@ -20,9 +20,7 @@ COMMENT= Practical Extraction and Report LICENSE= ART10 GPLv1 LICENSE_COMB= dual -CONFLICTS= perl-5.12.* perl-threaded-5.12.* \ - perl-5.14.* perl-threaded-5.14.* \ - perl-5.18.* perl-threaded-5.18.* +CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* OPTIONS_DEFINE= DEBUG GDBM PERL_MALLOC PERL_64BITINT THREADS PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL @@ -67,6 +65,18 @@ CONFIGURE_ENV+= ${LOCALE_CLEANUP} UNAME_ MAKE_ENV+= ${LOCALE_CLEANUP} .include +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +# if this port is default due PERL5_DEFAULT +# change PKGNAME to reflect this +.if ${PERL_VER} == ${PERL5_DEFAULT} +PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +.else +# make PKGNAME unique among other lang/perl5.x +PKGNAMESUFFIX= ${PERL_VER} +# always add default perl5 pkgname to conflicts +CONFLICTS+= perl5-* +.endif .if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \ Modified: head/lang/perl5.18/Makefile ============================================================================== --- head/lang/perl5.18/Makefile Wed Oct 23 10:26:46 2013 (r331362) +++ head/lang/perl5.18/Makefile Wed Oct 23 10:29:05 2013 (r331363) @@ -20,9 +20,7 @@ COMMENT= Practical Extraction and Report LICENSE= ART10 GPLv1 LICENSE_COMB= dual -CONFLICTS= perl-5.12.* perl-threaded-5.12.* \ - perl-5.14.* perl-threaded-5.14.* \ - perl-5.16.* perl-threaded-5.16.* +CONFLICTS_INSTALL= perl5.12-* perl5.14-* perl5.16-* perl5.18-* OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE USE_PERL @@ -86,6 +84,18 @@ CONFIGURE_ENV+= ${LOCALE_CLEANUP} UNAME_ MAKE_ENV+= ${LOCALE_CLEANUP} .include +.include "${PORTSDIR}/Mk/bsd.default-versions.mk" + +# if this port is default due PERL5_DEFAULT +# change PKGNAME to reflect this +.if ${PERL_VER} == ${PERL5_DEFAULT} +PKGNAMESUFFIX= ${PERL_VERSION:C/\.[0-9]+\.[0-9]+$//} +.else +# make PKGNAME unique among other lang/perl5.x +PKGNAMESUFFIX= ${PERL_VER} +# always add default perl5 pkgname to conflicts +CONFLICTS+= perl5-* +.endif .if defined(PERL_VENDOR_PREFIX) CONFIGURE_ARGS+= \