CVS commit: pkgsrc/security/gnupg2

["Jonathan Perkin" <jperkin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jperkin
Date:           Fri Jun  8 16:58:16 UTC 2018

Modified Files:
        pkgsrc/security/gnupg2: Makefile

Log Message:
gnupg2: Put back CONFLICTS entry for dirmngr.

Helps binary package managers to resolve the conflict, PLIST conflicts
cannot be detected early enough.


To generate a diff of this commit:
cvs rdiff -u -r1.87 -r1.88 pkgsrc/security/gnupg2/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.87 pkgsrc/security/gnupg2/Makefile:1.88
--- pkgsrc/security/gnupg2/Makefile:1.87        Wed May 16 10:22:22 2018
+++ pkgsrc/security/gnupg2/Makefile     Fri Jun  8 16:58:16 2018
@@ -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