p5-Sereal-Encoder: update to 3.015.

3.015 Thu Sep  1 20:18:44 CEST 2016
    * Fix builds under 5.25+

4 files changed, 8 insertions, 105 deletions

diff --git a/converters/p5-Sereal-Encoder/Makefile b/converters/p5-Sereal-Encoder/Makefile
index a2d86006d69..3316233cd34 100644
--- a/converters/p5-Sereal-Encoder/Makefile
+++ b/converters/p5-Sereal-Encoder/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.10 2017/06/05 14:22:22 ryoon Exp $
+# $NetBSD: Makefile,v 1.11 2017/09/17 08:25:14 wiz Exp $
 
-DISTNAME=	Sereal-Encoder-3.014
+DISTNAME=	Sereal-Encoder-3.015
 PKGNAME=	p5-${DISTNAME}
-PKGREVISION=	3
 CATEGORIES=	security perl5 converters
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN:=../../CPAN/authors/id/Y/YV/YVES/}
 
@@ -11,6 +10,7 @@ HOMEPAGE=	http://search.cpan.org/dist/Sereal-Encoder/
 COMMENT=	Perl5 module for fast, compact, powerful binary serialization
 LICENSE=	${PERL5_LICENSE}
 
+BUILD_DEPENDS+=	p5-Test-Deep-[0-9]*:../../devel/p5-Test-Deep
 BUILD_DEPENDS+=	p5-Test-LongString-[0-9]*:../../devel/p5-Test-LongString
 BUILD_DEPENDS+=	p5-Test-Warn-[0-9]*:../../devel/p5-Test-Warn
 BUILD_DEPENDS+=	p5-Sereal-Decoder>=2.03:../../converters/p5-Sereal-Decoder
diff --git a/converters/p5-Sereal-Encoder/distinfo b/converters/p5-Sereal-Encoder/distinfo
index 9a0f922b5d7..b9a1fcc54ac 100644
--- a/converters/p5-Sereal-Encoder/distinfo
+++ b/converters/p5-Sereal-Encoder/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.9 2017/06/11 23:58:41 ryoon Exp $
+$NetBSD: distinfo,v 1.10 2017/09/17 08:25:14 wiz Exp $
 
