Attachment #234593 for bug #257432




PORTNAME=		talloc
DISTVERSION=		2.3.4
PORTREVISION=		0
CATEGORIES=		devel
MASTER_SITES=		SAMBA



LICENSE=		LGPL3

USES=			compiler pkgconfig shebangfix waf

CONFLICTS_INSTALL=	talloc1

#FLAVORS=		default nopython
#nopython_PKGNAMESUFFIX=	-nopython
#nopython_CONFLICTS=	talloc
#default_CONFLICTS=	talloc-nopython

USES=			compiler pkgconfig waf
USE_LDCONFIG=		yes
SHEBANG_GLOB=		*.py
WAF_CMD=		buildtools/bin/waf
CONFIGURE_LOG=		bin/config.log

CONFIGURE_ENV=		PYTHONHASHSEED=1 XSLTPROC="true"
CONFIGURE_ARGS=		--mandir=${MANPREFIX}/man \

CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
			--disable-rpath \
			--disable-rpath-install \
			--bundled-libraries=NONE \
			--builtin-libraries=replace \
			--without-gettext
MAKE_ENV=		PYTHONHASHSEED=1

OPTIONS_DEFINE=		DEBUG PYTHON
OPTIONS_DEFAULT=	PYTHON
OPTIONS_SUB=		yes

DEBUG_CFLAGS=		-g -ggdb3 -O0
DEBUG_CONFIGURE_ON=	--verbose --enable-debug
DEBUG_MAKE_ARGS=	--verbose
DEBUG_FLAGS=		-g -ggdb3 -O0

.include <bsd.port.options.mk>

PLIST_FILES+=		include/talloc.h \
			lib/libtalloc.so \
			lib/libtalloc.so.2 \
			${PKGCONFIGDIR}/talloc.pc

.if defined(NO_PYTHON)
USES+=			python:build,test
CONFIGURE_ARGS+=	--disable-python
.else
USES+=			python:3.4+

PYTHON_USES=		gettext-runtime python:3.6+
PYTHON_USES_OFF=	python:build,test
PYTHON_CONFIGURE_OFF=	--disable-python
			${PYTHON_SITELIBDIR}/talloc${PYTHON_EXT_SUFFIX}.so \
			${PKGCONFIGDIR}/pytalloc-util${PYTHON_EXT_SUFFIX}.pc
.endif

pre-build:
	${MKDIR} ${BUILD_WRKSRC}/bin/default/man
	${INSTALL_MAN} ${FILESDIR}/talloc.3 ${BUILD_WRKSRC}/bin/default/man
CONFIGURE_ENV+=		XSLTPROC="true"
.else
BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
			xsltproc:textproc/libxslt
.endif
# 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}

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-MANPAGES-off:
			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
.for man in ${TALLOC_MAN3}
			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
.endfor

post-install:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so.2

post-install-PYTHON-on:
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so
	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/devel/talloc/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1588982811	1	TIMESTAMP = 1654819215
2	SHA256 (talloc-2.3.1.tar.gz) = ef4822d2fdafd2be8e0cabc3ec3c806ae29b8268e932c5e9a4cd5585f37f9f77	2	SHA256 (talloc-2.3.4.tar.gz) = 179f9ebe265e67e4ab2c26cad2b7de4b6a77c6c212f966903382869f06be6505
3	SIZE (talloc-2.3.1.tar.gz) = 638878	3	SIZE (talloc-2.3.4.tar.gz) = 674196

Lines 1-11 Link Here

(-)b/devel/talloc/files/patch-wscript (-2 / +2 lines)
1	--- wscript.orig 2019-03-21 10:12:32 UTC	1	--- wscript.orig 2021-07-15 07:04:32 UTC
2	+++ wscript	2	+++ wscript
3	@@ -45,13 +45,14 @@ def configure(conf):	3	@@ -45,13 +45,14 @@ def configure(conf):
4	conf.env.TALLOC_COMPAT1 = False	4	conf.env.TALLOC_COMPAT1 = False
5	if conf.env.standalone_talloc:	5	if conf.env.standalone_talloc:
6	conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1	6	conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
7	- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'	7	- conf.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
8	+ conf.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%'	8	+ conf.env.PKGCONFIGDIR = '${LIBDIR}data/pkgconfig'
9	conf.env.TALLOC_VERSION = VERSION	9	conf.env.TALLOC_VERSION = VERSION
10		10
11	conf.CHECK_XSLTPROC_MANPAGES()	11	conf.CHECK_XSLTPROC_MANPAGES()

Added Link Here

(-)b/devel/talloc/pkg-plist (+10 lines)
1	%%PYTHON%%include/pytalloc.h
2	include/talloc.h
3	%%PYTHON%%lib/libpytalloc-util%%PYTHON_EXT_SUFFIX%%.so
4	%%PYTHON%%lib/libpytalloc-util%%PYTHON_EXT_SUFFIX%%.so.2
5	lib/libtalloc.so
6	lib/libtalloc.so.2
7	%%PYTHON%%%%PYTHON_SITELIBDIR%%/talloc%%PYTHON_EXT_SUFFIX%%.so
8	%%PYTHON%%libdata/pkgconfig/pytalloc-util%%PYTHON_EXT_SUFFIX%%.pc
9	libdata/pkgconfig/talloc.pc
10	man/man3/talloc.3.gz

Return to bug 257432

Lines 1-6 Link Here

