Date: Sat, 6 Mar 2021 06:48:36 +0000 (UTC) From: Alexey Dokuchaev <danfe@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r567461 - in head/databases/recutils: . files Message-ID: <202103060648.1266maxJ091290@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: danfe Date: Sat Mar 6 06:48:36 2021 New Revision: 567461 URL: https://svnweb.freebsd.org/changeset/ports/567461 Log: - Unbreak the build with MDB support after r561652 and enable it by default to help catch API breakages in the future - Enable CURL option because it is very common dependency anyway - Add an option to build the recutils bash(1) builtins Added: head/databases/recutils/files/ head/databases/recutils/files/patch-utils_mdb2rec.c (contents, props changed) Modified: head/databases/recutils/Makefile head/databases/recutils/pkg-plist Modified: head/databases/recutils/Makefile ============================================================================== --- head/databases/recutils/Makefile Sat Mar 6 06:18:02 2021 (r567460) +++ head/databases/recutils/Makefile Sat Mar 6 06:48:36 2021 (r567461) @@ -23,10 +23,15 @@ TEST_TARGET= check INFO= rec-mode recutils PORTDOCS= AUTHORS ChangeLog NEWS README -OPTIONS_DEFINE= DOCS CURL GCRYPT MDB NLS -OPTIONS_DEFAULT= GCRYPT +OPTIONS_DEFINE= BASH DOCS CURL GCRYPT MDB NLS +OPTIONS_DEFAULT= CURL GCRYPT MDB OPTIONS_SUB= yes +BASH_DESC= Build ${PORTNAME} bash(1) builtins +BASH_BUILD_DEPENDS= ${LOCALBASE}/include/bash/config.h:shells/bash +BASH_CONFIGURE_ON= --with-bash-headers=${LOCALBASE}/include/bash +BASH_CONFIGURE_OFF= --disable-bash-builtins + CURL_LIB_DEPENDS= libcurl.so:ftp/curl CURL_CONFIGURE_ENV_OFF= ac_cv_lib_curl_curl_global_init=no @@ -36,11 +41,16 @@ GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ GCRYPT_CONFIGURE_OFF= --disable-encryption MDB_DESC= MS Access database (.mdb) support +MDB_BUILD_DEPENDS= help2man:misc/help2man MDB_LIB_DEPENDS= libmdb.so:databases/mdbtools -MDB_CONFIGURE_ENV_OFF= ac_cv_lib_mdb_mdb_init=no +MDB_CONFIGURE_ENV_OFF= ac_cv_lib_mdb_mdb_get_version=no NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls + +post-patch: + @${REINPLACE_CMD} -e 's,mdb_init,mdb_get_version,' \ + ${WRKSRC}/configure post-install: ${INSTALL_DATA} ${WRKSRC}/etc/*.el \ Added: head/databases/recutils/files/patch-utils_mdb2rec.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/recutils/files/patch-utils_mdb2rec.c Sat Mar 6 06:48:36 2021 (r567461) @@ -0,0 +1,30 @@ +--- utils/mdb2rec.c.orig 2019-01-03 08:47:43 UTC ++++ utils/mdb2rec.c +@@ -33,7 +33,7 @@ + #include <gettext.h> + #define _(str) gettext (str) + +-#include <glib.h> ++#define HAVE_GLIB + #include <mdbtools.h> + + #include <rec.h> +@@ -472,16 +472,14 @@ process_mdb (void) + if (!db) + recutl_out_of_memory (); + +- /* Initialize libmdb and open the input file. */ +- mdb_init(); +- mdb_set_date_fmt ("%Y-%m-%dT%H:%M:%S%z"); /* ISO 8601 */ +- + mdb = mdb_open (mdb2rec_mdb_file, MDB_NOFLAGS); + if (!mdb) + { + recutl_fatal (_("could not open file %s\n"), + mdb2rec_mdb_file); + } ++ ++ mdb_set_date_fmt (mdb, "%Y-%m-%dT%H:%M:%S%z"); /* ISO 8601 */ + + /* Read the catalog. */ + if (!mdb_read_catalog (mdb, MDB_TABLE)) Modified: head/databases/recutils/pkg-plist ============================================================================== --- head/databases/recutils/pkg-plist Sat Mar 6 06:18:02 2021 (r567460) +++ head/databases/recutils/pkg-plist Sat Mar 6 06:48:36 2021 (r567461) @@ -13,6 +13,14 @@ lib/librec.a lib/librec.so lib/librec.so.1 lib/librec.so.1.0.0 +%%BASH%%lib/readrec.a +%%BASH%%lib/readrec.so +%%BASH%%lib/readrec.so.0 +%%BASH%%lib/readrec.so.0.0.0 +%%BASH%%lib/testrec.a +%%BASH%%lib/testrec.so +%%BASH%%lib/testrec.so.0 +%%BASH%%lib/testrec.so.0.0.0 man/man1/csv2rec.1.gz %%MDB%%man/man1/mdb2rec.1.gz man/man1/rec2csv.1.gz
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103060648.1266maxJ091290>