Sat Dec 22 08:55:30 2018 UTC ()
talloc: bump revision

PkgSrc changes:
* build and install the manpage
* use correct install_name on Darwin
* disable non-portable options


(adam)
diff -r1.28 -r1.29 pkgsrc/devel/talloc/Makefile
diff -r1.1 -r1.2 pkgsrc/devel/talloc/PLIST
diff -r1.18 -r1.19 pkgsrc/devel/talloc/distinfo
diff -r1.1 -r0 pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py
diff -r0 -r1.1 pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py
cvs diff -r1.28 -r1.29 pkgsrc/devel/talloc/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/talloc/Makefile 2018/07/14 18:51:22 1.28
+++ pkgsrc/devel/talloc/Makefile 2018/12/22 08:55:29 1.29
@@ -1,65 +1,58 @@ @@ -1,65 +1,58 @@
1# $NetBSD: Makefile,v 1.28 2018/07/14 18:51:22 adam Exp $ 1# $NetBSD: Makefile,v 1.29 2018/12/22 08:55:29 adam Exp $
2 2
3DISTNAME= talloc-2.1.14 3DISTNAME= talloc-2.1.14
 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
8HOMEPAGE= https://talloc.samba.org/talloc/doc/html/index.html 9HOMEPAGE= https://talloc.samba.org/talloc/doc/html/index.html
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
 14BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
13 15
14USE_TOOLS+= pkg-config 16USE_TOOLS+= pkg-config
15HAS_CONFIGURE= yes # wrapper script around WAF 17HAS_CONFIGURE= yes
 18CONFIG_SHELL= ${PYTHONBIN}
 19CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf
 20CONFIGURE_ARGS+= configure
 21CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR}
 22CONFIGURE_ARGS+= --abi-check-disable
 23CONFIGURE_ARGS+= --disable-symbol-versions
 24.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO]))
 25CONFIGURE_ARGS+= --jobs=${MAKE_JOBS}
 26.else
 27CONFIGURE_ARGS+= --jobs=1
 28.endif
