Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

===================================================================
RCS file: /ftp/cvs/cvsroot/pkgsrc/devel/talloc/Makefile,v
rcsdiff: /ftp/cvs/cvsroot/pkgsrc/devel/talloc/Makefile,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.10
retrieving revision 1.11
diff -u -p -r1.10 -r1.11
--- pkgsrc/devel/talloc/Makefile	2015/07/26 22:44:54	1.10
+++ pkgsrc/devel/talloc/Makefile	2015/10/21 08:37:24	1.11
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2015/07/26 22:44:54 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2015/10/21 08:37:24 wiz Exp $
 
-DISTNAME=	talloc-2.1.3
+DISTNAME=	talloc-2.1.4
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/talloc/
 
@@ -23,77 +23,7 @@ PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # n
 CONFLICTS+=	samba-[0-9]*
 
 REPLACE_PYTHON+=	buildtools/bin/waf
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/ParallelDebug.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/batched_cc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/boost.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/gccdeps.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/go.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/lru_cache.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/paranoid.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/swig.py
-REPLACE_PYTHON+=	buildtools/wafadmin/3rdparty/valadoc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Build.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Configure.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Constants.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Environment.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Logs.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Node.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Options.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Runner.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Scripting.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Task.py
-REPLACE_PYTHON+=	buildtools/wafadmin/TaskGen.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/__init__.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/ar.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/bison.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/cc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/ccroot.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/compiler_cc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/compiler_cxx.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/compiler_d.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/config_c.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/cs.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/cxx.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/d.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/dbus.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/dmd.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/flex.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gas.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gcc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gdc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/glib2.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gnome.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gnu_dirs.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gob2.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/gxx.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/icc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/icpc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/intltool.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/javaw.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/kde4.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/libtool.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/lua.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/misc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/msvc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/nasm.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/ocaml.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/osx.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/perl.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/preproc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/python.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/qt4.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/ruby.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/suncc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/suncxx.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/tex.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/unittestw.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/vala.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/winres.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/xlc.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Tools/xlcxx.py
-REPLACE_PYTHON+=	buildtools/wafadmin/Utils.py
-REPLACE_PYTHON+=	buildtools/wafadmin/__init__.py
-REPLACE_PYTHON+=	buildtools/wafadmin/py3kfixes.py
+REPLACE_PYTHON+=	buildtools/wafsamba/__init__.py
 REPLACE_PYTHON+=	buildtools/wafsamba/samba_python.py
 REPLACE_PYTHON+=	buildtools/wafsamba/symbols.py
 REPLACE_PYTHON+=	buildtools/wafsamba/wscript