Received: by mail.netbsd.org (Postfix, from userid 605) id CC53E84DFE; Wed, 28 Feb 2018 08:00:48 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E55BA84D9F for ; Wed, 28 Feb 2018 08:00:47 +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 X9VwmvwTnVpf for ; Wed, 28 Feb 2018 08:00:47 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 2C62084C74 for ; Wed, 28 Feb 2018 08:00:47 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1928AFB40; Wed, 28 Feb 2018 08:00:47 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_151980484782540" MIME-Version: 1.0 Date: Wed, 28 Feb 2018 08:00:47 +0000 From: "NONAKA Kimihiro" Subject: CVS commit: pkgsrc/devel/talloc To: pkgsrc-changes@NetBSD.org Reply-To: nonaka@netbsd.org X-Mailer: log_accum Message-Id: <20180228080047.1928AFB40@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. --_----------=_151980484782540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nonaka Date: Wed Feb 28 08:00:47 UTC 2018 Modified Files: pkgsrc/devel/talloc: Makefile Log Message: devel/talloc: resolve conflict with samba-4.6.8nb4. Bump PKGREVISION. To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/talloc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_151980484782540 Content-Disposition: inline Content-Length: 771 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/talloc/Makefile diff -u pkgsrc/devel/talloc/Makefile:1.23 pkgsrc/devel/talloc/Makefile:1.24 --- pkgsrc/devel/talloc/Makefile:1.23 Sun Jan 28 16:41:33 2018 +++ pkgsrc/devel/talloc/Makefile Wed Feb 28 08:00:46 2018 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.23 2018/01/28 16:41:33 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2018/02/28 08:00:46 nonaka Exp $ DISTNAME= talloc-2.1.11 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/talloc/ @@ -20,7 +21,7 @@ PY_PATCHPLIST= yes PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.1.0 # include/talloc.h -CONFLICTS+= samba-[0-9]* +CONFLICTS+= samba<=4.6.8nb3 REPLACE_PYTHON+= buildtools/bin/waf REPLACE_PYTHON+= buildtools/wafsamba/__init__.py --_----------=_151980484782540--