Index: head/security/zxid/Makefile
===================================================================
--- head/security/zxid/Makefile	(revision 410939)
+++ head/security/zxid/Makefile	(revision 410940)
@@ -1,63 +1,67 @@
 # Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
 
 PORTNAME=	zxid
 PORTVERSION=	1.42
 CATEGORIES=	security www
 MASTER_SITES=	http://zxid.org/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Open Source IdM for the Masses - SAML SSO
 
-LICENSE=	APACHE20
+LICENSE=	E2ETA
+LICENSE_NAME=	End2End Trust Architecture (e2eta) Software Copying
+LICENSE_FILE=	${WRKSRC}/COPYING
+LICENSE_PERMS=	# none
 
 LIB_DEPENDS=	libcurl.so:${PORTSDIR}/ftp/curl
 
 USES=		gmake localbase tar:tgz
 USE_OPENSSL=	yes
 USE_CSTD=	gnu89
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS}" \
 		LD="${CC}" LDFLAGS="${LDFLAGS}" \
 		PREFIX="${PREFIX}" OPENSSL_ROOT="${OPENSSLBASE}" \
 		POSTLIBS="${LDFLAGS}" TARGET="${OPSYS:tl}" \
 		V=1
 ALL_TARGET=	default smime libzxid.so.0.0
 USE_LDCONFIG=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CFLAGS+=	-D_LSEEK_DECLARED -fPIC
 
 OPTIONS_DEFINE=	DOCS
 
 ZXID_BINS=	smime zxcall zxcot zxdecode zxencdectest zxidhlo \
 		zxidhlowsf zxidhrxmlwsc zxidhrxmlwsp zxididp zxidsimple \
 		zxidwsctool zxlogview zxpasswd
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/^LIBS/s|-lpthread|-pthread| ; \
 		 /^SHARED/s|--export-all-symbols|| ; \
 		 /..error /d ; \
 		 /which gcc/d' ${WRKSRC}/Makefile
 	@${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
 	${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
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/*.pd ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/security/zxid/files/patch-pkcs12.c
===================================================================
--- head/security/zxid/files/patch-pkcs12.c	(revision 410939)
+++ head/security/zxid/files/patch-pkcs12.c	(revision 410940)
@@ -1,13 +1,13 @@
---- pkcs12.c.orig
+--- pkcs12.c.orig	2016-02-29 00:16:50 UTC
 +++ pkcs12.c
-@@ -95,6 +95,10 @@
- #define SMIME_INTERNALS  /* we want also our internal helper functions */
- #include "smimeutil.h"
+@@ -99,6 +99,10 @@
+ #define _STACK STACK
+ #endif
  
 +#if defined(OPENSSL_VERSION_NUMBER) && OPENSSL_VERSION_NUMBER < 0x10000000L
 +#define _STACK STACK
 +#endif
 +
  /* ================= P K C S 1 2    C O N V E R S I O N S ================ */
  /* Convert pem formatted certificate and private key into PKCS12
   * object suitable for importing to browsers.
Index: head/security/zxid/files/patch-platform.h
===================================================================
--- head/security/zxid/files/patch-platform.h	(revision 410939)
+++ head/security/zxid/files/patch-platform.h	(revision 410940)
@@ -1,10 +1,10 @@
---- platform.h.orig	2013-11-27 10:56:48.000000000 +0900
-+++ platform.h	2014-07-28 07:51:37.000000000 +0900
-@@ -130,6 +130,7 @@
+--- platform.h.orig	2016-02-29 00:16:50 UTC
++++ platform.h
+@@ -132,6 +132,7 @@ unsigned int alarm(unsigned int secs);
   * NOT MINGW nor WIN32CL (i.e. its Unix) */
  
  #include <dirent.h>
 +#include <sys/types.h>
  
  #ifdef __cplusplus
  extern "C" {
Index: head/security/zxid/files/patch-zx.h
===================================================================
--- head/security/zxid/files/patch-zx.h	(revision 410939)
+++ head/security/zxid/files/patch-zx.h	(revision 410940)
@@ -1,10 +1,10 @@
---- zx.h.orig	2011-07-25 03:56:45.000000000 +0800
-+++ zx.h	2011-12-29 17:00:27.394555276 +0800
-@@ -25,6 +25,7 @@
+--- zx.h.orig	2016-02-29 00:16:50 UTC
++++ zx.h
+@@ -29,6 +29,7 @@
  #include <memory.h>
  #include <string.h>
  #include <stdarg.h>
 +#include <limits.h>
  
  #ifdef USE_OPENSSL
  #include <openssl/x509.h>