diff --git a/databases/recutils/Makefile b/databases/recutils/Makefile index 038cc62998c3..e55eb2eb24da 100644 --- a/databases/recutils/Makefile +++ b/databases/recutils/Makefile @@ -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,12 +41,17 @@ 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 \ ${STAGEDIR}${PREFIX}/share/emacs/site-lisp diff --git a/databases/recutils/files/patch-utils_mdb2rec.c b/databases/recutils/files/patch-utils_mdb2rec.c new file mode 100644 index 000000000000..c1290edb9c1d --- /dev/null +++ b/databases/recutils/files/patch-utils_mdb2rec.c @@ -0,0 +1,30 @@ +--- utils/mdb2rec.c.orig 2019-01-03 08:47:43 UTC ++++ utils/mdb2rec.c +@@ -33,7 +33,7 @@ + #include + #define _(str) gettext (str) + +-#include ++#define HAVE_GLIB + #include + + #include +@@ -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)) diff --git a/databases/recutils/pkg-plist b/databases/recutils/pkg-plist index 01ada69eaffa..c0be591493a5 100644 --- a/databases/recutils/pkg-plist +++ b/databases/recutils/pkg-plist @@ -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