properly re-conflict gpg1/2. Noticed by naddy@

okay ajacoutot@, pea@
This commit is contained in:
espie 2012-01-31 10:51:48 +00:00
parent 47f56b9a41
commit 0322fed35a
4 changed files with 8 additions and 6 deletions

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.79 2011/11/13 22:39:50 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.80 2012/01/31 10:51:48 espie Exp $
COMMENT= GNU privacy guard - a free PGP replacement
DISTNAME= gnupg-1.4.11
CATEGORIES= security
REVISION= 0
REVISION= 1
# restrict, not compatible with gnupg-2.
PKGSPEC = gnupg-<2

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.25 2010/10/25 12:57:13 pea Exp $
@comment $OpenBSD: PLIST,v 1.26 2012/01/31 10:51:48 espie Exp $
@option no-default-conflict
@conflict gnupg-<2
@bin bin/gpg
bin/gpg-zip
@bin bin/gpgsplit

View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.15 2011/11/28 15:38:38 dcoppa Exp $
# $OpenBSD: Makefile,v 1.16 2012/01/31 10:51:48 espie Exp $
COMMENT = gnu privacy guard - a free PGP replacement
DISTNAME = gnupg-2.0.18
CATEGORIES = security
REVISION = 1
REVISION = 2
MASTER_SITES = ftp://ftp.gnupg.org/gcrypt/gnupg/ \
ftp://gd.tuwien.ac.at/privacy/gnupg/gnupg/ \

View File

@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST,v 1.4 2011/11/27 12:48:30 dcoppa Exp $
@comment $OpenBSD: PLIST,v 1.5 2012/01/31 10:51:48 espie Exp $
@option no-default-conflict
@conflict gnupg->=2
@bin bin/gpg-agent
@bin bin/gpg-connect-agent
@bin bin/gpg2