[pkgsrc/trunk]: pkgsrc/devel/talloc devel/talloc: resolve conflict with samba...

[nonaka <nonaka%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0a3fc8f82b89
branches:  trunk
changeset: 376270:0a3fc8f82b89
user:      nonaka <nonaka%pkgsrc.org@localhost>
date:      Wed Feb 28 08:00:46 2018 +0000

description:
devel/talloc: resolve conflict with samba-4.6.8nb4.

Bump PKGREVISION.

diffstat:

 devel/talloc/Makefile |  5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diffs (21 lines):

diff -r 1d4b62279074 -r 0a3fc8f82b89 devel/talloc/Makefile
--- a/devel/talloc/Makefile     Wed Feb 28 03:41:46 2018 +0000
+++ b/devel/talloc/Makefile     Wed Feb 28 08:00:46 2018 +0000
@@ -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 @@
 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