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

Collapse All | Expand All

(-)b/databases/tdb/Makefile (-91 / +21 lines)
Lines 1-6 Link Here
1
PORTNAME=		tdb
1
PORTNAME=		tdb
2
PORTVERSION=		1.4.3
2
DISTVERSION=		1.4.5
3
PORTREVISION=		0
4
PORTEPOCH=		1
3
PORTEPOCH=		1
5
CATEGORIES=		databases
4
CATEGORIES=		databases
6
MASTER_SITES=		SAMBA
5
MASTER_SITES=		SAMBA
Lines 10-116 COMMENT= Trivial Database Link Here
10
9
11
LICENSE=		GPLv3
10
LICENSE=		GPLv3
12
11
13
IGNORE_NONTHREAD_PYTHON=needs port lang/python${PYTHON_SUFFIX} to be build with THREADS support
12
USES=			pkgconfig shebangfix waf
14
15
CONFLICTS_INSTALL=	tdb1-*
16
17
#FLAVORS=		default nopython debug
18
#nopython_PKGNAMESUFFIX=	-nopython
19
#debug_PKGNAMESUFFIX=	-debug
20
#nopython_CONFLICTS=	tdb tdb-debug
21
#debug_CONFLICTS=	tdb tdb-nopython
22
#default_CONFLICTS=	tdb-nopython tdb-debug
23
24
USES=			compiler gettext-runtime pkgconfig waf 
25
USE_LDCONFIG=		yes
13
USE_LDCONFIG=		yes
14
SHEBANG_GLOB=		*.py
26
WAF_CMD=		buildtools/bin/waf
15
WAF_CMD=		buildtools/bin/waf
27
CONFIGURE_LOG=		bin/config.log
16
CONFIGURE_LOG=		bin/config.log
28
17
29
PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
18
CONFIGURE_ENV=		XSLTPROC="true"
30
PLIST_SUB+=		PKGCONFIGDIR=${PKGCONFIGDIR:S;${PREFIX}/;;}
19
CONFIGURE_ARGS=		--mandir=${MANPREFIX}/man \
31
32
CONFIGURE_ARGS+=	--mandir=${MANPREFIX}/man \
33
			--disable-rpath \
20
			--disable-rpath \
34
			--without-gettext
21
			--without-gettext
35
22
36
OPTIONS_DEFINE=		MANPAGES DEBUG
23
OPTIONS_DEFINE=		DEBUG PYTHON
37
MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
24
OPTIONS_DEFAULT=	PYTHON
25
OPTIONS_SUB=		yes
38
26
27
DEBUG_CFLAGS=		-g -ggdb3 -O0 -DTDB_TRACE=1
39
DEBUG_CONFIGURE_ON=	--verbose --enable-debug
28
DEBUG_CONFIGURE_ON=	--verbose --enable-debug
40
DEBUG_MAKE_ARGS=	--verbose
29
DEBUG_MAKE_ARGS=	--verbose
41
DEBUG_FLAGS=		-g -ggdb3 -O0 -DTDB_TRACE=1
42
43
.include <bsd.port.options.mk>
44
45
TDB_BINS=		bin/tdbbackup \
46
			bin/tdbdump \
47
			bin/tdbrestore \
48
			bin/tdbtool
49
50
PLIST_FILES+=		include/tdb.h \
51
			${TDB_BINS} \
52
			lib/libtdb.so \
53
			lib/libtdb.so.1 \
54
			${PKGCONFIGDIR}/tdb.pc
55
56
30
57
.if defined(NO_PYTHON)
31
PYTHON_USES=		gettext-runtime python:3.6+
58
USES+=			python:build,test
32
PYTHON_USES_OFF=	python:build,test
59
CONFIGURE_ARGS+=	--disable-python
33
PYTHON_CONFIGURE_OFF=	--disable-python
60
.else
61
USES+=			python:3.4+
62
34
63
PLIST_FILES+=		${PYTHON_SITELIBDIR}/tdb${PYTHON_EXT_SUFFIX}.so \
35
pre-build:
64
			${PYTHON_SITELIBDIR}/_tdb_text.py
36
	${MKDIR} ${BUILD_WRKSRC}/bin/default/man
65
.endif
37
	${INSTALL_MAN} ${FILESDIR}/tdb*.8 ${BUILD_WRKSRC}/bin/default/man
