From 6f58c32ccb1cf03684ab60975b298e168c71e2d5 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Mon, 3 Oct 2016 08:15:50 +0000
Subject: idea patent has expired, so set LICENSE to something more useful.

---
 security/libidea/Makefile       | 11 ++---------
 security/p5-Crypt-IDEA/Makefile |  4 ++--
 security/pgp2/Makefile          |  5 ++---
 security/pgp5/Makefile          |  6 ++----
 4 files changed, 8 insertions(+), 18 deletions(-)

diff --git a/security/libidea/Makefile b/security/libidea/Makefile
index fce1bf96157..83bf57eb9a5 100644
--- a/security/libidea/Makefile
+++ b/security/libidea/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2015/02/27 14:35:01 tnn Exp $
-#
+# $NetBSD: Makefile,v 1.21 2016/10/03 08:15:50 wiz Exp $
 
 DISTNAME=	libidea-0.8.2b
 CATEGORIES=	security
@@ -8,13 +7,7 @@ MASTER_SITES=	ftp://ftp.funet.fi/pub/mirrors/ftp.psy.uq.oz.au/libeay/
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.media-crypt.com/pages/fidea.html
 COMMENT=	IDEA block cipher library
-LICENSE=	idea-license
-
-RESTRICTED=	IDEA is a patented algorithm that requires proper licensing
-NO_SRC_ON_CDROM=${RESTRICTED}
-NO_BIN_ON_CDROM=${RESTRICTED}
-NO_SRC_ON_FTP=	${RESTRICTED}
-NO_BIN_ON_FTP=	${RESTRICTED}
+#LICENSE=	ssleay-license
 
 WRKSRC=		${WRKDIR}/idea
 CRYPTO=		YES
diff --git a/security/p5-Crypt-IDEA/Makefile b/security/p5-Crypt-IDEA/Makefile
index 752fc16634e..f8cbead1b02 100644
--- a/security/p5-Crypt-IDEA/Makefile
+++ b/security/p5-Crypt-IDEA/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/06/08 19:24:20 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2016/10/03 08:15:50 wiz Exp $
 
 DISTNAME=		Crypt-IDEA-1.10
 PKGNAME=		p5-${DISTNAME}
@@ -9,7 +9,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:=Crypt/}
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://search.cpan.org/dist/Crypt-IDEA/
 COMMENT=		Perl5 module for the IDEA symmetric key algorithm
-LICENSE=		idea-license
+LICENSE=		original-bsd
 
 USE_LANGUAGES=		c
 PERL5_PACKLIST=		auto/Crypt/IDEA/.packlist
diff --git a/security/pgp2/Makefile b/security/pgp2/Makefile
index 6a70c4ca8d6..559cb48daa1 100644
--- a/security/pgp2/Makefile
+++ b/security/pgp2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.55 2012/10/23 18:16:49 asau Exp $
+# $NetBSD: Makefile,v 1.56 2016/10/03 08:15:50 wiz Exp $
 
 DISTNAME=	pgp263is
 PKGREVISION=	1
@@ -9,8 +9,7 @@ MASTER_SITES=	ftp://ftp.ifi.uio.no/pub/pgp/2.x/src/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pgpi.org/
 COMMENT=	Public-key encryption and digital signature utility (v2)
-# use of IDEA as crypto function
-LICENSE=	idea-license
+LICENSE=	pgp2-license
 
 WRKSRC=		${WRKDIR}/src
 CRYPTO=		yes
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 4765bb4e24f..054a09354a2 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,5 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2016/07/09 06:38:56 wiz Exp $
-#
+# $NetBSD: Makefile,v 1.45 2016/10/03 08:15:51 wiz Exp $
 
 DISTNAME=	pgp50i-unix-src
 PKGNAME=	pgp5-5.0i
@@ -11,8 +10,7 @@ MASTER_SITES=	ftp://ftp.pgpi.com/pub/pgp/5.0/unix/ \
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.pgpi.org/
 COMMENT=	Public-key encryption and digital signature utilities (v5)
-# use of IDEA as crypto function
-LICENSE=	idea-license
+LICENSE=	pgp5-license
 
 MAKE_JOBS_SAFE=		no
 
-- 
cgit v1.2.3