Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 31 Jan 2013 15:03:48 +0000 (UTC)
From:      "Timur I. Bakeyev" <timur@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r311316 - in head/databases/tdb: . files
Message-ID:  <201301311503.r0VF3m8s016213@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: timur
Date: Thu Jan 31 15:03:47 2013
New Revision: 311316
URL: http://svnweb.freebsd.org/changeset/ports/311316

Log:
  Update port to the latest version

Modified:
  head/databases/tdb/Makefile
  head/databases/tdb/distinfo
  head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
  head/databases/tdb/files/patch-wscript

Modified: head/databases/tdb/Makefile
==============================================================================
--- head/databases/tdb/Makefile	Thu Jan 31 15:03:03 2013	(r311315)
+++ head/databases/tdb/Makefile	Thu Jan 31 15:03:47 2013	(r311316)
@@ -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>

Modified: head/databases/tdb/distinfo
==============================================================================
--- head/databases/tdb/distinfo	Thu Jan 31 15:03:03 2013	(r311315)
+++ head/databases/tdb/distinfo	Thu Jan 31 15:03:47 2013	(r311316)
@@ -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

Modified: head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py
==============================================================================
--- head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py	Thu Jan 31 15:03:03 2013	(r311315)
+++ head/databases/tdb/files/patch-buildtools__wafsamba__samba_install.py	Thu Jan 31 15:03:47 2013	(r311316)
@@ -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:

Modified: head/databases/tdb/files/patch-wscript
==============================================================================
--- head/databases/tdb/files/patch-wscript	Thu Jan 31 15:03:03 2013	(r311315)
+++ head/databases/tdb/files/patch-wscript	Thu Jan 31 15:03:47 2013	(r311316)
@@ -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



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