66
67
.include <bsd.port.pre.mk>
68
69
.if ! ${PORT_OPTIONS:MMANPAGES}
70
CONFIGURE_ENV+=		XSLTPROC="true"
71
.else
72
BUILD_DEPENDS+=		${LOCALBASE}/share/xsl/docbook/manpages/docbook.xsl:textproc/docbook-xsl \
73
			xsltproc:textproc/libxslt
74
.endif
75
# No fancy color error messages
76
.if ${COMPILER_TYPE} == "clang"
77
CFLAGS+=		-fno-color-diagnostics
78
.endif
79
CONFIGURE_ENV+=		NOCOLOR=yes
80
MAKE_ENV+=		NOCOLOR=yes
81
82
TDB_MAN8=		man/man8/tdbbackup.8.gz \
83
			man/man8/tdbdump.8.gz \
84
			man/man8/tdbrestore.8.gz \
85
			man/man8/tdbtool.8.gz
86
87
PLIST_FILES+=		${TDB_MAN8}
88
89
post-patch:
90
			@${REINPLACE_CMD} -e 's|%%PKGCONFIGDIR%%|${PKGCONFIGDIR}|g' \
91
				${BUILD_WRKSRC}/wscript
92
93
# Use threading (or multiprocessing) but not thread (renamed in python 3+).
94
pre-configure:
95
			@if ! ${PYTHON_CMD} -c "import multiprocessing;" 2>/dev/null; then \
96
				${ECHO_CMD}; \
97
				${ECHO_MSG} "===>  ${PKGNAME} "${IGNORE_NONTHREAD_PYTHON:Q}.; \
98
				${ECHO_CMD}; \
99
				${FALSE}; \
100
			fi
101
102
pre-build-MANPAGES-off:
103
			-${MKDIR} ${BUILD_WRKSRC}/bin/default/man
104
.for man in ${TDB_MAN8}
105
			${INSTALL_MAN} ${FILESDIR}/`basename ${man} .gz` ${BUILD_WRKSRC}/bin/default/man
106
.endfor
107
38
108
post-install:
39
post-install:
109
.for lib in ${TDB_BINS} lib/libtdb.so
40
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/tdb*
110
			${STRIP_CMD} ${STAGEDIR}${PREFIX}/${lib}
41
	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libtdb.so.1
111
.endfor
42
112
.if !defined(NO_PYTHON)
43
post-install-PYTHON-on:
113
			${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so
44
	${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/tdb*.so
114
.endif
115
45
116
.include <bsd.port.post.mk>
46
.include <bsd.port.mk>
(-)b/databases/tdb/distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
TIMESTAMP = 1577717387
1
TIMESTAMP = 1627813920
2
SHA256 (tdb-1.4.3.tar.gz) = c8058393dfa15f47e11ebd2f1d132693f0b3b3b8bf22d0201bfb305026f88a1b
2
SHA256 (tdb-1.4.5.tar.gz) = bcfced884f7031080998b5c4b1c5dce57567055f79417f86dba40dcde99a0e41
3
SIZE (tdb-1.4.3.tar.gz) = 702836
3
SIZE (tdb-1.4.5.tar.gz) = 729650
(-)b/databases/tdb/files/patch-wscript (-3 / +3 lines)
Lines 1-11 Link Here
1
--- wscript.orig	2019-02-26 07:02:52 UTC
1
--- wscript.orig	2021-08-01 10:32:58 UTC
2
+++ wscript
2
+++ wscript
3
@@ -121,7 +121,7 @@ def build(bld):
3
@@ -115,7 +115,7 @@ def build(bld):
4
     COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
4
     COMMON_SRC = bld.SUBDIR('common', COMMON_FILES)
5
 
5
 
6
     if bld.env.standalone_tdb:
6
     if bld.env.standalone_tdb:
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/databases/tdb/pkg-plist (+14 lines)
Added Link Here
1
bin/tdbbackup
2
bin/tdbdump
3
bin/tdbrestore
4
bin/tdbtool
5
include/tdb.h
6
lib/libtdb.so
7
lib/libtdb.so.1
8
%%PYTHON%%%%PYTHON_SITELIBDIR%%/_tdb_text.py
9
%%PYTHON%%%%PYTHON_SITELIBDIR%%/tdb%%PYTHON_EXT_SUFFIX%%.so
10
libdata/pkgconfig/tdb.pc
11
man/man8/tdbbackup.8.gz
12
man/man8/tdbdump.8.gz
13
man/man8/tdbrestore.8.gz
14
man/man8/tdbtool.8.gz

Return to bug 257528