pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/security/gnupg2 gnupg2: Put back CONFLICTS entry for d...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c6f8948fbd01
branches:  trunk
changeset: 309087:c6f8948fbd01
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Fri Jun 08 16:58:16 2018 +0000

description:
gnupg2: Put back CONFLICTS entry for dirmngr.

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

diffstat:

 security/gnupg2/Makefile |  4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diffs (18 lines):

diff -r 2df8917e82ed -r c6f8948fbd01 security/gnupg2/Makefile
--- a/security/gnupg2/Makefile  Fri Jun 08 12:42:13 2018 +0000
+++ b/security/gnupg2/Makefile  Fri Jun 08 16:58:16 2018 +0000
@@ -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 @@
 
 DEPENDS+=      pinentry-[0-9]*:../../security/pinentry
 
+CONFLICTS=     dirmngr-[0-9]*
+
 BUILD_DEFS+=           VARBASE
 USE_PKGLOCALEDIR=      yes
 USE_TOOLS+=            gmake pkg-config makeinfo



Home | Main Index | Thread Index | Old Index