Wed Feb 28 08:00:47 2018 UTC ()
devel/talloc: resolve conflict with samba-4.6.8nb4.

Bump PKGREVISION.


(nonaka)
diff -r1.23 -r1.24 pkgsrc/devel/talloc/Makefile
cvs diff -r1.23 -r1.24 pkgsrc/devel/talloc/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/talloc/Makefile 2018/01/28 16:41:33 1.23
+++ pkgsrc/devel/talloc/Makefile 2018/02/28 08:00:46 1.24
@@ -1,36 +1,37 @@ @@ -1,36 +1,37 @@
1# $NetBSD: Makefile,v 1.23 2018/01/28 16:41:33 wiz Exp $ 1# $NetBSD: Makefile,v 1.24 2018/02/28 08:00:46 nonaka Exp $
2 2
3DISTNAME= talloc-2.1.11 3DISTNAME= talloc-2.1.11
 4PKGREVISION= 1
4CATEGORIES= devel 5CATEGORIES= devel
5MASTER_SITES= http://www.samba.org/ftp/talloc/ 6MASTER_SITES= http://www.samba.org/ftp/talloc/
6 7
7MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
8#HOMEPAGE= http://talloc.samba.org/ 9#HOMEPAGE= http://talloc.samba.org/
9COMMENT= Hierarchical pool based memory allocator with destructors 10COMMENT= Hierarchical pool based memory allocator with destructors
10LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3 11LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3
11 12
12BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt 13BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt
13 14
14HAS_CONFIGURE= yes # wrapper script around WAF 15HAS_CONFIGURE= yes # wrapper script around WAF
15USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
16 17
17PKGCONFIG_OVERRIDE+= talloc.pc.in 18PKGCONFIG_OVERRIDE+= talloc.pc.in
18PKGCONFIG_OVERRIDE+= pytalloc-util.pc.in 19PKGCONFIG_OVERRIDE+= pytalloc-util.pc.in
19PY_PATCHPLIST= yes 20PY_PATCHPLIST= yes
20PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.1.0 21PYTHON_VERSIONS_INCOMPATIBLE= 34 35 36 # not yet ported as of 2.1.0
21 22
22# include/talloc.h 23# include/talloc.h
23CONFLICTS+= samba-[0-9]* 24CONFLICTS+= samba<=4.6.8nb3
24 25
25REPLACE_PYTHON+= buildtools/bin/waf 26REPLACE_PYTHON+= buildtools/bin/waf
26REPLACE_PYTHON+= buildtools/wafsamba/__init__.py 27REPLACE_PYTHON+= buildtools/wafsamba/__init__.py
27REPLACE_PYTHON+= buildtools/wafsamba/samba_python.py 28REPLACE_PYTHON+= buildtools/wafsamba/samba_python.py
28REPLACE_PYTHON+= buildtools/wafsamba/symbols.py 29REPLACE_PYTHON+= buildtools/wafsamba/symbols.py
29REPLACE_PYTHON+= buildtools/wafsamba/wscript 30REPLACE_PYTHON+= buildtools/wafsamba/wscript
30REPLACE_PYTHON+= lib/replace/system/wscript_configure 31REPLACE_PYTHON+= lib/replace/system/wscript_configure
31REPLACE_PYTHON+= lib/replace/wscript 32REPLACE_PYTHON+= lib/replace/wscript
32REPLACE_PYTHON+= wscript 33REPLACE_PYTHON+= wscript
33 34
34.include "../../mk/bsd.prefs.mk" 35.include "../../mk/bsd.prefs.mk"
35 36
36# Fix install names of libraries on Darwin. 37# Fix install names of libraries on Darwin.