diff options
| -rw-r--r-- | devel/p5-Params-Classify/Makefile | 8 | ||||
| -rw-r--r-- | devel/p5-Params-Classify/distinfo | 5 | ||||
| -rw-r--r-- | devel/p5-Params-Classify/files/patch-lib_Params_Classify.xs | 81 | ||||
| -rw-r--r-- | devel/p5-Params-Classify/pkg-plist | 2 |
4 files changed, 10 insertions, 86 deletions
diff --git a/devel/p5-Params-Classify/Makefile b/devel/p5-Params-Classify/Makefile index 7689719e767d..25055fa39139 100644 --- a/devel/p5-Params-Classify/Makefile +++ b/devel/p5-Params-Classify/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= Params-Classify -PORTVERSION= 0.013 -PORTREVISION= 1 +PORTVERSION= 0.014 CATEGORIES= devel perl5 MASTER_SITES= CPAN PKGNAMEPREFIX= p5- @@ -11,7 +10,12 @@ PKGNAMEPREFIX= p5- MAINTAINER= perl@FreeBSD.org COMMENT= Argument type classification +BUILD_DEPENDS= p5-Devel-CallChecker>=0.003:devel/p5-Devel-CallChecker + USES= perl5 USE_PERL5= modbuild +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Params/Classify/Classify.so + .include <bsd.port.mk> diff --git a/devel/p5-Params-Classify/distinfo b/devel/p5-Params-Classify/distinfo index ca3f837cc3d9..af9ed582c35b 100644 --- a/devel/p5-Params-Classify/distinfo +++ b/devel/p5-Params-Classify/distinfo @@ -1,2 +1,3 @@ -SHA256 (Params-Classify-0.013.tar.gz) = 4101af81c0a44728a220308db4b47c6a4a80d6d1c63f6973cf5f535752d39eb4 -SIZE (Params-Classify-0.013.tar.gz) = 21014 +TIMESTAMP = 1500204226 +SHA256 (Params-Classify-0.014.tar.gz) = 529ceb297b1baa1fee7f5487523fb872b6063d1e25c0ec204660fdb1e0b138d9 +SIZE (Params-Classify-0.014.tar.gz) = 21600 diff --git a/devel/p5-Params-Classify/files/patch-lib_Params_Classify.xs b/devel/p5-Params-Classify/files/patch-lib_Params_Classify.xs deleted file mode 100644 index 310312046488..000000000000 --- a/devel/p5-Params-Classify/files/patch-lib_Params_Classify.xs +++ /dev/null @@ -1,81 +0,0 @@ -From 0d301779bd42da52b4f8e13a667499846fc2cc55 Mon Sep 17 00:00:00 2001 -From: Reini Urban <rurban@cpanel.net> -Date: Tue, 14 Jun 2016 17:08:24 +0200 -Subject: [PATCH] Fix 5.25 or 5.22/24 with PERL_OP_PARENT - -Fixes RT #114490 ---- lib/Params/Classify.xs.orig 2010-11-16 20:35:47 UTC -+++ lib/Params/Classify.xs -@@ -123,6 +123,22 @@ static void *THX_ptr_table_fetch(pTHX_ P - # define sv_is_regexp(sv) 0 - #endif /* <5.11.0 */ - -+ -+#ifndef OpSIBLING -+# ifdef PERL_OP_PARENT -+# define OpSIBLING(o) (0 + (o)->op_moresib ? (o)->op_sibparent : NULL) -+# define OpMAYBESIB_set(o, sib, parent) \ -+ ((o)->op_sibparent = ((o)->op_moresib = cBOOL(sib)) ? (sib) : (parent)) -+# else -+# define OpSIBLING(o) (0 + (o)->op_sibling) -+# if PERL_VERSION_GE(5,11,0) -+# define OpMAYBESIB_set(o, sib, parent) ((o)->op_sibling = (sib)) -+# else -+# define OpMAYBESIB_set(o, sib, parent) ((o)->op_moresib = cBOOL(sib), (o)->op_sibling = (sib)) -+# endif -+# endif -+#endif -+ - #define sv_is_undef(sv) (!sv_is_glob(sv) && !sv_is_regexp(sv) && !SvOK(sv)) - - #define sv_is_string(sv) \ -@@ -625,8 +641,8 @@ static OP *myck_entersub(pTHX_ OP *op) - OP *(*ppfunc)(pTHX); - I32 cvflags; - pushop = cUNOPx(op)->op_first; -- if(!pushop->op_sibling) pushop = cUNOPx(pushop)->op_first; -- for(cvop = pushop; cvop->op_sibling; cvop = cvop->op_sibling) ; -+ if(!OpSIBLING(pushop)) pushop = cUNOPx(pushop)->op_first; -+ for(cvop = pushop; OpSIBLING(cvop); cvop = OpSIBLING(cvop)) ; - if(!(cvop->op_type == OP_RV2CV && - !(cvop->op_private & OPpENTERSUB_AMPER) && - (cv = rvop_cv(cUNOPx(cvop)->op_first)) && -@@ -635,20 +651,20 @@ static OP *myck_entersub(pTHX_ OP *op) - return nxck_entersub(aTHX_ op); - cvflags = CvXSUBANY(cv).any_i32; - op = nxck_entersub(aTHX_ op); /* for prototype checking */ -- aop = pushop->op_sibling; -- bop = aop->op_sibling; -+ aop = OpSIBLING(pushop); -+ bop = OpSIBLING(aop); - if(bop == cvop) { - if(!(cvflags & PC_ALLOW_UNARY)) return op; - unary: -- pushop->op_sibling = bop; -- aop->op_sibling = NULL; -+ OpMAYBESIB_set(pushop, bop, NULL); -+ OpMAYBESIB_set(aop, NULL, NULL); - op_free(op); - op = newUNOP(OP_NULL, 0, aop); - op->op_type = OP_RAND; - op->op_ppaddr = ppfunc; - op->op_private = (U8)cvflags; - return op; -- } else if(bop && bop->op_sibling == cvop) { -+ } else if(bop && OpSIBLING(bop) == cvop) { - if(!(cvflags & PC_ALLOW_BINARY)) return op; - if(ppfunc == THX_pp_check_sclass && - (cvflags & PC_TYPE_MASK) == SCLASS_REF) { -@@ -667,9 +683,9 @@ static OP *myck_entersub(pTHX_ OP *op) - cvflags &= ~PC_TYPE_MASK; - ppfunc = THX_pp_check_dyn_battr; - } -- pushop->op_sibling = cvop; -- aop->op_sibling = NULL; -- bop->op_sibling = NULL; -+ OpMAYBESIB_set(pushop, cvop, NULL); -+ OpMAYBESIB_set(aop, NULL, NULL); -+ OpMAYBESIB_set(bop, NULL, NULL); - op_free(op); - op = newBINOP(OP_NULL, 0, aop, bop); - op->op_type = OP_RAND; diff --git a/devel/p5-Params-Classify/pkg-plist b/devel/p5-Params-Classify/pkg-plist index ff1b1feb5e7c..7533483a5eba 100644 --- a/devel/p5-Params-Classify/pkg-plist +++ b/devel/p5-Params-Classify/pkg-plist @@ -1,3 +1,3 @@ -%%PERL5_MAN3%%/Params::Classify.3.gz %%SITE_ARCH%%/Params/Classify.pm %%SITE_ARCH%%/auto/Params/Classify/Classify.so +%%PERL5_MAN3%%/Params::Classify.3.gz |