From owner-svn-ports-head@freebsd.org Fri Oct 5 05:56:40 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 3B17310C32A5; Fri, 5 Oct 2018 05:56:40 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1E7F729E3; Fri, 5 Oct 2018 05:56:39 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C2E5D113C2; Fri, 5 Oct 2018 05:56:39 +0000 (UTC) (envelope-from des@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w955udCG041040; Fri, 5 Oct 2018 05:56:39 GMT (envelope-from des@FreeBSD.org) Received: (from des@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w955udFx041039; Fri, 5 Oct 2018 05:56:39 GMT (envelope-from des@FreeBSD.org) Message-Id: <201810050556.w955udFx041039@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: des set sender to des@FreeBSD.org using -f From: =?UTF-8?Q?Dag-Erling_Sm=c3=b8rgrav?= Date: Fri, 5 Oct 2018 05:56:39 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r481262 - in head/devel/p5-Devel-BeginLift: . files X-SVN-Group: ports-head X-SVN-Commit-Author: des X-SVN-Commit-Paths: in head/devel/p5-Devel-BeginLift: . files X-SVN-Commit-Revision: 481262 X-SVN-Commit-Repository: ports 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.27 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, 05 Oct 2018 05:56:40 -0000 Author: des Date: Fri Oct 5 05:56:39 2018 New Revision: 481262 URL: https://svnweb.freebsd.org/changeset/ports/481262 Log: Unbreak on recent Perl. Approved by: maintainer timeout Added: head/devel/p5-Devel-BeginLift/files/ head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs (contents, props changed) Modified: head/devel/p5-Devel-BeginLift/Makefile Modified: head/devel/p5-Devel-BeginLift/Makefile ============================================================================== --- head/devel/p5-Devel-BeginLift/Makefile Fri Oct 5 05:24:46 2018 (r481261) +++ head/devel/p5-Devel-BeginLift/Makefile Fri Oct 5 05:56:39 2018 (r481262) @@ -21,7 +21,7 @@ USE_PERL5= configure .include .if ${PERL_LEVEL} >= 502501 -BROKEN= Does not build, op_sibling usage. https://rt.cpan.org/Public/Bug/Display.html?id=115272 +EXTRA_PATCHES= ${PATCHDIR}/extra-patch-BeginLift.xs .endif .include Added: head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs Fri Oct 5 05:56:39 2018 (r481262) @@ -0,0 +1,44 @@ +--- BeginLift.xs.orig 2010-05-11 06:01:00 UTC ++++ BeginLift.xs +@@ -8,10 +8,6 @@ + + #include "hook_op_check_entersubforcv.h" + +-/* lifted from op.c */ +- +-#define LINKLIST(o) ((o)->op_next ? (o)->op_next : linklist((OP*)o)) +- + #ifndef linklist + # define linklist(o) THX_linklist(aTHX_ o) + STATIC OP *THX_linklist(pTHX_ OP *o) { +@@ -24,9 +20,9 @@ STATIC OP *THX_linklist(pTHX_ OP *o) { + o->op_next = LINKLIST(first); + kid = first; + for (;;) { +- if (kid->op_sibling) { +- kid->op_next = LINKLIST(kid->op_sibling); +- kid = kid->op_sibling; ++ if (OpHAS_SIBLING(kid)) { ++ kid->op_next = LINKLIST(OpSIBLING(kid)); ++ kid = OpSIBLING(kid); + } else { + kid->op_next = o; + break; +@@ -61,7 +57,7 @@ STATIC OP *lift_cb(pTHX_ OP *o, CV *cv, + PUSHMARK(SP); /* push a mark for the arguments */ + + /* push an arg for every sibling op */ +- for ( arg = curop->op_sibling; arg->op_sibling; arg = arg->op_sibling ) { ++ for ( arg = OpSIBLING(arg); OpHAS_SIBLING(arg); arg = OpSIBLING(arg) ) { + XPUSHs(sv_bless(newRV_inc(newSViv(PTR2IV(arg))), gv_stashpv("B::LISTOP", 0))); + } + +@@ -96,7 +92,7 @@ STATIC OP *lift_cb(pTHX_ OP *o, CV *cv, + + if (SvROK(sv) && sv_derived_from(sv, "B::OP")) { + OP *new = INT2PTR(OP *,SvIV((SV *)SvRV(sv))); +- new->op_sibling = NULL; ++ new->op_sibparent = NULL; + + /* FIXME this is bullshit */ + if ( (PL_opargs[new->op_type] & OA_CLASS_MASK) != OA_SVOP ) {