Update zxid and p5-Net-SAML to 1.42.

While here:
- Strip the p5-Net-SAML XS module.
- use Uses:localbase in zxid
- Replace obtuse compound statements with more straightforward invocations
- Add spacing for legibility

6 files changed, 22 insertions, 32 deletions

diff --git a/security/p5-Net-SAML/Makefile b/security/p5-Net-SAML/Makefile
index 8aa15626cbe6..739ac5e66b43 100644
--- a/security/p5-Net-SAML/Makefile
+++ b/security/p5-Net-SAML/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=	Net-SAML
-PORTVERSION=	1.30
+PORTVERSION=	1.42
 CATEGORIES=	security perl5
 MASTER_SITES=	http://zxid.org/ \
 		CPAN
@@ -31,6 +31,9 @@ post-patch:
 	@${REINPLACE_CMD} -e '/INC/ s|-I\.\.|& -I${LOCALBASE}/include|; /LIBS/ s|-L\.\.|-L${LOCALBASE}/lib|; s|-ldl||' ${WRKSRC}/Makefile.PL
 
 post-install:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Net/SAML/SAML.so
+
+post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	(cd ${WRKSRC}/ && ${INSTALL_SCRIPT} ../zxid.pl ../zxidhlo.pl ${STAGEDIR}${EXAMPLESDIR})
 
diff --git a/security/p5-Net-SAML/distinfo b/security/p5-Net-SAML/distinfo
index ba2246afb3d5..a0eca9a61cde 100644
--- a/security/p5-Net-SAML/distinfo
+++ b/security/p5-Net-SAML/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zxid-1.30.tgz) = 5d8353777064293ec58495953c576f6ef71f6818afd9877a8e81d0f4ca9eba1b
-SIZE (zxid-1.30.tgz) = 2132144
+SHA256 (zxid-1.42.tgz) = 8b936c8a011cc6fc56d19c6a83cd2dede36bb16b6453b81e45ee8811b9272b10
+SIZE (zxid-1.42.tgz) = 2164542
diff --git a/security/p5-Net-SAML/files/patch-SAML__wrap.c b/security/p5-Net-SAML/files/patch-SAML__wrap.c
deleted file mode 100644
index 7a00ec5f181b..000000000000
--- a/security/p5-Net-SAML/files/patch-SAML__wrap.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- SAML_wrap.c.orig	2014-11-06 12:22:29 UTC
-+++ SAML_wrap.c
-@@ -1442,7 +1442,9 @@ SWIG_Perl_SetModule(swig_module_info *mo
-   #undef eof
- #endif
- #ifdef bool
--  #undef bool
-+  #ifndef __bool_true_false_are_defined
-+    #undef bool
-+  #endif
- #endif
- #ifdef close
-   #undef close
diff --git a/security/zxid/Makefile b/security/zxid/Makefile
index 85b1f23edbca..dcec9af56bdf 100644
--- a/security/zxid/Makefile
+++ b/security/zxid/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	zxid
-PORTVERSION=	1.22
+PORTVERSION=	1.42
 CATEGORIES=	security www
 MASTER_SITES=	http://zxid.org/
 
@@ -13,7 +13,7 @@ LICENSE=	APACHE20
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
-USES=		gmake tar:tgz
+USES=		gmake localbase tar:tgz
 USE_OPENSSL=	yes
 USE_CSTD=	gnu89
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
@@ -25,8 +25,7 @@ ALL_TARGET=	default smime libzxid.so.0.0
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
-CFLAGS+=	-I${LOCALBASE}/include -D_LSEEK_DECLARED -fPIC
-LDFLAGS+=	-L${LOCALBASE}/lib
+CFLAGS+=	-D_LSEEK_DECLARED -fPIC
 
 OPTIONS_DEFINE=	DOCS
 
@@ -40,25 +39,25 @@ post-patch:
 		 /^SHARED/s|--export-all-symbols|| ; \
 		 /..error /d ; \
 		 /which gcc/d' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e \
-		's|<malloc.h>|<stdlib.h>|' ${WRKSRC}/zxidconf.c
+	@${REINPLACE_CMD} -e \ 's|<malloc.h>|<stdlib.h>|' \
+		${WRKSRC}/zxidconf.c ${WRKSRC}/zxididp.c
 
 do-install:
 	(cd ${WRKSRC} && ${INSTALL_PROGRAM} ${ZXID_BINS} \
 		${STAGEDIR}${PREFIX}/bin)
+
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/zx
 	${LN} -sf ../zxid/zx.h ${STAGEDIR}${PREFIX}/include/zx/zx.h
 	@${MKDIR} ${STAGEDIR}${PREFIX}/include/zxid
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.h c/*.h \
-		${STAGEDIR}${PREFIX}/include/zxid)
-	(cd ${WRKSRC} && ${INSTALL_DATA} libzxid.a \
-		${STAGEDIR}${PREFIX}/lib)
-	(cd ${WRKSRC} && ${INSTALL_LIB} libzxid.so.0.0 \
-		${STAGEDIR}${PREFIX}/lib)
+	${INSTALL_DATA} ${WRKSRC}/*.h ${WRKSRC}/c/*.h \
+		${STAGEDIR}${PREFIX}/include/zxid
+
+	${INSTALL_DATA} ${WRKSRC}/libzxid.a ${STAGEDIR}${PREFIX}/lib
+	${INSTALL_LIB} ${WRKSRC}/libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib
 	${LN} -sf libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib/libzxid.so
 	${LN} -sf libzxid.so.0.0 ${STAGEDIR}${PREFIX}/lib/libzxid.so.0
+
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	(cd ${WRKSRC} && ${INSTALL_DATA} *.pd \
-		${STAGEDIR}${DOCSDIR})
+	${INSTALL_DATA} ${WRKSRC}/*.pd ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/security/zxid/distinfo b/security/zxid/distinfo
index ab88ff34215d..a0eca9a61cde 100644
--- a/security/zxid/distinfo
+++ b/security/zxid/distinfo
@@ -1,2 +1,2 @@
-SHA256 (zxid-1.22.tgz) = fcef4f1fc7f3c26ebb8eaffb03494c82c71f807ba02993014535aca69f767a49
-SIZE (zxid-1.22.tgz) = 2102806
+SHA256 (zxid-1.42.tgz) = 8b936c8a011cc6fc56d19c6a83cd2dede36bb16b6453b81e45ee8811b9272b10
+SIZE (zxid-1.42.tgz) = 2164542
diff --git a/security/zxid/pkg-plist b/security/zxid/pkg-plist
index 711dae46179e..88e6d6f8acb6 100644
--- a/security/zxid/pkg-plist
+++ b/security/zxid/pkg-plist
@@ -13,6 +13,7 @@ bin/zxidwsctool
 bin/zxlogview
 bin/zxpasswd
 include/zx/zx.h
+include/zxid/HRR.h
 include/zxid/akbox.h
 include/zxid/aktab.h
 include/zxid/errmac.h