svn commit: r503529 - in head/databases/ldb13: . files

[Timur I. Bakeyev]

Author: timur
Date: Wed Jun  5 21:00:06 2019
New Revision: 503529
URL: https://svnweb.freebsd.org/changeset/ports/503529

Log:
  Update port to 1.3.8 version, making it compliant with samba47

Deleted:
  head/databases/ldb13/files/0001-bug-13362.patch
Modified:
  head/databases/ldb13/Makefile
  head/databases/ldb13/distinfo
  head/databases/ldb13/files/patch-wscript

Modified: head/databases/ldb13/Makefile
==============================================================================
--- head/databases/ldb13/Makefile	Wed Jun  5 19:40:49 2019	(r503528)
+++ head/databases/ldb13/Makefile	Wed Jun  5 21:00:06 2019	(r503529)
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME=		ldb
-PORTVERSION=		1.3.6
+PORTVERSION=		1.3.8
 PORTREVISION=		0
 PORTEPOCH=		0
 CATEGORIES=		databases
@@ -26,8 +26,6 @@ LDB_DEPENDS=		talloc>=2.1.14:devel/talloc \
 
 CONFLICTS_INSTALL=	ldb-1.1.* ldb12-1.2.*
 
-EXTRA_PATCHES+=		${PATCHDIR}/0001-bug-13362.patch:-p3
-
 #FLAVORS=		default nopython
 #nopython_PKGNAMESUFFIX=	-nopython
 #nopython_CONFLICTS=	ldb
@@ -53,9 +51,11 @@ CONFIGURE_ARGS+=	--bundled-libraries=!talloc,!tevent,!
 OPTIONS_DEFINE=		MANPAGES DEBUG
 MANPAGES_DESC=		Build and install manpages (requires textproc/docbook-xsl)
 
-.include <bsd.port.options.mk>
-
+DEBUG_CONFIGURE_ON=	--verbose --enable-debug
+DEBUG_MAKE_ARGS=	--verbose
 DEBUG_FLAGS=		-g -ggdb3 -O0
+
+.include <bsd.port.options.mk>
 
 LDB_BINS=		bin/ldbedit \
 			bin/ldbmodify \

Modified: head/databases/ldb13/distinfo
==============================================================================
--- head/databases/ldb13/distinfo	Wed Jun  5 19:40:49 2019	(r503528)
+++ head/databases/ldb13/distinfo	Wed Jun  5 21:00:06 2019	(r503529)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1535926436
-SHA256 (ldb-1.3.6.tar.gz) = 51d23134b356490e75258518dfc5c994c1710ad5357a1e3455a9eaeddff8939a
-SIZE (ldb-1.3.6.tar.gz) = 1374574
+TIMESTAMP = 1557920439
+SHA256 (ldb-1.3.8.tar.gz) = 4d047c687ddc266d0d5a2c16629aa1a6fa6c3114499c9cc80914e3cda16ddca0
+SIZE (ldb-1.3.8.tar.gz) = 1375782

Modified: head/databases/ldb13/files/patch-wscript
==============================================================================
--- head/databases/ldb13/files/patch-wscript	Wed Jun  5 19:40:49 2019	(r503528)
+++ head/databases/ldb13/files/patch-wscript	Wed Jun  5 21:00:06 2019	(r503529)
@@ -1,6 +1,6 @@
---- wscript.orig	2017-09-07 10:04:11 UTC
+--- wscript.orig	2019-02-26 17:14:29 UTC
 +++ wscript
-@@ -126,9 +126,15 @@ def build(bld):
+@@ -139,9 +139,15 @@ def build(bld):
      bld.RECURSE('lib/tdb')
  
      if bld.env.standalone_ldb:
@@ -16,7 +16,7 @@
  
      LDB_MAP_SRC = bld.SUBDIR('ldb_map',
                               'ldb_map.c ldb_map_inbound.c ldb_map_outbound.c')
-@@ -149,13 +155,6 @@ def build(bld):
+@@ -162,13 +168,6 @@ def build(bld):
      if bld.PYTHON_BUILD_IS_ENABLED():
          if not bld.CONFIG_SET('USING_SYSTEM_PYLDB_UTIL'):
              for env in bld.gen_python_environments(['PKGCONFIGDIR']):
@@ -30,3 +30,24 @@
  
                  name = bld.pyembed_libname('pyldb-util')
                  bld.SAMBA_LIBRARY(name,
+@@ -364,10 +363,6 @@ def build(bld):
+                          deps='cmocka ldb',
+                          install=False)
+ 
+-        bld.SAMBA_BINARY('ldb_match_test',
+-                         source='tests/ldb_match_test.c',
+-                         deps='cmocka ldb',
+-                         install=False)
+ 
+ def test(ctx):
+     '''run ldb testsuite'''
+@@ -397,8 +392,7 @@ def test(ctx):
+ 
+     cmocka_ret = 0
+     for test_exe in ['ldb_tdb_mod_op_test',
+-                     'ldb_msg_test',
+-                     'ldb_match_test']:
++                     'ldb_msg_test']:
+             cmd = os.path.join(Utils.g_module.blddir, test_exe)
+             cmocka_ret = cmocka_ret or samba_utils.RUN_COMMAND(cmd)
+