Date: Sun, 12 May 2019 16:37:12 +0000 (UTC) From: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r501410 - in head/devel/p5-Devel-BeginLift: . files Message-ID: <201905121637.x4CGbC0c011505@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: sunpoet Date: Sun May 12 16:37:12 2019 New Revision: 501410 URL: https://svnweb.freebsd.org/changeset/ports/501410 Log: Remove outdated PERL_LEVEL check With hat: perl Added: head/devel/p5-Devel-BeginLift/files/patch-BeginLift.xs - copied unchanged from r501409, head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs Deleted: head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs Modified: head/devel/p5-Devel-BeginLift/Makefile Modified: head/devel/p5-Devel-BeginLift/Makefile ============================================================================== --- head/devel/p5-Devel-BeginLift/Makefile Sun May 12 16:37:06 2019 (r501409) +++ head/devel/p5-Devel-BeginLift/Makefile Sun May 12 16:37:12 2019 (r501410) @@ -18,10 +18,4 @@ RUN_DEPENDS= \ USES= perl5 USE_PERL5= configure -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} >= 502501 -EXTRA_PATCHES+= ${PATCHDIR}/extra-patch-BeginLift.xs -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> Copied: head/devel/p5-Devel-BeginLift/files/patch-BeginLift.xs (from r501409, 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/patch-BeginLift.xs Sun May 12 16:37:12 2019 (r501410, copy of r501409, head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs) @@ -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 ) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201905121637.x4CGbC0c011505>