(-)b/devel/talloc/Makefile (-81 / +25 lines)
1	PORTNAME= talloc	1	PORTNAME= talloc
2	PORTVERSION= 2.3.1	2	DISTVERSION= 2.3.4
3	PORTREVISION= 0
4	CATEGORIES= devel	3	CATEGORIES= devel
5	MASTER_SITES= SAMBA	4	MASTER_SITES= SAMBA
6		5
Lines 9-105 COMMENT= Hierarchical pool based memory allocator Link Here
9		8
10	LICENSE= LGPL3	9	LICENSE= LGPL3
11		10
12	IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be built with THREADS support	11	USES= compiler pkgconfig shebangfix waf
13
14	CONFLICTS_INSTALL= talloc1
15
16	#FLAVORS= default nopython
17	#nopython_PKGNAMESUFFIX= -nopython
18	#nopython_CONFLICTS= talloc
19	#default_CONFLICTS= talloc-nopython
20
21	USES= compiler pkgconfig waf
22	USE_LDCONFIG= yes	12	USE_LDCONFIG= yes
		13	SHEBANG_GLOB= *.py
23	WAF_CMD= buildtools/bin/waf	14	WAF_CMD= buildtools/bin/waf
24	CONFIGURE_LOG= bin/config.log	15	CONFIGURE_LOG= bin/config.log
25		16
26	PKGCONFIGDIR?= ${PREFIX}/libdata/pkgconfig	17	CONFIGURE_ENV= PYTHONHASHSEED=1 XSLTPROC="true"
27	PLIST_SUB+= PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}	18	CONFIGURE_ARGS= --mandir=${MANPREFIX}/man \
28
29	CONFIGURE_ARGS+= --mandir=${MANPREFIX}/man \
30	--disable-rpath \	19	--disable-rpath \
		20	--disable-rpath-install \
		21	--bundled-libraries=NONE \
		22	--builtin-libraries=replace \
31	--without-gettext	23	--without-gettext
		24	MAKE_ENV= PYTHONHASHSEED=1
32		25
33	OPTIONS_DEFINE= MANPAGES DEBUG	26	OPTIONS_DEFINE= DEBUG PYTHON
34	MANPAGES_DESC= Build and install manpages (requires textproc/docbook-xsl)	27	OPTIONS_DEFAULT= PYTHON
		28	OPTIONS_SUB= yes
35		29
		30	DEBUG_CFLAGS= -g -ggdb3 -O0
36	DEBUG_CONFIGURE_ON= --verbose --enable-debug	31	DEBUG_CONFIGURE_ON= --verbose --enable-debug
37	DEBUG_MAKE_ARGS= --verbose	32	DEBUG_MAKE_ARGS= --verbose
38	DEBUG_FLAGS= -g -ggdb3 -O0
39
40	.include <bsd.port.options.mk>
41
42	PLIST_FILES+= include/talloc.h \
43	lib/libtalloc.so \
44	lib/libtalloc.so.2 \
45	${PKGCONFIGDIR}/talloc.pc
46
47	.if defined(NO_PYTHON)
48	USES+= python:build,test
49	CONFIGURE_ARGS+= --disable-python
50	.else
51	USES+= python:3.4+
52		33
53	PLIST_FILES+= include/pytalloc.h \	34	PYTHON_USES= gettext-runtime python:3.6+
54	lib/libpytalloc-util${PYTHON_EXT_SUFFIX}.so \	35	PYTHON_USES_OFF= python:build,test
55	lib/libpytalloc-util${PYTHON_EXT_SUFFIX}.so.2 \	36	PYTHON_CONFIGURE_OFF= --disable-python
56	${PYTHON_SITELIBDIR}/talloc${PYTHON_EXT_SUFFIX}.so \
57	${PKGCONFIGDIR}/pytalloc-util${PYTHON_EXT_SUFFIX}.pc
58	.endif
59		37
60	.include <bsd.port.pre.mk>	38	pre-build:
61		39	${MKDIR} ${BUILD_WRKSRC}/bin/default/man
62	.if ! ${PORT_OPTIONS:MMANPAGES}	40	${INSTALL_MAN} ${FILESDIR}/talloc.3 ${BUILD_WRKSRC}/bin/default/man
63	CONFIGURE_ENV+= XSLTPROC="true"
64	.else
65	BUILD_DEPENDS+= ${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
66	xsltproc:textproc/libxslt
67	.endif
68	# No fancy color error messages
69	.if ${COMPILER_TYPE} == "clang"
70	CFLAGS+= -fno-color-diagnostics
71	.endif
72	CONFIGURE_ENV+= NOCOLOR=yes
73	MAKE_ENV+= NOCOLOR=yes
74
75	TALLOC_MAN3= man/man3/talloc.3.gz
76
77	PLIST_FILES+= ${TALLOC_MAN3}
78
79	post-patch:
80	@${REINPLACE_CMD} -e 's\|%%PKGCONFIGDIR%%\|${PKGCONFIGDIR}\|g' \
81	${BUILD_WRKSRC}/wscript
82
83	# Use threading (or multiprocessing) but not thread (renamed in python 3+).
84	pre-configure:
85	@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
86	${ECHO_CMD}; \
87	${ECHO_MSG} "===> ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
88	${ECHO_CMD}; \
89	${FALSE}; \
90	fi
91
92	pre-build-MANPAGES-off:
93	-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
94	.for man in ${TALLOC_MAN3}
95	${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
96	.endfor
97		41
98	post-install:	42	post-install:
99	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so	43	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtalloc.so.2
100	.if !defined(NO_PYTHON)	44
101	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so	45	post-install-PYTHON-on:
102	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so	46	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libpytalloc-util*.so
103	.endif	47	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/talloc*.so
104		48
105	.include <bsd.port.post.mk>	49	.include <bsd.port.mk>