Import of pkgsrc-2015Q1

devel/talloc/Makefile

@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2014/01/25 10:30:06 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2014/09/01 08:19:09 wiz Exp $
 
-DISTNAME=	talloc-2.1.0
+DISTNAME=	talloc-2.1.1
+PKGREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://www.samba.org/ftp/talloc/
 
@@ -11,13 +12,13 @@ LICENSE=	gnu-gpl-v3 AND gnu-lgpl-v3
 
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
-GNU_CONFIGURE=	yes
+HAS_CONFIGURE=	yes	# wrapper script around WAF
 USE_TOOLS+=	pkg-config
 
 PKGCONFIG_OVERRIDE+=	talloc.pc.in
 PKGCONFIG_OVERRIDE+=	pytalloc-util.pc.in
 PY_PATCHPLIST=		yes
-PYTHON_VERSIONS_INCOMPATIBLE=  33 # not yet ported as of 2.1.0
+PYTHON_VERSIONS_INCOMPATIBLE=  33 34 # not yet ported as of 2.1.0
 
 # include/talloc.h
 CONFLICTS+=	samba-[0-9]*
@@ -101,6 +102,20 @@ REPLACE_PYTHON+=	lib/replace/system/wscript_configure
 REPLACE_PYTHON+=	lib/replace/wscript
 REPLACE_PYTHON+=	wscript
 
+.include "../../mk/bsd.prefs.mk"
+
+# Fix incorrect install_name of talloc library on Darwin.  Don't bother
+# fixing similar problem in pytalloc-util nor the Python talloc.so
+# since those reference other build-time paths in addition to having an
+# incorrect install_name; they will remain broken.
+# Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=10791
+post-install:
+.if ${OPSYS} == "Darwin"
+	install_name_tool -id \
+	    ${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib \
+	    ${DESTDIR}${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib
+.endif
+
 .include "../../lang/python/application.mk"
 .include "../../lang/python/extension.mk"
 .include "../../mk/bsd.pkg.mk"

devel/talloc/distinfo

@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.1 2014/01/09 11:57:04 wiz Exp $
+$NetBSD: distinfo,v 1.3 2014/11/19 15:36:26 schmonz Exp $
 
-SHA1 (talloc-2.1.0.tar.gz) = d079597f3f02a7ca3716645728a8a46016a1dd7d
-RMD160 (talloc-2.1.0.tar.gz) = 89f56c902cc48e6359264836bec04714e7a4f7f8
-Size (talloc-2.1.0.tar.gz) = 416097 bytes
+SHA1 (talloc-2.1.1.tar.gz) = 380bb786274dfd1a4a8179d31cd88cbee15c97bf
+RMD160 (talloc-2.1.1.tar.gz) = 5f77b5da4a593129e7381ff539bde46eef034c28
+Size (talloc-2.1.1.tar.gz) = 418564 bytes
+SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 8e40688a23fbf6112153b82a538df8801bf96247

devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py

@@ -0,0 +1,16 @@
+$NetBSD: patch-buildtools_wafsamba_samba__conftests.py,v 1.1 2014/11/19 15:36:26 schmonz Exp $
+
+Don't build and install the man page just because xsltproc happens
+to find docbook.xsl on a given system.
+
+--- buildtools/wafsamba/samba_conftests.py.orig	2013-06-04 14:21:30.000000000 +0000
++++ buildtools/wafsamba/samba_conftests.py
+@@ -491,6 +491,8 @@ def CHECK_INLINE(conf):
+ @conf
+ def CHECK_XSLTPROC_MANPAGES(conf):
+     '''check if xsltproc can run with the given stylesheets'''
++    if "pkgsrc":
++        return False
+ 
+ 
+     if not conf.CONFIG_SET('XSLTPROC'):