summaryrefslogtreecommitdiff
path: root/security
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2018-06-08 16:58:16 +0000
committerjperkin <jperkin@pkgsrc.org>2018-06-08 16:58:16 +0000
commitb71481f7b6d5dc152794d663f7a1fad89cf448ae (patch)
treefa6ba88cf99a8b630fdd31e5ae28e562ef241f05 /security
parent9f08564f37f123db14bf883a0ce4dfdfb3075e9c (diff)
downloadpkgsrc-b71481f7b6d5dc152794d663f7a1fad89cf448ae.tar.gz
gnupg2: Put back CONFLICTS entry for dirmngr.
Helps binary package managers to resolve the conflict, PLIST conflicts cannot be detected early enough.
Diffstat (limited to 'security')
-rw-r--r--security/gnupg2/Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/security/gnupg2/Makefile b/security/gnupg2/Makefile
index 24630fd1a9a..6b20b202b8b 100644
--- a/security/gnupg2/Makefile
+++ b/security/gnupg2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.87 2018/05/16 10:22:22 tm Exp $
+# $NetBSD: Makefile,v 1.88 2018/06/08 16:58:16 jperkin Exp $
DISTNAME= gnupg-2.2.7
PKGNAME= ${DISTNAME:S/gnupg-/gnupg2-/}
@@ -14,6 +14,8 @@ LICENSE= gnu-gpl-v3
DEPENDS+= pinentry-[0-9]*:../../security/pinentry
+CONFLICTS= dirmngr-[0-9]*
+
BUILD_DEFS+= VARBASE
USE_PKGLOCALEDIR= yes
USE_TOOLS+= gmake pkg-config makeinfo