The American/European/Japanese patents on IDEA have expired. We can remove the special flavor and just include it by default.
Index: Makefile =================================================================== RCS file: /cvs/ports/security/gnupg/Makefile,v retrieving revision 1.80 diff -u -p -r1.80 Makefile --- Makefile 31 Jan 2012 10:51:48 -0000 1.80 +++ Makefile 12 Jul 2012 15:27:19 -0000 @@ -4,7 +4,7 @@ COMMENT= GNU privacy guard - a free PGP DISTNAME= gnupg-1.4.11 CATEGORIES= security -REVISION= 1 +REVISION= 2 # restrict, not compatible with gnupg-2. PKGSPEC = gnupg-<2 @@ -18,7 +18,9 @@ MASTER_SITES= ftp://ftp.gnupg.org/gcrypt ftp://pgp.iijlab.net/pub/pgp/gnupg/ \ ftp://ring.aist.go.jp/pub/net/gnupg/gnupg/ -MASTER_SITES0= ftp://ftp.gnupg.dk/pub/contrib-dk/ +MASTER_SITES0= ftp://ftp.gnupg.dk/contrib-dk/ + +DISTFILES= ${DISTNAME}${EXTRACT_SUFX} idea.c.gz:0 HOMEPAGE= http://www.gnupg.org/ @@ -46,20 +48,9 @@ CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/ MAKE_FLAGS= LIBINTL="-L${LOCALBASE}/lib -lintl -liconv" \ LIBICONV="-L${LOCALBASE}/lib -liconv" -FLAVORS= idea card ldap +FLAVORS= card ldap FLAVOR?= -.if ${FLAVOR:L:Midea} -PERMIT_PACKAGE_CDROM= a patented algorithm -PERMIT_DISTFILES_CDROM= a patented algorithm -DISTFILES= ${DISTNAME}${EXTRACT_SUFX} idea.c.gz:0 - -post-extract: - ln -s ${WRKDIR}/idea.c ${WRKSRC}/cipher/idea.c -.else -SUPDISTFILES= idea.c.gz:0 -.endif - .if ${FLAVOR:L:Mcard} LIB_DEPENDS+= devel/libusb-compat WANTLIB += usb pthread @@ -78,6 +69,9 @@ CONFIGURE_ARGS+= --disable-ldap GNUPGDOCFILES= README AUTHORS COPYING THANKS TODO BUGS \ doc/DETAILS doc/FAQ doc/OpenPGP doc/HACKING + +post-extract: + ln -s ${WRKDIR}/idea.c ${WRKSRC}/cipher/idea.c post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/gnupg Index: distinfo =================================================================== RCS file: /cvs/ports/security/gnupg/distinfo,v retrieving revision 1.22 diff -u -p -r1.22 distinfo --- distinfo 25 Oct 2010 12:57:13 -0000 1.22 +++ distinfo 12 Jul 2012 15:27:19 -0000 @@ -1,9 +1,3 @@ -MD5 (gnupg-1.4.11.tar.gz) = j7ZiJ9zRDYdYXXJB2xWDAg== -MD5 (idea.c.gz) = ncO8CGgkqMejMfNeCaPlfw== -RMD160 (gnupg-1.4.11.tar.gz) = wwfWmgwefZJ1Ak7ewc7rBzRRbU0= -RMD160 (idea.c.gz) = 41vloDHRDVI0GsXwKdKPgR7dkI0= -SHA1 (gnupg-1.4.11.tar.gz) = v/sMYLLnApgPcUjuOgYPKa3IIzE= -SHA1 (idea.c.gz) = gv3tTsMbl7Oy3SJ0GIC2fP7kD4Q= SHA256 (gnupg-1.4.11.tar.gz) = VdRXtVApxg7sVxwuc588DmOdQRhjtYoSF4zcY4NANtc= SHA256 (idea.c.gz) = MJko2jSUHf8db2aHVC/z1YMG2Fvp4amQa8T5+OYBGEQ= SIZE (gnupg-1.4.11.tar.gz) = 4713877 Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/security/gnupg/pkg/PLIST,v retrieving revision 1.26 diff -u -p -r1.26 PLIST --- pkg/PLIST 31 Jan 2012 10:51:48 -0000 1.26 +++ pkg/PLIST 12 Jul 2012 15:27:19 -0000 @@ -1,6 +1,7 @@ @comment $OpenBSD: PLIST,v 1.26 2012/01/31 10:51:48 espie Exp $ @option no-default-conflict @conflict gnupg-<2 +@pkgpath ${BASE_PKGPATH},idea @bin bin/gpg bin/gpg-zip @bin bin/gpgsplit -- Christian "naddy" Weisgerber na...@mips.inka.de
