View | Details | Raw Unified | Return to bug 257442 | Differences between
and this patch

Collapse All | Expand All

(-)b/devel/tevent/Makefile (-76 / +24 lines)
Lines 1-7 Link Here
1
PORTNAME=		tevent
1
PORTNAME=		tevent
2
PORTVERSION=		0.10.2
2
DISTVERSION=		0.12.1
3
PORTREVISION=		1
4
PORTEPOCH=		0
5
CATEGORIES=		devel
3
CATEGORIES=		devel
6
MASTER_SITES=		SAMBA
4
MASTER_SITES=		SAMBA
7
5
Lines 10-100 COMMENT= Talloc based event loop library Link Here
10
8
11
LICENSE=		LGPL3
9
LICENSE=		LGPL3
12
10
13
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
11
BUILD_DEPENDS=		cmocka>=1.1.3:sysutils/cmocka
12
LIB_DEPENDS=		libtalloc.so:devel/talloc
14
13
15
BUILD_DEPENDS=		talloc>=2.3.1:devel/talloc
14
USES=			pkgconfig shebangfix waf
16
RUN_DEPENDS=		talloc>=2.3.1:devel/talloc
17
18
CONFLICTS_INSTALL=	tevent1
19
20
#FLAVORS=		default nopython
21
#nopython_PKGNAMESUFFIX=	-nopython
22
#nopython_CONFLICTS=	tevent
23
#default_CONFLICTS=	tevent-nopython
24
25
USES=			compiler gettext-runtime pkgconfig waf
26
USE_LDCONFIG=		yes
15
USE_LDCONFIG=		yes
16
SHEBANG_GLOB=		*.py
27
WAF_CMD=		buildtools/bin/waf
17
WAF_CMD=		buildtools/bin/waf
28
CONFIGURE_LOG=		bin/config.log
18
CONFIGURE_LOG=		bin/config.log
29
19
30
PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
20
CONFIGURE_ENV=		PYTHONHASHSEED=1 XSLTPROC="true"
31
PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
21
CONFIGURE_ARGS=		--mandir=${MANPREFIX}/man \
32
33
CONFIGURE_ARGS+=	--bundled-libraries=!talloc
34
35
CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
36
			--disable-rpath \
22
			--disable-rpath \
23
			--disable-rpath-install \
24
			--bundled-libraries=NONE \
25
			--builtin-libraries=replace \
37
			--without-gettext
26
			--without-gettext
27
MAKE_ENV=		PYTHONHASHSEED=1
38
28
39
OPTIONS_DEFINE=		MANPAGES DEBUG
29
OPTIONS_DEFINE=		DEBUG PYTHON
40
MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
30
OPTIONS_DEFAULT=	PYTHON
31
OPTIONS_SUB=		yes
41
32
33
DEBUG_CFLAGS=		-g -ggdb3 -O0
42
DEBUG_CONFIGURE_ON=	--verbose --enable-debug
34
DEBUG_CONFIGURE_ON=	--verbose --enable-debug
43
DEBUG_MAKE_ARGS=	--verbose
35
DEBUG_MAKE_ARGS=	--verbose
44
DEBUG_FLAGS=		-g -ggdb3 -O0
45
46
.include <bsd.port.options.mk>
47
48
PLIST_FILES+=		include/tevent.h \
49
			lib/libtevent.so \
50
			lib/libtevent.so.0 \
51
			${PKGCONFIGDIR}/tevent.pc
52
36
53
.if defined(NO_PYTHON)
37
PYTHON_USES=		gettext-runtime python:3.6+
54
USES+=			python:build,test
38
PYTHON_USES_OFF=	python:build,test
55
CONFIGURE_ARGS+=	--disable-python
39
PYTHON_CONFIGURE_OFF=   --disable-python
56
.else
57
USES+=			python:3.4+
58
USE_PYTHON=		py3kplist
59
60
PLIST_FILES+=		${PYTHON_SITELIBDIR}/_tevent${PYTHON_EXT_SUFFIX}.so \
61
			${PYTHON_SITELIBDIR}/tevent.py \
62
			${PYTHON_SITELIBDIR}/__pycache__/tevent.cpython-${PYTHON_SUFFIX}.pyc
63
.endif
64
65
.include <bsd.port.pre.mk>
66
67
.if ! ${PORT_OPTIONS:MMANPAGES}
68
CONFIGURE_ENV+=		XSLTPROC="true"
69
.else
70
BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
71
			xsltproc:textproc/libxslt
72
.endif
73
# No fancy color error messages
74
.if ${COMPILER_TYPE} == "clang"
75
CFLAGS+=		-fno-color-diagnostics
76
.endif
77
CONFIGURE_ENV+=		NOCOLOR=yes
78
MAKE_ENV+=		NOCOLOR=yes
79
80
post-patch:
81
			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
82
				${BUILD_WRKSRC}/wscript
83
84
# Use threading (or multiprocessing) but not thread (renamed in python 3+).
85
pre-configure:
86
			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
87
				${ECHO_CMD}; \
88
				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
89
				${ECHO_CMD}; \
90
				${FALSE}; \
91
			fi
92
40
93
post-install:
41
post-install:
94
			${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
42
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtevent.so
95
.if !defined(NO_PYTHON)
43
96
			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent*.so
44
post-install-PYTHON-on:
97
			${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
45
	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/_tevent*.so
98
.endif
46
	${PYTHON_CMD} -m compileall -d ${PYTHON_SITELIBDIR} ${STAGEDIR}${PYTHON_SITELIBDIR}
99
47
100
.include <bsd.port.post.mk>
48
.include <bsd.port.mk>
(-)b/devel/tevent/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1588983240
1
TIMESTAMP = 1654817272
2
SHA256 (tevent-0.10.2.tar.gz) = f8427822e5b2878fb8b28d6f50d96848734f3f3130612fb574fdd2d2148a6696
2
SHA256 (tevent-0.12.1.tar.gz) = d157ec123053f6cab1a4ef42579c1a37b7817f7b4893b7f3167708dc8e467763
3
SIZE (tevent-0.10.2.tar.gz) = 800731
3
SIZE (tevent-0.12.1.tar.gz) = 879683
(-)b/devel/tevent/files/patch-wscript (-3 / +3 lines)
Lines 1-11 Link Here
1
--- wscript.orig	2017-07-22 22:25:22 UTC
1
--- wscript.orig	2021-07-08 07:42:39 UTC
2
+++ wscript
2
+++ wscript
3
@@ -88,7 +88,7 @@ def build(bld):
3
@@ -97,7 +97,7 @@ def build(bld):
4
         SRC += ' tevent_port.c'
4
         SRC += ' tevent_port.c'
5
 
5
 
6
     if bld.env.standalone_tevent:
6
     if bld.env.standalone_tevent:
7
-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
7
-        bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
8
+        bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'
8
+        bld.env.PKGCONFIGDIR = '${LIBDIR}data/pkgconfig'
9
         private_library = False
9
         private_library = False
10
     else:
10
     else:
11
         private_library = True
11
         private_library = True
(-)b/devel/tevent/pkg-plist (+7 lines)
Added Link Here
1
include/tevent.h
2
lib/libtevent.so
3
lib/libtevent.so.0
4
%%PYTHON%%%%PYTHON_SITELIBDIR%%/__pycache__/tevent%%PYTHON_EXT_SUFFIX%%.pyc
5
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_tevent%%PYTHON_EXT_SUFFIX%%.so
6
%%PYTHON%%%%PYTHON_SITELIBDIR%%/tevent.py
7
libdata/pkgconfig/tevent.pc

Return to bug 257442