Received: by mail.netbsd.org (Postfix, from userid 605) id 8FA2A84D41; Sat, 22 Dec 2018 08:55:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7EA8984C77 for ; Sat, 22 Dec 2018 08:55:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id U9NCAXiZj1Tg for ; Sat, 22 Dec 2018 08:55:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 5E46884D50 for ; Sat, 22 Dec 2018 08:55:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 50EA3FB16; Sat, 22 Dec 2018 08:55:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_154546893074410" MIME-Version: 1.0 Date: Sat, 22 Dec 2018 08:55:30 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/talloc To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20181222085530.50EA3FB16@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_154546893074410 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Sat Dec 22 08:55:30 UTC 2018 Modified Files: pkgsrc/devel/talloc: Makefile PLIST distinfo Added Files: pkgsrc/devel/talloc/patches: patch-buildtools_wafsamba_samba__install.py Removed Files: pkgsrc/devel/talloc/patches: patch-buildtools_wafsamba_samba__conftests.py Log Message: talloc: bump revision PkgSrc changes: * build and install the manpage * use correct install_name on Darwin * disable non-portable options To generate a diff of this commit: cvs rdiff -u -r1.28 -r1.29 pkgsrc/devel/talloc/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/talloc/PLIST cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/talloc/distinfo cvs rdiff -u -r1.1 -r0 \ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py cvs rdiff -u -r0 -r1.1 \ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_154546893074410 Content-Disposition: inline Content-Length: 5760 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/talloc/Makefile diff -u pkgsrc/devel/talloc/Makefile:1.28 pkgsrc/devel/talloc/Makefile:1.29 --- pkgsrc/devel/talloc/Makefile:1.28 Sat Jul 14 18:51:22 2018 +++ pkgsrc/devel/talloc/Makefile Sat Dec 22 08:55:29 2018 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.28 2018/07/14 18:51:22 adam Exp $ +# $NetBSD: Makefile,v 1.29 2018/12/22 08:55:29 adam Exp $ DISTNAME= talloc-2.1.14 +PKGREVISION= 1 CATEGORIES= devel MASTER_SITES= http://www.samba.org/ftp/talloc/ @@ -10,14 +11,25 @@ COMMENT= Hierarchical pool based memory LICENSE= gnu-gpl-v3 AND gnu-lgpl-v3 BUILD_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt +BUILD_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl USE_TOOLS+= pkg-config -HAS_CONFIGURE= yes # wrapper script around WAF +HAS_CONFIGURE= yes +CONFIG_SHELL= ${PYTHONBIN} +CONFIGURE_SCRIPT= ${WRKSRC}/buildtools/bin/waf +CONFIGURE_ARGS+= configure +CONFIGURE_ARGS+= --mandir=${PREFIX}/${PKGMANDIR} +CONFIGURE_ARGS+= --abi-check-disable +CONFIGURE_ARGS+= --disable-symbol-versions +.if defined(MAKE_JOBS) && !empty(MAKE_JOBS) && !(defined(MAKE_JOBS_SAFE) && !empty(MAKE_JOBS_SAFE:M[nN][oO])) +CONFIGURE_ARGS+= --jobs=${MAKE_JOBS} +.else +CONFIGURE_ARGS+= --jobs=1 +.endif TEST_TARGET= test PKGCONFIG_OVERRIDE+= talloc.pc.in PKGCONFIG_OVERRIDE+= pytalloc-util.pc.in -PY_PATCHPLIST= yes PYTHON_VERSIONS_ACCEPTED= 27 # not yet ported as of 2.1.0 @@ -33,33 +45,14 @@ REPLACE_PYTHON+= lib/replace/system/wscr REPLACE_PYTHON+= lib/replace/wscript REPLACE_PYTHON+= wscript -.include "../../mk/bsd.prefs.mk" - -# Fix install names of libraries on Darwin. -# Upstream bug report: https://bugzilla.samba.org/show_bug.cgi?id=10791 -post-install: -.if ${OPSYS} == "Darwin" - install_name_tool \ - -id \ - ${PREFIX}/lib/libpytalloc-util.${PKGVERSION_NOREV}.dylib \ - -change \ - ${WRKSRC}/bin/default/libtalloc.dylib \ - ${PREFIX}/lib/libtalloc.dylib \ - ${DESTDIR}${PREFIX}/lib/libpytalloc-util.${PKGVERSION_NOREV}.dylib - install_name_tool \ - -id \ - ${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib \ - ${DESTDIR}${PREFIX}/lib/libtalloc.${PKGVERSION_NOREV}.dylib - install_name_tool \ - -change \ - ${WRKSRC}/bin/default/libpytalloc-util.dylib \ - ${PREFIX}/lib/libpytalloc-util.dylib \ - -change \ - ${WRKSRC}/bin/default/libtalloc.dylib \ - ${PREFIX}/lib/libtalloc.dylib \ - ${DESTDIR}${PREFIX}/${PYSITELIB}/talloc.so -.endif +SUBST_CLASSES+= docbook +SUBST_MESSAGE.docbook= Fixing docbook URLs. +SUBST_FILES.docbook+= buildtools/wafsamba/samba_conftests.py +SUBST_FILES.docbook+= buildtools/wafsamba/wafsamba.py +SUBST_STAGE.docbook= pre-configure +SUBST_SED.docbook+= -e 's,http://docbook.sourceforge.net/release/xsl/current,${PREFIX}/share/xsl/docbook,g' +PY_PATCHPLIST= yes .include "../../lang/python/application.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/talloc/PLIST diff -u pkgsrc/devel/talloc/PLIST:1.1 pkgsrc/devel/talloc/PLIST:1.2 --- pkgsrc/devel/talloc/PLIST:1.1 Thu Jan 9 11:57:04 2014 +++ pkgsrc/devel/talloc/PLIST Sat Dec 22 08:55:29 2018 @@ -1,12 +1,13 @@ -@comment $NetBSD: PLIST,v 1.1 2014/01/09 11:57:04 wiz Exp $ +@comment $NetBSD: PLIST,v 1.2 2018/12/22 08:55:29 adam Exp $ include/pytalloc.h include/talloc.h lib/libpytalloc-util.so -lib/libpytalloc-util.so.2 lib/libpytalloc-util.so.${PKGVERSION} +lib/libpytalloc-util.so.2 lib/libtalloc.so -lib/libtalloc.so.2 lib/libtalloc.so.${PKGVERSION} +lib/libtalloc.so.2 lib/pkgconfig/pytalloc-util.pc lib/pkgconfig/talloc.pc ${PYSITELIB}/talloc.so +man/man3/talloc.3 Index: pkgsrc/devel/talloc/distinfo diff -u pkgsrc/devel/talloc/distinfo:1.18 pkgsrc/devel/talloc/distinfo:1.19 --- pkgsrc/devel/talloc/distinfo:1.18 Sat Jul 14 18:51:22 2018 +++ pkgsrc/devel/talloc/distinfo Sat Dec 22 08:55:29 2018 @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.18 2018/07/14 18:51:22 adam Exp $ +$NetBSD: distinfo,v 1.19 2018/12/22 08:55:29 adam Exp $ SHA1 (talloc-2.1.14.tar.gz) = 9d563b768148b620bdae1c97b36cfc30928a1044 RMD160 (talloc-2.1.14.tar.gz) = 3edf77e31e14a4335f2b5a659c40ae592a412cde SHA512 (talloc-2.1.14.tar.gz) = 1fcc70bf283a4d9fb61faf1c57f80a9c158efbe996452740db9755e879ad72ee7bff6f6c9bed358e085c5c7f97c78800bb903161143af2202952b702141cc130 Size (talloc-2.1.14.tar.gz) = 444589 bytes -SHA1 (patch-buildtools_wafsamba_samba__conftests.py) = 8e40688a23fbf6112153b82a538df8801bf96247 +SHA1 (patch-buildtools_wafsamba_samba__install.py) = 82e91af3125931767df06821983d40e6f94140c3 Added files: Index: pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py diff -u /dev/null pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py:1.1 --- /dev/null Sat Dec 22 08:55:30 2018 +++ pkgsrc/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py Sat Dec 22 08:55:30 2018 @@ -0,0 +1,16 @@ +$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 + --_----------=_154546893074410--