16TEST_TARGET= test 29TEST_TARGET= test
17 30
18PKGCONFIG_OVERRIDE+= talloc.pc.in 31PKGCONFIG_OVERRIDE+= talloc.pc.in
19PKGCONFIG_OVERRIDE+= pytalloc-util.pc.in 32PKGCONFIG_OVERRIDE+= pytalloc-util.pc.in
20PY_PATCHPLIST= yes 
21 33
22PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.1.0 34PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.1.0
23 35
24# include/talloc.h 36# include/talloc.h
25CONFLICTS+= samba<=4.6.8nb3 37CONFLICTS+= samba<=4.6.8nb3
26 38
27REPLACE_PYTHON+= buildtools/bin/waf 39REPLACE_PYTHON+= buildtools/bin/waf
28REPLACE_PYTHON+= buildtools/wafsamba/__init__.py 40REPLACE_PYTHON+= buildtools/wafsamba/__init__.py
29REPLACE_PYTHON+= buildtools/wafsamba/samba_python.py 41REPLACE_PYTHON+= buildtools/wafsamba/samba_python.py
30REPLACE_PYTHON+= buildtools/wafsamba/symbols.py 42REPLACE_PYTHON+= buildtools/wafsamba/symbols.py
31REPLACE_PYTHON+= buildtools/wafsamba/wscript 43REPLACE_PYTHON+= buildtools/wafsamba/wscript
32REPLACE_PYTHON+= lib/replace/system/wscript_configure 44REPLACE_PYTHON+= lib/replace/system/wscript_configure
33REPLACE_PYTHON+= lib/replace/wscript 45REPLACE_PYTHON+= lib/replace/wscript
34REPLACE_PYTHON+= wscript 46REPLACE_PYTHON+= wscript
35 47
36.include "../../mk/bsd.prefs.mk" 48SUBST_CLASSES+= docbook
37 49SUBST_MESSAGE.docbook= Fixing docbook URLs.
38# Fix install names of libraries on Darwin. 50SUBST_FILES.docbook+= buildtools/wafsamba/samba_conftests.py
39# Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=10791 51SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py
40post-install: 52SUBST_STAGE.docbook= pre-configure
41.if ${OPSYS} == "Darwin" 53SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g'
42 install_name_tool \ 
43 -id \ 
44 ${PREFIX}/lib/libpytalloc-util.${PKGVERSION_NOREV}.dylib \ 
45 -change \ 
46 ${WRKSRC}/bin/default/libtalloc.dylib \ 
47 ${PREFIX}/lib/libtalloc.dylib \ 
48 ${DESTDIR}${PREFIX}/lib/libpytalloc-util.${PKGVERSION_NOREV}.dylib 
49 install_name_tool \ 
50 -id \ 
51 ${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib \ 
52 ${DESTDIR}${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib 
53 install_name_tool \ 
54 -change \ 
55 ${WRKSRC}/bin/default/libpytalloc-util.dylib \ 
56 ${PREFIX}/lib/libpytalloc-util.dylib \ 
57 -change \ 
58 ${WRKSRC}/bin/default/libtalloc.dylib \ 
59 ${PREFIX}/lib/libtalloc.dylib \ 
60 ${DESTDIR}${PREFIX}/${PYSITELIB}/talloc.so 
61.endif 
62 54
 55PY_PATCHPLIST= yes
63.include "../../lang/python/application.mk" 56.include "../../lang/python/application.mk"
64.include "../../lang/python/extension.mk" 57.include "../../lang/python/extension.mk"
65.include "../../mk/bsd.pkg.mk" 58.include "../../mk/bsd.pkg.mk"
cvs diff -r1.1 -r1.2 pkgsrc/devel/talloc/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/talloc/PLIST 2014/01/09 11:57:04 1.1
+++ pkgsrc/devel/talloc/PLIST 2018/12/22 08:55:29 1.2
@@ -1,12 +1,13 @@ @@ -1,12 +1,13 @@
1@comment $NetBSD: PLIST,v 1.1 2014/01/09 11:57:04 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.2 2018/12/22 08:55:29 adam Exp $
2include/pytalloc.h 2include/pytalloc.h
3include/talloc.h 3include/talloc.h
4lib/libpytalloc-util.so 4lib/libpytalloc-util.so
5lib/libpytalloc-util.so.2 
6lib/libpytalloc-util.so.${PKGVERSION} 5lib/libpytalloc-util.so.${PKGVERSION}
 6lib/libpytalloc-util.so.2
7lib/libtalloc.so 7lib/libtalloc.so
8lib/libtalloc.so.2 
9lib/libtalloc.so.${PKGVERSION} 8lib/libtalloc.so.${PKGVERSION}
 9lib/libtalloc.so.2
10lib/pkgconfig/pytalloc-util.pc 10lib/pkgconfig/pytalloc-util.pc
11lib/pkgconfig/talloc.pc 11lib/pkgconfig/talloc.pc
12${PYSITELIB}/talloc.so 12${PYSITELIB}/talloc.so
 13man/man3/talloc.3
cvs diff -r1.18 -r1.19 pkgsrc/devel/talloc/distinfo (expand / switch to unified diff)

--- pkgsrc/devel/talloc/distinfo 2018/07/14 18:51:22 1.18
+++ pkgsrc/devel/talloc/distinfo 2018/12/22 08:55:29 1.19
@@ -1,7 +1,7 @@ @@ -1,7 +1,7 @@
1$NetBSD: distinfo,v 1.18 2018/07/14 18:51:22 adam Exp $ 1$NetBSD: distinfo,v 1.19 2018/12/22 08:55:29 adam Exp $
2 2
3SHA1 (talloc-2.1.14.tar.gz) = 9d563b768148b620bdae1c97b36cfc30928a1044 3SHA1 (talloc-2.1.14.tar.gz) = 9d563b768148b620bdae1c97b36cfc30928a1044
4RMD160 (talloc-2.1.14.tar.gz) = 3edf77e31e14a4335f2b5a659c40ae592a412cde 4RMD160 (talloc-2.1.14.tar.gz) = 3edf77e31e14a4335f2b5a659c40ae592a412cde
5SHA512 (talloc-2.1.14.tar.gz) = 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130 5SHA512 (talloc-2.1.14.tar.gz) = 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130
6Size (talloc-2.1.14.tar.gz) = 444589 bytes 6Size (talloc-2.1.14.tar.gz) = 444589 bytes
7SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 8e40688a23fbf6112153b82a538df8801bf96247 7SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3
File Deleted: pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py
File Added: pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py
$NetBSD: patch-buildtools_wafsamba_samba__install.py,v 1.1 2018/12/22 08:55:30 adam Exp $

Apply correct install_name on Darwin.

--- buildtools/wafsamba/samba_install.py.orig	2018-07-12 08:23:36.000000000 +0000
+++ buildtools/wafsamba/samba_install.py
@@ -150,6 +150,9 @@ def install_library(self):
             bld.symlink_as(os.path.join(install_path, install_link), os.path.basename(install_name))
         if dev_link:
             bld.symlink_as(os.path.join(install_path, dev_link), os.path.basename(install_name))
+        if getattr(self, 'samba_type', None) != 'PYTHON' and '-dynamiclib' in self.env['LINKFLAGS']:
+            self.env.append_value('LINKFLAGS', '-install_name')
+            self.env.append_value('LINKFLAGS', os.path.join(install_path, install_name))
     finally:
         bld.all_envs['default'] = default_env