Received: by mail.netbsd.org (Postfix, from userid 605) id 75C1985652; Tue, 29 Aug 2017 12:24:58 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 0A28E84D9A for ; Tue, 29 Aug 2017 12:24:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id bWLXCHjSLVAO for ; Tue, 29 Aug 2017 12:24:57 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 679CF84D21 for ; Tue, 29 Aug 2017 12:24:57 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 66276FA96; Tue, 29 Aug 2017 12:24:57 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_150400949791610" MIME-Version: 1.0 Date: Tue, 29 Aug 2017 12:24:57 +0000 From: "Thomas Klausner" Subject: CVS commit: pkgsrc/security To: pkgsrc-changes@NetBSD.org Reply-To: wiz@netbsd.org X-Mailer: log_accum Message-Id: <20170829122457.66276FA96@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_150400949791610 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" 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. --_----------=_150400949791610 Content-Disposition: inline Content-Length: 1342 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii 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 --_----------=_150400949791610--