pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/talloc talloc: bump revision
details: https://anonhg.NetBSD.org/pkgsrc/rev/12320f499cef
branches: trunk
changeset: 389180:12320f499cef
user: adam <adam%pkgsrc.org@localhost>
date: Sat Dec 22 08:55:29 2018 +0000
description:
talloc: bump revision
PkgSrc changes:
* build and install the manpage
* use correct install_name on Darwin
* disable non-portable options
diffstat:
devel/talloc/Makefile | 51 ++++-----
devel/talloc/PLIST | 7 +-
devel/talloc/distinfo | 4 +-
devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py | 16 ---
devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py | 16 +++
5 files changed, 44 insertions(+), 50 deletions(-)
diffs (154 lines):
diff -r f51e659113c1 -r 12320f499cef devel/talloc/Makefile
--- a/devel/talloc/Makefile Sat Dec 22 03:53:24 2018 +0000
+++ b/devel/talloc/Makefile Sat Dec 22 08:55:29 2018 +0000
@@ -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 @@
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/wscript
REPLACE_PYTHON+= wscript
-.include "../../mk/bsd.prefs.mk"
+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'
-# 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
-
+PY_PATCHPLIST= yes
.include "../../lang/python/application.mk"
.include "../../lang/python/extension.mk"
.include "../../mk/bsd.pkg.mk"
diff -r f51e659113c1 -r 12320f499cef devel/talloc/PLIST
--- a/devel/talloc/PLIST Sat Dec 22 03:53:24 2018 +0000
+++ b/devel/talloc/PLIST Sat Dec 22 08:55:29 2018 +0000
@@ -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.${PKGVERSION}
lib/libpytalloc-util.so.2
-lib/libpytalloc-util.so.${PKGVERSION}
lib/libtalloc.so
+lib/libtalloc.so.${PKGVERSION}
lib/libtalloc.so.2
-lib/libtalloc.so.${PKGVERSION}
lib/pkgconfig/pytalloc-util.pc
lib/pkgconfig/talloc.pc
${PYSITELIB}/talloc.so
+man/man3/talloc.3
diff -r f51e659113c1 -r 12320f499cef devel/talloc/distinfo
--- a/devel/talloc/distinfo Sat Dec 22 03:53:24 2018 +0000
+++ b/devel/talloc/distinfo Sat Dec 22 08:55:29 2018 +0000
@@ -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
diff -r f51e659113c1 -r 12320f499cef devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py
--- a/devel/talloc/patches/patch-buildtools_wafsamba_samba__conftests.py Sat Dec 22 03:53:24 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$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'):
diff -r f51e659113c1 -r 12320f499cef devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/talloc/patches/patch-buildtools_wafsamba_samba__install.py Sat Dec 22 08:55:29 2018 +0000
@@ -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
+
Home |
Main Index |
Thread Index |
Old Index