From owner-svn-ports-head@FreeBSD.ORG Fri Apr 24 12:57:02 2015 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.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id A94F4796; Fri, 24 Apr 2015 12:57:02 +0000 (UTC) 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 988541685; Fri, 24 Apr 2015 12:57:02 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t3OCv2r6070523; Fri, 24 Apr 2015 12:57:02 GMT (envelope-from mat@FreeBSD.org) Received: (from mat@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t3OCv2Ap070522; Fri, 24 Apr 2015 12:57:02 GMT (envelope-from mat@FreeBSD.org) Message-Id: <201504241257.t3OCv2Ap070522@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: mat set sender to mat@FreeBSD.org using -f From: Mathieu Arnold Date: Fri, 24 Apr 2015 12:57:02 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r384636 - head/devel/p5-Data-Alias/files 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.20 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: Fri, 24 Apr 2015 12:57:02 -0000 Author: mat Date: Fri Apr 24 12:57:01 2015 New Revision: 384636 URL: https://svnweb.freebsd.org/changeset/ports/384636 Log: Fix with Perl 5.21.11. Sponsored by: Absolight Modified: head/devel/p5-Data-Alias/files/patch-Alias.xs Modified: head/devel/p5-Data-Alias/files/patch-Alias.xs ============================================================================== --- head/devel/p5-Data-Alias/files/patch-Alias.xs Fri Apr 24 12:15:27 2015 (r384635) +++ head/devel/p5-Data-Alias/files/patch-Alias.xs Fri Apr 24 12:57:01 2015 (r384636) @@ -140,17 +140,21 @@ tmp = kLISTOP->op_first; if (inside) op_null(tmp); -@@ -2001,6 +2035,9 @@ STATIC OP *da_ck_entersub(pTHX_ OP *o) { +@@ -2001,6 +2035,13 @@ STATIC OP *da_ck_entersub(pTHX_ OP *o) { while (kid->op_sibling != last) kid = kid->op_sibling; kid->op_sibling = Nullop; +#ifdef op_sibling_splice ++#if (PERL_COMBI_VERSION >= 5021011) ++ kid->op_moresib = 0; ++#else + kid->op_lastsib = 1; +#endif ++#endif cLISTOPx(cUNOPo->op_first)->op_last = kid; if (kid->op_type == OP_NULL && inside) kid->op_flags &= ~OPf_SPECIAL; -@@ -2008,6 +2045,14 @@ STATIC OP *da_ck_entersub(pTHX_ OP *o) { +@@ -2008,6 +2049,14 @@ STATIC OP *da_ck_entersub(pTHX_ OP *o) { return o; } @@ -165,7 +169,7 @@ MODULE = Data::Alias PACKAGE = Data::Alias -@@ -2025,6 +2070,10 @@ BOOT: +@@ -2025,6 +2074,10 @@ BOOT: PL_check[OP_RV2CV] = da_ck_rv2cv; da_old_ck_entersub = PL_check[OP_ENTERSUB]; PL_check[OP_ENTERSUB] = da_ck_entersub;