svn commit: r410940 - in head/security/zxid: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Sun Mar 13 02:19:18 2016
New Revision: 410940
URL: https://svnweb.freebsd.org/changeset/ports/410940

Log:
  - Fix license. COPYING explicitly states that APACHE20 does not apply, the license is actually commercial:
  
  Commercial software. Please write info at synergetics.be for licensing terms.
  
  LICENSE-2.0.txt does not apply. It is only provided for information,
  e.g. on some related software packages.
  
  - Switch to options helpers
  - Regenerate patches with `make makepatch`

Modified:
  head/security/zxid/Makefile
  head/security/zxid/files/patch-pkcs12.c
  head/security/zxid/files/patch-platform.h
  head/security/zxid/files/patch-zx.h

Modified: head/security/zxid/Makefile
==============================================================================
--- head/security/zxid/Makefile	Sun Mar 13 01:50:06 2016	(r410939)
+++ head/security/zxid/Makefile	Sun Mar 13 02:19:18 2016	(r410940)
@@ -9,7 +9,10 @@ MASTER_SITES=	http://zxid.org/
 MAINTAINER=	ports at 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
 
@@ -57,6 +60,7 @@ do-install:
 	${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}
 

Modified: head/security/zxid/files/patch-pkcs12.c
==============================================================================
--- head/security/zxid/files/patch-pkcs12.c	Sun Mar 13 01:50:06 2016	(r410939)
+++ head/security/zxid/files/patch-pkcs12.c	Sun Mar 13 02:19:18 2016	(r410940)
@@ -1,8 +1,8 @@
---- 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

Modified: head/security/zxid/files/patch-platform.h
==============================================================================
--- head/security/zxid/files/patch-platform.h	Sun Mar 13 01:50:06 2016	(r410939)
+++ head/security/zxid/files/patch-platform.h	Sun Mar 13 02:19:18 2016	(r410940)
@@ -1,6 +1,6 @@
---- 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>

Modified: head/security/zxid/files/patch-zx.h
==============================================================================
--- head/security/zxid/files/patch-zx.h	Sun Mar 13 01:50:06 2016	(r410939)
+++ head/security/zxid/files/patch-zx.h	Sun Mar 13 02:19:18 2016	(r410940)
@@ -1,6 +1,6 @@
---- 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>