The American/European/Japanese patents on IDEA have expired. Remove

the flavor and just include it by default.  ok zinke@
This commit is contained in:
naddy 2012-07-12 16:32:47 +00:00
parent 9490a6a16e
commit 5e1bcbad44
3 changed files with 11 additions and 22 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.80 2012/01/31 10:51:48 espie Exp $
# $OpenBSD: Makefile,v 1.81 2012/07/12 16:32:47 naddy Exp $
COMMENT= GNU privacy guard - a free PGP replacement
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/gnupg/ \
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}/include" \
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
@ -79,6 +70,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
cd ${WRKSRC}; ${INSTALL_DATA} ${GNUPGDOCFILES} \

View File

@ -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

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.26 2012/01/31 10:51:48 espie Exp $
@comment $OpenBSD: PLIST,v 1.27 2012/07/12 16:32:48 naddy Exp $
@option no-default-conflict
@conflict gnupg-<2
@pkgpath ${BASE_PKGPATH},idea
@bin bin/gpg
bin/gpg-zip
@bin bin/gpgsplit