diff options
| author | Timur I. Bakeyev <timur@FreeBSD.org> | 2013-01-31 15:03:47 +0000 |
|---|---|---|
| committer | Timur I. Bakeyev <timur@FreeBSD.org> | 2013-01-31 15:03:47 +0000 |
| commit | 3fcb8de796962d931b5157a5278df00f0b31ae28 (patch) | |
| tree | 786b26e233381837ba493f992f3fc2b4ab3970d2 /databases/tdb | |
| parent | bf2978046e45e7bb2dee0ed876e0d577ef5630f3 (diff) | |
Update port to the latest version
Notes
Notes:
svn path=/head/; revision=311316
Diffstat (limited to 'databases/tdb')
| -rw-r--r-- | databases/tdb/Makefile | 17 | ||||
| -rw-r--r-- | databases/tdb/distinfo | 4 | ||||
| -rw-r--r-- | databases/tdb/files/patch-buildtools__wafsamba__samba_install.py | 4 | ||||
| -rw-r--r-- | databases/tdb/files/patch-wscript | 10 |
4 files changed, 14 insertions, 21 deletions
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile index 4d60e2c6c0f5..1f9ed158f52f 100644 --- a/databases/tdb/Makefile +++ b/databases/tdb/Makefile @@ -1,18 +1,11 @@ -# New ports collection makefile for: tdb -# Date created: 1 May 2009 -# Whom: Koop Mast <kwm@FreeBSD.org> -# # $FreeBSD$ -# PORTNAME= tdb -PORTVERSION= 1.2.9 +PORTVERSION= 1.2.11 PORTREVISION= 0 PORTEPOCH= 1 CATEGORIES= databases -MASTER_SITES= ftp://ftp.samba.org/pub/%SUBDIR%/ \ - ftp://ca.samba.org/pub/%SUBDIR%/ \ - ftp://de.samba.org/pub/%SUBDIR%/ +MASTER_SITES= ${MASTER_SITE_SAMBA} MASTER_SITE_SUBDIR= ${PORTNAME} MAINTAINER= timur@FreeBSD.org @@ -27,7 +20,7 @@ USE_LDCONFIG= yes HAS_CONFIGURE= yes WAF_TOOL= buildtools/bin/waf CONFIGURE_SCRIPT= ${WAF_TOOL} configure -USE_GNOME= pkgconfig +USE_PKGCONFIG= build MAKE_JOBS_SAFE= yes @@ -102,7 +95,7 @@ pre-build: do-build: @(cd ${BUILD_WRKSRC}; \ - if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} build; then \ + if ! ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${BUILD_WRKSRC}/${WAF_TOOL} ${_MAKE_JOBS} ${MAKE_ARGS} ${ALL_TARGET}; then \ if [ x != x${BUILD_FAIL_MESSAGE} ] ; then \ ${ECHO_MSG} "===> Compilation failed unexpectedly."; \ (${ECHO_CMD} ${BUILD_FAIL_MESSAGE}) | ${FMT} 75 79 ; \ @@ -111,6 +104,6 @@ do-build: fi) do-install: - @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} install) + @(cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PYTHON_CMD} ${INSTALL_WRKSRC}/${WAF_TOOL} ${MAKE_ARGS} ${INSTALL_TARGET}) .include <bsd.port.post.mk> diff --git a/databases/tdb/distinfo b/databases/tdb/distinfo index 39a56027a75c..ba766d4cbb00 100644 --- a/databases/tdb/distinfo +++ b/databases/tdb/distinfo @@ -1,2 +1,2 @@ -SHA256 (tdb-1.2.9.tar.gz) = 886fbca71710b9fcf168ffcae47f05a6c3ff3392cf951f4cb1f949851c04f9ed -SIZE (tdb-1.2.9.tar.gz) = 368475 +SHA256 (tdb-1.2.11.tar.gz) = f10eae6361b033131d2deebfcccbcaeb3d8006747005f5240d68e8b70632f6c2 +SIZE (tdb-1.2.11.tar.gz) = 481298 diff --git a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py index db564bd2376c..61e6a661673c 100644 --- a/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py +++ b/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py @@ -1,5 +1,5 @@ ---- 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 +--- ./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 @@ inst_name = bld.make_libname(t.target) elif self.vnum: diff --git a/databases/tdb/files/patch-wscript b/databases/tdb/files/patch-wscript index 562ac55ec282..ce7c161e3ab1 100644 --- a/databases/tdb/files/patch-wscript +++ b/databases/tdb/files/patch-wscript @@ -1,11 +1,11 @@ ---- ./wscript.orig 2011-04-05 03:59:59.000000000 +0200 -+++ ./wscript 2011-04-05 04:00:57.000000000 +0200 -@@ -63,7 +63,7 @@ +--- ./wscript.orig 2012-04-11 12:36:12.000000000 +0000 ++++ ./wscript 2013-01-29 20:56:34.289900427 +0000 +@@ -68,7 +68,7 @@ io.c open.c transaction.c hash.c summary.c''') if bld.env.standalone_tdb: - bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' + bld.env.PKGCONFIGDIR = '%%PKGCONFIGDIR%%' - bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) - bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) private_library = False + else: + private_library = True |