cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix fucked-up update. gnupg-1 and gnupg-2 are not allowed to conflict!

Browse Source 
this breaks the bulk builds.
This commit is contained in:
espie 2015-02-19 18:18:30 +00:00
parent e5cf1d752b
commit 87154de247
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
security/gnupg2/Makefile
View File

@ -1,9 +1,10 @@
# $OpenBSD: Makefile,v 1.35 2015/02/16 22:57:12 naddy Exp $
# $OpenBSD: Makefile,v 1.36 2015/02/19 18:18:30 espie Exp $
COMMENT = GNU privacy guard - a free PGP replacement
DISTNAME = gnupg-2.1.2
CATEGORIES = security
REVISION = 0
MASTER_SITES = ${MASTER_SITES_GNUPG:=gnupg/}
@ -58,5 +59,6 @@ CONFIGURE_ARGS += docdir=${LOCALBASE}/share/doc/gnupg2 \
# Avoid conflict with gnupg-1.x
post-install:
@mv ${PREFIX}/man/man1/gpg-zip.1 ${PREFIX}/man/man1/gpg2-zip.1
@mv ${PREFIX}/man/man7/gnupg.7 ${PREFIX}/man/man7/gnupg2.7
.include <bsd.port.mk>

4
security/gnupg2/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.10 2015/01/08 09:06:19 pea Exp $
@comment $OpenBSD: PLIST,v 1.11 2015/02/19 18:18:30 espie Exp $
@option no-default-conflict
@conflict gnupg->=2
@bin bin/dirmngr
@ -35,7 +35,7 @@ bin/gpgsm-gencert.sh
@man man/man1/scdaemon.1
@man man/man1/symcryptrun.1
@man man/man1/watchgnupg.1
@man man/man7/gnupg.7
@man man/man7/gnupg2.7
@man man/man8/addgnupghome.8
@man man/man8/applygnupgdefaults.8
@man man/man8/dirmngr.8