From owner-svn-ports-all@FreeBSD.ORG Tue May 26 12:10:13 2015 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 423232CE; Tue, 26 May 2015 12:10:13 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2FDB5D8F; Tue, 26 May 2015 12:10:13 +0000 (UTC) (envelope-from mat@FreeBSD.org) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4QCADLL011956; Tue, 26 May 2015 12:10:13 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4QCAClq011952; Tue, 26 May 2015 12:10:12 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201505261210.t4QCAClq011952@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Tue, 26 May 2015 12:10:12 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r387465 - in head: Mk/Uses lang/perl5-devel 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.20 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: Tue, 26 May 2015 12:10:13 -0000 Author: mat Date: Tue May 26 12:10:11 2015 New Revision: 387465 URL: https://svnweb.freebsd.org/changeset/ports/387465 Log: Update to v5.22.0-RC2-1-gdfd03a6. Cleanup a bit the PKGNAMESUFFIX calculation. Also force the PERL_PORT variable for the -devel one, in case there is more than one with the same version. Changes: https://github.com/Perl/perl5/compare/v5.22.0-RC1...v5.22.0-RC2-1-gdfd03a6 Sponsored by: Absolight Modified: head/Mk/Uses/perl5.mk head/lang/perl5-devel/Makefile head/lang/perl5-devel/distinfo Modified: head/Mk/Uses/perl5.mk ============================================================================== --- head/Mk/Uses/perl5.mk Tue May 26 12:00:11 2015 (r387464) +++ head/Mk/Uses/perl5.mk Tue May 26 12:10:11 2015 (r387465) @@ -57,6 +57,8 @@ PERL_VERSION= 5.18.4 PERL_VERSION= 5.20.2 .elif ${PERL5_DEFAULT} == 5.21 || ${PERL5_DEFAULT} == devel PERL_VERSION= 5.22.0 +# Force PERL_PORT here in case two identical PERL_VERSION. +PERL_PORT?= perl5-devel .else IGNORE= Invalid perl5 version ${PERL5_DEFAULT} .endif Modified: head/lang/perl5-devel/Makefile ============================================================================== --- head/lang/perl5-devel/Makefile Tue May 26 12:00:11 2015 (r387464) +++ head/lang/perl5-devel/Makefile Tue May 26 12:10:11 2015 (r387465) @@ -27,7 +27,7 @@ CONFLICTS_INSTALL= perl5.*-* USE_GITHUB= yes GH_ACCOUNT= Perl GH_PROJECT= perl5 -GH_TAGNAME= v5.22.0-RC1 +GH_TAGNAME= v5.22.0-RC2-1-gdfd03a6 OPTIONS_DEFINE= DEBUG GDBM PERL_64BITINT PTHREAD \ MULTIPLICITY SITECUSTOMIZE @@ -163,11 +163,15 @@ PLIST_SUB+= PERL_VERSION=${PERL_VERSION} # 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]+$//} +.if ${PERL_VER} == ${PERL5_DEFAULT} || ${PERL5_DEFAULT} == devel # XXX +PKGNAMESUFFIX= 5 .else # make PKGNAME unique among other lang/perl5.x +.if defined(GH_TAGNAME) # XXX +PKGNAMESUFFIX= 5-devel +.else PKGNAMESUFFIX= ${PERL_VER} +.endif # always add default perl5 pkgname to conflicts CONFLICTS_INSTALL+= perl5-* .endif @@ -232,6 +236,9 @@ post-install: ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so ${LN} -sf libperl.so.${PERL_VERSION} ${STAGEDIR}${PREFIX}/${_ARCH_LIB}/CORE/libperl.so.${PERL_VER} ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/perl${PERL_VERSION} + # XXX Force PERL_PORT in case the devel has the same version as the + # latest release + ${ECHO_CMD} "PERL_PORT= perl5-devel" >> ${WRKDIR}/perl5_version ${INSTALL_DATA} ${WRKDIR}/perl5_version ${STAGEDIR}${PREFIX}/etc ${MKDIR} ${STAGEDIR}${SITE_ARCH}/machine ${MKDIR} ${STAGEDIR}${SITE_ARCH}/sys Modified: head/lang/perl5-devel/distinfo ============================================================================== --- head/lang/perl5-devel/distinfo Tue May 26 12:00:11 2015 (r387464) +++ head/lang/perl5-devel/distinfo Tue May 26 12:10:11 2015 (r387465) @@ -1,2 +1,2 @@ -SHA256 (perl/perl-5.22.0-RC1_GH0.tar.gz) = 318cc6616bd740c703ebd43e17da6c6cf1cbdb3701d2efb832d37d1e908ce517 -SIZE (perl/perl-5.22.0-RC1_GH0.tar.gz) = 17441498 +SHA256 (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 0570ad3a5f5e53cc309210eceb4d9719ef2f0fd4800e958ce5166bfc63e7a028 +SIZE (perl/perl-5.22.0-RC2-1_GH0.tar.gz) = 17416825