CVS commit: pkgsrc/security

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Aug 29 12:24:57 UTC 2017

Modified Files:
        pkgsrc/security/dirmngr: Makefile
        pkgsrc/security/gnupg2: Makefile

Log Message:
Remove CONFLICTS that pkg_install can detect itself.


To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 pkgsrc/security/dirmngr/Makefile
cvs rdiff -u -r1.71 -r1.72 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/dirmngr/Makefile
diff -u pkgsrc/security/dirmngr/Makefile:1.57 pkgsrc/security/dirmngr/Makefile:1.58
--- pkgsrc/security/dirmngr/Makefile:1.57       Tue Aug 29 11:54:00 2017
+++ pkgsrc/security/dirmngr/Makefile    Tue Aug 29 12:24:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2017/08/29 11:54:00 wiz Exp $
+# $NetBSD: Makefile,v 1.58 2017/08/29 12:24:57 wiz Exp $
 
 DISTNAME=      dirmngr-1.1.1
 PKGREVISION=   3
@@ -11,8 +11,6 @@ HOMEPAGE=     http://www.gnupg.org/aegypten2
 COMMENT=       X509 certificate and CRL downloader
 LICENSE=       gnu-gpl-v3
 
-CONFLICTS=     gnupg2-2.1.[0-9]*
-
 DIRMNGR_USER?=         dirmngr
 DIRMNGR_GROUP?=                dirmngr
 PKG_GROUPS=            ${DIRMNGR_GROUP}

Index: pkgsrc/security/gnupg2/Makefile
diff -u pkgsrc/security/gnupg2/Makefile:1.71 pkgsrc/security/gnupg2/Makefile:1.72
--- pkgsrc/security/gnupg2/Makefile:1.71        Tue Aug 29 12:07:04 2017
+++ pkgsrc/security/gnupg2/Makefile     Tue Aug 29 12:24:57 2017
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2017/08/29 12:07:04 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2017/08/29 12:24:57 wiz Exp $
 
 DISTNAME=      gnupg-2.2.0
 PKGNAME=       ${DISTNAME:S/gnupg-/gnupg2-/}
@@ -13,8 +13,6 @@ 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