pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/security Remove CONFLICTS that pkg_install can detect ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/41657f8d7623
branches: trunk
changeset: 367321:41657f8d7623
user: wiz <wiz%pkgsrc.org@localhost>
date: Tue Aug 29 12:24:57 2017 +0000
description:
Remove CONFLICTS that pkg_install can detect itself.
diffstat:
security/dirmngr/Makefile | 4 +---
security/gnupg2/Makefile | 4 +---
2 files changed, 2 insertions(+), 6 deletions(-)
diffs (36 lines):
diff -r bc715b6a2588 -r 41657f8d7623 security/dirmngr/Makefile
--- a/security/dirmngr/Makefile Tue Aug 29 12:23:24 2017 +0000
+++ b/security/dirmngr/Makefile Tue Aug 29 12:24:57 2017 +0000
@@ -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 @@
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}
diff -r bc715b6a2588 -r 41657f8d7623 security/gnupg2/Makefile
--- a/security/gnupg2/Makefile Tue Aug 29 12:23:24 2017 +0000
+++ b/security/gnupg2/Makefile Tue Aug 29 12:24:57 2017 +0000
@@ -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 @@
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