Index: head/devel/p5-Devel-BeginLift/Makefile =================================================================== --- head/devel/p5-Devel-BeginLift/Makefile (revision 481261) +++ head/devel/p5-Devel-BeginLift/Makefile (revision 481262) @@ -1,27 +1,27 @@ # $FreeBSD$ PORTNAME= Devel-BeginLift PORTVERSION= 0.001003 PORTREVISION= 1 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- MAINTAINER= kuriyama@FreeBSD.org COMMENT= Perl extension to make selected sub calls evaluate at compile time BUILD_DEPENDS= ${RUN_DEPENDS} \ p5-ExtUtils-Depends>0:devel/p5-ExtUtils-Depends RUN_DEPENDS= \ p5-B-Hooks-OP-Check-EntersubForCV>=0.03:devel/p5-B-Hooks-OP-Check-EntersubForCV USES= perl5 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 Index: head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs =================================================================== --- head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs (nonexistent) +++ head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs (revision 481262) @@ -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 ) { Property changes on: head/devel/p5-Devel-BeginLift/files/extra-patch-BeginLift.xs ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property