Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 30 Jul 2022 00:08:16 GMT
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: ef9a3b42d9a4 - main - devel/tevent: Update 0.10.2 to 0.13.0
Message-ID:  <202207300008.26U08GPQ060357@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by timur:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ef9a3b42d9a41e6d4ddcfef8abb9e560a1534044

commit ef9a3b42d9a41e6d4ddcfef8abb9e560a1534044
Author:     Timur I. Bakeyev <timur@FreeBSD.org>
AuthorDate: 2022-07-29 12:16:02 +0000
Commit:     Timur I. Bakeyev <timur@FreeBSD.org>
CommitDate: 2022-07-30 00:07:50 +0000

    devel/tevent: Update 0.10.2 to 0.13.0
    
    PR:             257442
---
 devel/tevent/Makefile  | 159 ++++++++++++++++++++-----------------------------
 devel/tevent/distinfo  |   6 +-
 devel/tevent/pkg-plist |   7 +++
 3 files changed, 75 insertions(+), 97 deletions(-)

diff --git a/devel/tevent/Makefile b/devel/tevent/Makefile
index 7897c7a480a8..b049a6f98067 100644
--- a/devel/tevent/Makefile
+++ b/devel/tevent/Makefile
@@ -1,100 +1,71 @@
-PORTNAME=		tevent
-PORTVERSION=		0.10.2
-PORTREVISION=		1
-PORTEPOCH=		0
-CATEGORIES=		devel
-MASTER_SITES=		SAMBA
-
-MAINTAINER=		timur@FreeBSD.org
-COMMENT=		Talloc based event loop library
-
-LICENSE=		LGPL3
-
-IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
-
-BUILD_DEPENDS=		talloc>=2.3.1:devel/talloc
-RUN_DEPENDS=		talloc>=2.3.1:devel/talloc
-
-CONFLICTS_INSTALL=	tevent1
-
-#FLAVORS=		default nopython
-#nopython_PKGNAMESUFFIX=	-nopython
-#nopython_CONFLICTS=	tevent
-#default_CONFLICTS=	tevent-nopython
-
-USES=			compiler gettext-runtime 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+=	--bundled-libraries=!talloc
-
-CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
-			--disable-rpath \
-			--without-gettext
-
-OPTIONS_DEFINE=		MANPAGES DEBUG
-MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
-
-DEBUG_CONFIGURE_ON=	--verbose --enable-debug
-DEBUG_MAKE_ARGS=	--verbose
-DEBUG_FLAGS=		-g -ggdb3 -O0
-
-.include <bsd.port.options.mk>
-
-PLIST_FILES+=		include/tevent.h \
-			lib/libtevent.so \
-			lib/libtevent.so.0 \
-			${PKGCONFIGDIR}/tevent.pc
-
-.if defined(NO_PYTHON)
-USES+=			python:build,test
-CONFIGURE_ARGS+=	--disable-python
-.else
-USES+=			python:3.4+
-USE_PYTHON=		py3kplist
-
-PLIST_FILES+=		${PYTHON_SITELIBDIR}/_tevent${PYTHON_EXT_SUFFIX}.so \
-			${PYTHON_SITELIBDIR}/tevent.py \
-			${PYTHON_SITELIBDIR}/__pycache__/tevent.cpython-${PYTHON_SUFFIX}.pyc
-.endif
-
-.include <bsd.port.pre.mk>
-
-.if ! ${PORT_OPTIONS:MMANPAGES}
-CONFIGURE_ENV+=		XSLTPROC="true"
-.else
-BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
-			xsltproc:textproc/libxslt
-.endif
+PORTNAME=			tevent
+DISTVERSION=			0.13.0
+PORTREVISION=			0
+PORTEPOCH=			0
+CATEGORIES=			devel
+MASTER_SITES=			SAMBA
+
+MAINTAINER=			timur@FreeBSD.org
+COMMENT=			Talloc based event loop library
+
+LICENSE=			LGPL3
+
+BUILD_DEPENDS=			talloc>=2.3.4:devel/talloc
+RUN_DEPENDS=			talloc>=2.3.4:devel/talloc
+
+USES=				compiler pkgconfig shebangfix  waf
+USE_LDCONFIG=			yes
+SHEBANG_GLOB=			*.py
+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 \
+				--disable-rpath \
+				--disable-rpath-install \
+				--bundled-libraries=!talloc,cmocka \
+				--builtin-libraries=replace \
+				--without-gettext
+CONFIGURE_ENV=			PYTHONHASHSEED=1
+MAKE_ENV=			PYTHONHASHSEED=1
+
+MANPAGES_DESC=			Build and install manpages (requires textproc/docbook-xsl)
+
+OPTIONS_DEFINE=			DEBUG MANPAGES PYTHON
+OPTIONS_DEFAULT=		PYTHON
+OPTIONS_SUB=			yes
+
+DEBUG_CFLAGS=			-g -ggdb3 -O0
+DEBUG_CONFIGURE_ON=		--verbose --enable-debug
+DEBUG_MAKE_ARGS=		--verbose
+
+PYTHON_USES=			gettext-runtime python:3.6+
+PYTHON_USE+=			python=py3kplist
+PYTHON_USES_OFF=		python:build,test
+PYTHON_CONFIGURE_OFF=		--disable-python
+
+MANPAGES_CONFIGURE_ENV_OFF+=	XSLTPROC="true"
+MANPAGES_BUILD_DEPENDS+=	${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
+				xsltproc:textproc/libxslt
 # No fancy color error messages
-.if ${COMPILER_TYPE} == "clang"
-CFLAGS+=		-fno-color-diagnostics
-.endif
-CONFIGURE_ENV+=		NOCOLOR=yes
-MAKE_ENV+=		NOCOLOR=yes
+CFLAGS+=			${CFLAGS_${CHOSEN_COMPILER_TYPE}}
+CFLAGS_clang=			-fno-color-diagnostics
+CONFIGURE_ENV+=			NOCOLOR=yes
+MAKE_ENV+=			NOCOLOR=yes
 
 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
+				@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
+					${BUILD_WRKSRC}/wscript
 
 post-install:
-			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
-.if !defined(NO_PYTHON)
-			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent*.so
-			${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
-.endif
+				${RM} ${STAGEDIR}${PREFIX}/lib/tevent/libcmocka-tevent.so
+				${RMDIR} ${STAGEDIR}${PREFIX}/lib/tevent
+				${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
+
+post-install-PYTHON-on:
+				${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent*.so
+				${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/devel/tevent/distinfo b/devel/tevent/distinfo
index 4ce5130ba8c1..4030eb8fffbf 100644
--- a/devel/tevent/distinfo
+++ b/devel/tevent/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1588983240
-SHA256 (tevent-0.10.2.tar.gz) = f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696
-SIZE (tevent-0.10.2.tar.gz) = 800731
+TIMESTAMP = 1659089677
+SHA256 (tevent-0.13.0.tar.gz) = b9437a917fa55344361beb64ec9e0042e99cae8879882a62dd38f6abe2371d0c
+SIZE (tevent-0.13.0.tar.gz) = 880601
diff --git a/devel/tevent/pkg-plist b/devel/tevent/pkg-plist
new file mode 100644
index 000000000000..151f5ea3ffb3
--- /dev/null
+++ b/devel/tevent/pkg-plist
@@ -0,0 +1,7 @@
+include/tevent.h
+lib/libtevent.so
+lib/libtevent.so.0
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/tevent%%PYTHON_EXT_SUFFIX%%.pyc
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so
+%%PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
+%%PKGCONFIGDIR%%/tevent.pc



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202207300008.26U08GPQ060357>