-SHA1 (Sereal-Encoder-3.014.tar.gz) = 8cda51758cd1d22aa307efe8c85423511a12884a
-RMD160 (Sereal-Encoder-3.014.tar.gz) = bef412b1dd0fa8510decd5a048d8bbaf922999cf
-SHA512 (Sereal-Encoder-3.014.tar.gz) = 4891cb9189abe77012d14ba778156806f9d1708bce73015ce4d1d06ce4aa62abd0f9af4f98a64c547e55fa2298770f45aa2b0b99cc00e8e0f6a022df84bb41b8
-Size (Sereal-Encoder-3.014.tar.gz) = 377995 bytes
-SHA1 (patch-Encoder.xs) = 29082f3e0dab51efac0c6a61a08827fe3308f343
-SHA1 (patch-snappy_csnappy__internal__userspace.h) = 604f36231909881d4c424c06cd0b6065b4912006
+SHA1 (Sereal-Encoder-3.015.tar.gz) = 020c4ed04ea70a188285110f5a13d34e489005cd
+RMD160 (Sereal-Encoder-3.015.tar.gz) = 03b48337f14b90db125306198105f8a86ef73eaf
+SHA512 (Sereal-Encoder-3.015.tar.gz) = 82dc43be1f1ec87fb4a582a4cac8bfe5b4e6e8f25645930e2f84c4b253904cf3390e36efdf744781d9211d0e73034da82f5cff131213be6ea20fdfa11a0b397c
+Size (Sereal-Encoder-3.015.tar.gz) = 383347 bytes
diff --git a/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs b/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs
deleted file mode 100644
index 1c0c1f27f30..00000000000
--- a/converters/p5-Sereal-Encoder/patches/patch-Encoder.xs
+++ /dev/null
@@ -1,65 +0,0 @@
-$NetBSD: patch-Encoder.xs,v 1.1 2017/06/07 14:33:24 ryoon Exp $
-
-* Fix build with Perl 5.26.0
-  Like devel/p5-Params-Classify/patches/patch-lib_Params_Classify.xs
-
---- Encoder.xs.orig	2015-11-27 01:30:50.000000000 +0000
-+++ Encoder.xs
-@@ -20,6 +20,27 @@
- # define GvCV_set(gv, cv) (GvCV(gv) = (cv))
- #endif
- 
-+#ifndef OpHAS_SIBLING
-+#  define OpHAS_SIBLING(o)		(cBOOL((o)->op_sibling))
-+#endif
-+
-+#ifndef OpSIBLING
-+#  define OpSIBLING(o)			(0 + (o)->op_sibling)
-+#endif
-+
-+#ifndef OpMORESIB_set
-+#  define OpMORESIB_set(o, sib)		((o)->op_sibling = (sib))
-+#endif
-+
-+#ifndef OpLASTSIB_set
-+#  define OpLASTSIB_set(o, parent)	((o)->op_sibling = NULL)
-+#endif
-+
-+#ifndef OpMAYBESIB_set
-+#  define OpMAYBESIB_set(o, sib, parent)	((o)->op_sibling = (sib))
-+#endif
-+
-+
- #if defined(cv_set_call_checker) && defined(XopENTRY_set)
- # define USE_CUSTOM_OPS 1
- #else
-@@ -88,14 +109,14 @@ THX_ck_entersub_args_sereal_encode_with_
- 
-   entersubop = ck_entersub_args_proto(entersubop, namegv, ckobj);
-   pushop = cUNOPx(entersubop)->op_first;
--  if (!pushop->op_sibling)
-+  if (!OpHAS_SIBLING(pushop))
-     pushop = cUNOPx(pushop)->op_first;
--  firstargop = pushop->op_sibling;
-+  firstargop = OpSIBLING(pushop);
- 
--  for (cvop = firstargop; cvop->op_sibling; cvop = cvop->op_sibling) ;
-+  for (cvop = firstargop; OpHAS_SIBLING(cvop); cvop = OpSIBLING(cvop)) ;
- 
-   for (arity = 0, lastargop = pushop, argop = firstargop; argop != cvop;
--       lastargop = argop, argop = argop->op_sibling)
-+       lastargop = argop, argop = OpSIBLING(argop))
-   {
-     arity++;
-   }
-@@ -106,8 +127,8 @@ THX_ck_entersub_args_sereal_encode_with_
-   /* If we get here, we can replace the entersub with a suitable
-    * sereal_encode_with_object custom OP. */
- 
--  pushop->op_sibling = cvop;
--  lastargop->op_sibling = NULL;
-+  OpLASTSIB_set(pushop, cvop);
-+  OpLASTSIB_set(lastargop, NULL);
-   op_free(entersubop);
-   newop = newUNOP(OP_NULL, 0, firstargop);
-   newop->op_type    = OP_CUSTOM;
diff --git a/converters/p5-Sereal-Encoder/patches/patch-snappy_csnappy__internal__userspace.h b/converters/p5-Sereal-Encoder/patches/patch-snappy_csnappy__internal__userspace.h
deleted file mode 100644
index 95bbb32d031..00000000000
--- a/converters/p5-Sereal-Encoder/patches/patch-snappy_csnappy__internal__userspace.h
+++ /dev/null
@@ -1,30 +0,0 @@
-$NetBSD: patch-snappy_csnappy__internal__userspace.h,v 1.1 2016/12/15 01:53:34 wiedi Exp $
-
-reorder so that __sun matches before __GNUC__
-
---- snappy/csnappy_internal_userspace.h.orig	2015-11-24 17:55:03.000000000 +0000
-+++ snappy/csnappy_internal_userspace.h
-@@ -154,11 +154,6 @@ Albert Lee
- #define __LITTLE_ENDIAN LITTLE_ENDIAN
- #define __BIG_ENDIAN BIG_ENDIAN
- 
--#elif defined(__GNUC__) || defined(__ANDROID__) || defined(__CYGWIN__)
--
--#include <endian.h>
--#include <byteswap.h>
--
- #elif defined(__sun)
- 
- #include <sys/byteorder.h>
-@@ -173,6 +168,11 @@ Albert Lee
- #define __BYTE_ORDER __BIG_ENDIAN
- #endif
- 
-+#elif defined(__GNUC__) || defined(__ANDROID__) || defined(__CYGWIN__)
-+
-+#include <endian.h>
-+#include <byteswap.h>
-+
- #elif defined(__hpux)
- 
- #ifdef __LP64__