Index: head/databases/ldb/Makefile =================================================================== --- head/databases/ldb/Makefile (revision 393832) +++ head/databases/ldb/Makefile (revision 393833) @@ -1,124 +1,126 @@ # $FreeBSD$ PORTNAME= ldb -PORTVERSION= 1.1.20 +PORTVERSION= 1.1.21 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= LDAP-like embedded database LICENSE= GPLv3 CONFLICTS= *samba3[0-4]-3.* USES= compiler pkgconfig python:2 waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log USE_OPENLDAP= yes PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} + --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \ + --disable-rpath \ + --without-gettext OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) BUILD_DEPENDS+= talloc>=2.1.1:${PORTSDIR}/devel/talloc \ tevent>=0.9.22:${PORTSDIR}/devel/tevent \ tdb>=1.3.4,1:${PORTSDIR}/databases/tdb \ popt>=0:${PORTSDIR}/devel/popt RUN_DEPENDS:= ${BUILD_DEPENDS} CONFIGURE_ARGS+= --bundled-libraries=!talloc,!tevent,!tdb,!popt \ --with-modulesdir=${PREFIX}/lib/shared-modules \ --with-privatelibdir=${PREFIX}/lib/ldb .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES= bin/ldbedit \ bin/ldbmodify \ bin/ldbadd \ bin/ldbdel \ bin/ldbsearch \ bin/ldbrename \ include/ldb_version.h \ include/ldb_handlers.h \ include/ldb_errors.h \ include/ldb.h \ include/ldb_module.h \ lib/libldb.so \ lib/libldb.so.1 \ lib/ldb/libldb-cmdline.so \ lib/shared-modules/ldb/asq.so \ lib/shared-modules/ldb/ldap.so \ lib/shared-modules/ldb/paged_results.so \ lib/shared-modules/ldb/paged_searches.so \ lib/shared-modules/ldb/rdn_name.so \ lib/shared-modules/ldb/sample.so \ lib/shared-modules/ldb/server_sort.so \ lib/shared-modules/ldb/skel.so \ lib/shared-modules/ldb/tdb.so \ %%PKGCONFIGDIR%%/ldb.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes PLIST_FILES+= include/pyldb.h \ lib/libpyldb-util.so \ lib/libpyldb-util.so.1 \ %%PYTHON_SITELIBDIR%%/ldb.so \ %%PKGCONFIGDIR%%/pyldb-util.pc LDB_MAN1= man/man1/ldbadd.1.gz \ man/man1/ldbdel.1.gz \ man/man1/ldbedit.1.gz \ man/man1/ldbmodify.1.gz \ man/man1/ldbrename.1.gz \ man/man1/ldbsearch.1.gz LDB_MAN3= man/man3/ldb.3.gz PLIST_FILES+= ${LDB_MAN1} ${LDB_MAN3} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${LDB_MAN1} ${LDB_MAN3} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/databases/ldb/distinfo =================================================================== --- head/databases/ldb/distinfo (revision 393832) +++ head/databases/ldb/distinfo (revision 393833) @@ -1,2 +1,2 @@ -SHA256 (ldb-1.1.20.tar.gz) = ba493bab271fdaa6ba07960728ffca71c8f9da5240162e86f1e56694b7a377b2 -SIZE (ldb-1.1.20.tar.gz) = 1220484 +SHA256 (ldb-1.1.21.tar.gz) = 267bbb7f278068eaf0de27adffda2e691a070a93c5c15ee27c828e87b4c7dbf1 +SIZE (ldb-1.1.21.tar.gz) = 1244825 Index: head/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py (revision 393832) +++ head/databases/ldb/files/patch-buildtools__wafsamba__samba_install.py (revision 393833) @@ -1,11 +1,11 @@ ---- ./buildtools/wafsamba/samba_install.py.orig 2013-01-27 11:51:43.000000000 +0000 -+++ ./buildtools/wafsamba/samba_install.py 2013-01-29 22:49:14.139878631 +0000 -@@ -111,7 +111,7 @@ +--- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000 ++++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000 +@@ -116,7 +116,7 @@ + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) inst_name = bld.make_libname(t.target) - elif self.vnum: - vnum_base = self.vnum.split('.')[0] -- install_name = bld.make_libname(target_name, version=self.vnum) -+ install_name = bld.make_libname(target_name, version=vnum_base) - install_link = bld.make_libname(target_name, version=vnum_base) - inst_name = bld.make_libname(t.target) - if not self.private_library: + if not self.private_library: Index: head/databases/ntdb/Makefile =================================================================== --- head/databases/ntdb/Makefile (revision 393832) +++ head/databases/ntdb/Makefile (revision 393833) @@ -1,98 +1,99 @@ # $FreeBSD$ PORTNAME= ntdb PORTVERSION= 1.0 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= databases MASTER_SITES= SAMBA/tdb MAINTAINER= timur@FreeBSD.org COMMENT= Not so Trivial DataBase LICENSE= GPLv3 CONFLICTS= USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \ + --disable-rpath \ --without-gettext OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) .include .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python .else USES+= python:2 PLIST_FILES+= %%PYTHON_SITELIBDIR%%/ntdb.so .endif .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES+= bin/ntdbbackup \ bin/ntdbdump \ bin/ntdbrestore \ bin/ntdbtool \ include/ntdb.h \ lib/libntdb.so \ lib/libntdb.so.1 \ %%PKGCONFIGDIR%%/ntdb.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes TDB_MAN3= man/man3/ntdb.3.gz TDB_MAN8= man/man8/ntdbbackup.8.gz \ man/man8/ntdbdump.8.gz \ man/man8/ntdbrestore.8.gz \ man/man8/ntdbtool.8.gz PLIST_FILES+= ${TDB_MAN3} ${TDB_MAN8} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${TDB_MAN3} ${TDB_MAN8} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/databases/tdb/Makefile =================================================================== --- head/databases/tdb/Makefile (revision 393832) +++ head/databases/tdb/Makefile (revision 393833) @@ -1,95 +1,98 @@ # $FreeBSD$ PORTNAME= tdb -PORTVERSION= 1.3.4 +PORTVERSION= 1.3.7 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= databases MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= Trivial Database LICENSE= GPLv3 CONFLICTS= *samba3[0-4]-3.* USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ - --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} + --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \ + --disable-rpath \ + --without-gettext OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) .include .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python .else USES+= python:2 -PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so +PLIST_FILES+= %%PYTHON_SITELIBDIR%%/tdb.so \ + %%PYTHON_SITELIBDIR%%/_tdb_text.py .endif .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES+= bin/tdbbackup \ bin/tdbdump \ bin/tdbrestore \ bin/tdbtool \ include/tdb.h \ lib/libtdb.so \ lib/libtdb.so.1 \ %%PKGCONFIGDIR%%/tdb.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes TDB_MAN8= man/man8/tdbbackup.8.gz \ man/man8/tdbdump.8.gz \ man/man8/tdbrestore.8.gz \ man/man8/tdbtool.8.gz PLIST_FILES+= ${TDB_MAN8} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${TDB_MAN8} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/databases/tdb/distinfo =================================================================== --- head/databases/tdb/distinfo (revision 393832) +++ head/databases/tdb/distinfo (revision 393833) @@ -1,2 +1,2 @@ -SHA256 (tdb-1.3.4.tar.gz) = f585cd53b49cb1f11f4c5aec404d0daa0c9bc5568790b09f5eb3b79315511729 -SIZE (tdb-1.3.4.tar.gz) = 483140 +SHA256 (tdb-1.3.7.tar.gz) = a64d95ca0cc06a28fed24c6e952aed7660cae04983108735d6bc30b925136412 +SIZE (tdb-1.3.7.tar.gz) = 493847 Index: head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py (revision 393832) +++ head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py (revision 393833) @@ -1,11 +1,11 @@ ---- ./buildtools/wafsamba/samba_install.py.orig 2012-04-11 12:36:11.000000000 +0000 -+++ ./buildtools/wafsamba/samba_install.py 2013-01-29 20:54:59.749863922 +0000 -@@ -109,7 +109,7 @@ +--- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000 ++++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000 +@@ -116,7 +116,7 @@ + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) inst_name = bld.make_libname(t.target) - elif self.vnum: - vnum_base = self.vnum.split('.')[0] -- install_name = bld.make_libname(target_name, version=self.vnum) -+ install_name = bld.make_libname(target_name, version=vnum_base) - install_link = bld.make_libname(target_name, version=vnum_base) - inst_name = bld.make_libname(t.target) - if not self.private_library: + if not self.private_library: Index: head/devel/talloc/Makefile =================================================================== --- head/devel/talloc/Makefile (revision 393832) +++ head/devel/talloc/Makefile (revision 393833) @@ -1,93 +1,94 @@ # $FreeBSD$ PORTNAME= talloc -PORTVERSION= 2.1.2 +PORTVERSION= 2.1.3 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= Hierarchical pool based memory allocator LICENSE= LGPL3 CONFLICTS= samba33-3.* USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \ + --disable-rpath \ --without-gettext OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) .include .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python .else USES+= python:2 PLIST_FILES+= include/pytalloc.h \ lib/libpytalloc-util.so \ lib/libpytalloc-util.so.2 \ %%PYTHON_SITELIBDIR%%/talloc.so \ %%PKGCONFIGDIR%%/pytalloc-util.pc .endif .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES+= include/talloc.h \ lib/libtalloc.so \ lib/libtalloc.so.2 \ %%PKGCONFIGDIR%%/talloc.pc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes TALLOC_MAN3= man/man3/talloc.3.gz PLIST_FILES+= ${TALLOC_MAN3} IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi pre-build: .if ! ${PORT_OPTIONS:MMANPAGES} -${MKDIR} ${BUILD_WRKSRC}/bin/default/man . for man in ${TALLOC_MAN3} ${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man . endfor .endif .include Index: head/devel/talloc/distinfo =================================================================== --- head/devel/talloc/distinfo (revision 393832) +++ head/devel/talloc/distinfo (revision 393833) @@ -1,2 +1,2 @@ -SHA256 (talloc-2.1.2.tar.gz) = 230d78a3fca75a15ab0f5d76d7bbaeadd3c1e695adcbb085932d227f5c31838d -SIZE (talloc-2.1.2.tar.gz) = 423706 +SHA256 (talloc-2.1.3.tar.gz) = 7aa5f75b22d4ef9c737b25515f2a2837ddc13014ff4ac6e58dd9e311f41f2cb0 +SIZE (talloc-2.1.3.tar.gz) = 434093 Index: head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py (revision 393832) +++ head/devel/talloc/files/patch-buildtools__wafsamba__samba_install.py (revision 393833) @@ -1,11 +1,11 @@ ---- buildtools/wafsamba/samba_install.py.orig 2010-12-21 02:00:02.000000000 +0100 -+++ buildtools/wafsamba/samba_install.py 2011-06-21 11:46:28.000000000 +0200 -@@ -109,7 +109,7 @@ +--- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000 ++++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000 +@@ -116,7 +116,7 @@ + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) inst_name = bld.make_libname(t.target) - elif self.vnum: - vnum_base = self.vnum.split('.')[0] -- install_name = bld.make_libname(target_name, version=self.vnum) -+ install_name = bld.make_libname(target_name, version=vnum_base) - install_link = bld.make_libname(target_name, version=vnum_base) - inst_name = bld.make_libname(t.target) - if not self.private_library: + if not self.private_library: Index: head/devel/tevent/Makefile =================================================================== --- head/devel/tevent/Makefile (revision 393832) +++ head/devel/tevent/Makefile (revision 393833) @@ -1,89 +1,90 @@ # $FreeBSD$ PORTNAME= tevent -PORTVERSION= 0.9.24 +PORTVERSION= 0.9.25 PORTREVISION= 0 PORTEPOCH= 0 CATEGORIES= devel MASTER_SITES= SAMBA MAINTAINER= timur@FreeBSD.org COMMENT= Talloc based event loop library LICENSE= LGPL3 CONFLICTS= USES= compiler pkgconfig waf USE_LDCONFIG= yes WAF_CMD= buildtools/bin/waf CONFIGURE_LOG= bin/config.log PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;} CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \ --infodir=${PREFIX}/${INFO_PATH}/${INFO_SUBDIR} \ + --disable-rpath \ --without-gettext OPTIONS_DEFINE= MANPAGES MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl) BUILD_DEPENDS+= talloc>=2.1.1:${PORTSDIR}/devel/talloc RUN_DEPENDS:= ${BUILD_DEPENDS} .include .if defined(NO_PYTHON) CONFIGURE_ARGS+= --disable-python .else USES+= python:2 PLIST_FILES+= %%PYTHON_SITELIBDIR%%/_tevent.so \ %%PYTHON_SITELIBDIR%%/tevent.py \ %%PYTHON_SITELIBDIR%%/tevent.pyc \ %%PYTHON_SITELIBDIR%%/tevent.pyo .endif .include .if ! ${PORT_OPTIONS:MMANPAGES} CONFIGURE_ENV+= XSLTPROC="true" .else BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:${PORTSDIR}/textproc/docbook-xsl \ xsltproc:${PORTSDIR}/textproc/libxslt .endif PLIST_FILES+= include/tevent.h \ lib/libtevent.so \ lib/libtevent.so.0 \ %%PKGCONFIGDIR%%/tevent.pc CONFIGURE_ARGS+= --bundled-libraries=!talloc # No fancy color error messages .if ${COMPILER_TYPE} == "clang" CFLAGS+= -fno-color-diagnostics .endif CONFIGURE_ENV+= NOCOLOR=yes MAKE_ENV+= NOCOLOR=yes IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support post-patch: @${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \ ${BUILD_WRKSRC}/wscript # Use threading (or multiprocessing) but not thread (renamed in python 3+). pre-configure: @if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \ ${ECHO_CMD}; \ ${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \ ${ECHO_CMD}; \ ${FALSE}; \ fi post-build: ${PYTHON_CMD} -m py_compile ${BUILD_WRKSRC}/tevent.py ${PYTHON_CMD} -O -m py_compile ${BUILD_WRKSRC}/tevent.py .include Index: head/devel/tevent/distinfo =================================================================== --- head/devel/tevent/distinfo (revision 393832) +++ head/devel/tevent/distinfo (revision 393833) @@ -1,2 +1,2 @@ -SHA256 (tevent-0.9.24.tar.gz) = 4db94cc092611775340891bb138e1c45310638b27fb3c59fb11b5af345973f50 -SIZE (tevent-0.9.24.tar.gz) = 560585 +SHA256 (tevent-0.9.25.tar.gz) = fedeb0d55a11b3593b562ec09b32e44bd67619ed10e5fa10d1868adb1649c669 +SIZE (tevent-0.9.25.tar.gz) = 573357 Index: head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py =================================================================== --- head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py (revision 393832) +++ head/devel/tevent/files/patch-buildtools__wafsamba__samba_install.py (revision 393833) @@ -1,11 +1,11 @@ ---- buildtools/wafsamba/samba_install.py.orig 2010-12-21 02:00:02.000000000 +0100 -+++ buildtools/wafsamba/samba_install.py 2011-06-21 11:46:28.000000000 +0200 -@@ -109,7 +109,7 @@ +--- ./buildtools/wafsamba/samba_install.py.orig 2015-08-09 19:55:47.819170736 +0000 ++++ ./buildtools/wafsamba/samba_install.py 2015-08-09 19:56:18.727356203 +0000 +@@ -116,7 +116,7 @@ + inst_name = bld.make_libname(t.target) + elif self.vnum: + vnum_base = self.vnum.split('.')[0] +- install_name = bld.make_libname(target_name, version=self.vnum) ++ install_name = bld.make_libname(target_name, version=vnum_base) + install_link = bld.make_libname(target_name, version=vnum_base) inst_name = bld.make_libname(t.target) - elif self.vnum: - vnum_base = self.vnum.split('.')[0] -- install_name = bld.make_libname(target_name, version=self.vnum) -+ install_name = bld.make_libname(target_name, version=vnum_base) - install_link = bld.make_libname(target_name, version=vnum_base) - inst_name = bld.make_libname(t.target) - if not self.private_library: + if not self.private_library: Index: head/devel/tevent/files/patch-wscript =================================================================== --- head/devel/tevent/files/patch-wscript (revision 393832) +++ head/devel/tevent/files/patch-wscript (revision 393833) @@ -1,20 +1,20 @@ ---- wscript.orig 2013-03-02 08:57:47.000000000 +0000 -+++ wscript 2013-06-30 06:22:09.109879947 +0000 -@@ -90,7 +90,7 @@ - SRC += ' tevent_epoll.c' +--- ./wscript.orig 2015-06-13 01:00:10.000000000 +0000 ++++ ./wscript 2015-08-09 20:15:06.617305973 +0000 +@@ -93,7 +93,7 @@ + SRC += ' tevent_port.c' if bld.env.standalone_tevent: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' private_library = False else: private_library = True -@@ -120,7 +120,7 @@ - pattern='tevent.py', - installdir='python') +@@ -121,7 +121,7 @@ + cflags='-DPACKAGE_VERSION=\"%s\"' % VERSION) -- bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False) -+ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py*', flat=False) +- bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py', flat=False) ++ bld.INSTALL_WILDCARD('${PYTHONARCHDIR}', 'tevent.py*', flat=False) - def test(ctx): + # install out various python scripts for use by make test + bld.SAMBA_SCRIPT('tevent_python',