diff options
Diffstat (limited to 'security')
-rw-r--r-- | security/p5-Digest-SHA2/Makefile | 13 | ||||
-rw-r--r-- | security/p5-Digest-SHA2/files/extrapatch-SHA2.xs | 18 | ||||
-rw-r--r-- | security/p5-Digest-Whirlpool/Makefile | 13 | ||||
-rw-r--r-- | security/p5-Digest-Whirlpool/files/extrapatch-Whirlpool.xs | 18 | ||||
-rw-r--r-- | security/p5-Net-SSLeay/Makefile | 11 | ||||
-rw-r--r-- | security/p5-Net-SSLeay/files/extrapatch-SSLeay.xs | 16 |
6 files changed, 3 insertions, 86 deletions
diff --git a/security/p5-Digest-SHA2/Makefile b/security/p5-Digest-SHA2/Makefile index bda2dfed68ea..884cdfc8df80 100644 --- a/security/p5-Digest-SHA2/Makefile +++ b/security/p5-Digest-SHA2/Makefile @@ -26,15 +26,4 @@ PERL_CONFIGURE= yes MAN3= Digest::SHA2.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-SHA2.xs - -post-patch: - ${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1); $$1/;' ${WRKSRC}/SHA2.pm - ${PERL} -pi -e '$$_="" if m{warnings}' ${WRKSRC}/SHA2.pm ${WRKSRC}/t/*.t - ${PERL} -pi -e 's/\)/, char **env\)/ if m{int main}' ${WRKSRC}/_sha2.c -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Digest-SHA2/files/extrapatch-SHA2.xs b/security/p5-Digest-SHA2/files/extrapatch-SHA2.xs deleted file mode 100644 index 714688236e03..000000000000 --- a/security/p5-Digest-SHA2/files/extrapatch-SHA2.xs +++ /dev/null @@ -1,18 +0,0 @@ ---- SHA2.xs.orig Sat Dec 24 21:15:29 2005 -+++ SHA2.xs Sat Dec 24 21:16:10 2005 -@@ -4,6 +4,15 @@ - #include "ppport.h" - #include "_sha2.c" - -+/* try to be compatible with older perls */ -+/* SvPV_nolen() macro first defined in 5.005_55 */ -+/* this is slow, not threadsafe, but works */ -+#include "patchlevel.h" -+#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55)) -+static STRLEN nolen_na; -+# define SvPV_nolen(sv) SvPV ((sv), nolen_na) -+#endif -+ - typedef struct sha2 { - SHA256_CTX ctx256; - SHA384_CTX ctx384; diff --git a/security/p5-Digest-Whirlpool/Makefile b/security/p5-Digest-Whirlpool/Makefile index f3235c6d1ec3..a238945bafbd 100644 --- a/security/p5-Digest-Whirlpool/Makefile +++ b/security/p5-Digest-Whirlpool/Makefile @@ -21,15 +21,4 @@ PERL_CONFIGURE= yes MAN1= whirlpoolsum.1 MAN3= Digest::Whirlpool.3 -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES= ${PATCHDIR}/extrapatch-Whirlpool.xs - -post-patch: - ${PERL} -pi -e 's/^our\s+([\$$\@\%]\w+)/use vars qw($$1); $$1/;' ${WRKSRC}/Whirlpool.pm - ${PERL} -pi -e '$$_="" if m{warnings}' ${WRKSRC}/Whirlpool.pm ${WRKSRC}/t/*.t - ${PERL} -pi -e 's/\)/, char **env\)/ if m{int main}' ${WRKSRC}/_whirlpool.c -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Digest-Whirlpool/files/extrapatch-Whirlpool.xs b/security/p5-Digest-Whirlpool/files/extrapatch-Whirlpool.xs deleted file mode 100644 index ae8d00026cd8..000000000000 --- a/security/p5-Digest-Whirlpool/files/extrapatch-Whirlpool.xs +++ /dev/null @@ -1,18 +0,0 @@ ---- Whirlpool.xs.orig Sat Dec 24 23:41:30 2005 -+++ Whirlpool.xs Sat Dec 24 23:42:16 2005 -@@ -4,6 +4,15 @@ - #include "ppport.h" - #include "_whirlpool.c" - -+/* try to be compatible with older perls */ -+/* SvPV_nolen() macro first defined in 5.005_55 */ -+/* this is slow, not threadsafe, but works */ -+#include "patchlevel.h" -+#if (PATCHLEVEL == 4) || ((PATCHLEVEL == 5) && (SUBVERSION < 55)) -+static STRLEN nolen_na; -+# define SvPV_nolen(sv) SvPV ((sv), nolen_na) -+#endif -+ - typedef struct whirlpool { - NESSIEstruct state; - }* Digest__Whirlpool; diff --git a/security/p5-Net-SSLeay/Makefile b/security/p5-Net-SSLeay/Makefile index f2db159d293d..29a08fd00ad6 100644 --- a/security/p5-Net-SSLeay/Makefile +++ b/security/p5-Net-SSLeay/Makefile @@ -32,13 +32,4 @@ post-install: ${INSTALL_DATA} ${SRCDIR}/req.conf ${EXAMPLESDIR}/req.conf .endif -.include <bsd.port.pre.mk> - -.if ${PERL_LEVEL} < 500600 -EXTRA_PATCHES+= ${PATCHDIR}/extrapatch-SSLeay.xs - -post-patch: - ${PERL} -pi -e 's/\$\^V/\$\]/' ${WRKSRC}/Net-SSLeay-Handle-*/Handle.pm -.endif - -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/security/p5-Net-SSLeay/files/extrapatch-SSLeay.xs b/security/p5-Net-SSLeay/files/extrapatch-SSLeay.xs deleted file mode 100644 index 3945c4adfd75..000000000000 --- a/security/p5-Net-SSLeay/files/extrapatch-SSLeay.xs +++ /dev/null @@ -1,16 +0,0 @@ ---- SSLeay.xs.orig Sat Dec 31 17:20:25 2005 -+++ SSLeay.xs Sat Dec 31 17:23:39 2005 -@@ -94,6 +94,13 @@ - } - #endif - -+#ifndef XST_mPVN -+#define XST_mPVN(i,v,n) (ST(i) = sv_2mortal(newSVpvn(v,n))) -+#endif -+#ifndef XSRETURN_PVN -+#define XSRETURN_PVN(v,n) STMT_START { XST_mPVN(0,v,n); XSRETURN(1); } STMT_END -+#endif -+ - /* OpenSSL-0.9.3a has some strange warning about this in - * openssl/des.h - */ |