diff --git a/databases/recutils/Makefile b/databases/recutils/Makefile index 484d36faf366..d64a261639be 100644 --- a/databases/recutils/Makefile +++ b/databases/recutils/Makefile @@ -1,64 +1,59 @@ PORTNAME= recutils -PORTVERSION= 1.8 -PORTREVISION= 1 +DISTVERSION= 1.9 CATEGORIES= databases MASTER_SITES= GNU MAINTAINER= zeus@gnu.org.ua COMMENT= Tools and libraries to access human-editable, plain text databases WWW= https://www.gnu.org/software/recutils/ LICENSE= GPLv3+ LIB_DEPENDS= libuuid.so:misc/e2fsprogs-libuuid USES= charsetfix cpe libtool makeinfo pkgconfig readline CPE_VENDOR= gnu GNU_CONFIGURE= yes USE_LDCONFIG= yes INSTALL_TARGET= install-strip INFO= rec-mode recutils PORTDOCS= AUTHORS ChangeLog NEWS README OPTIONS_DEFINE= BASH CURL DOCS GCRYPT MDB NLS TEST 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 GCRYPT_DESC= Encryption support via GNU crypt GCRYPT_LIB_DEPENDS= libgcrypt.so:security/libgcrypt \ libgpg-error.so:security/libgpg-error 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_get_version=no NLS_USES= gettext NLS_CONFIGURE_OFF= --disable-nls TEST_BUILD_DEPENDS= ${LOCALBASE}/include/check.h:devel/check TEST_TEST_TARGET= check 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 - post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR} .include diff --git a/databases/recutils/distinfo b/databases/recutils/distinfo index 16a178f4a33a..1a2296dcd80a 100644 --- a/databases/recutils/distinfo +++ b/databases/recutils/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1546510437 -SHA256 (recutils-1.8.tar.gz) = df8eae69593fdba53e264cbf4b2307dfb82120c09b6fab23e2dad51a89a5b193 -SIZE (recutils-1.8.tar.gz) = 2474024 +TIMESTAMP = 1683954283 +SHA256 (recutils-1.9.tar.gz) = 6301592b0020c14b456757ef5d434d49f6027b8e5f3a499d13362f205c486e0e +SIZE (recutils-1.9.tar.gz) = 2759999 diff --git a/databases/recutils/files/patch-utils_mdb2rec.c b/databases/recutils/files/patch-utils_mdb2rec.c index c1290edb9c1d..b4c2e3aac59e 100644 --- a/databases/recutils/files/patch-utils_mdb2rec.c +++ b/databases/recutils/files/patch-utils_mdb2rec.c @@ -1,30 +1,28 @@ ---- utils/mdb2rec.c.orig 2019-01-03 08:47:43 UTC +--- utils/mdb2rec.c.orig 2022-04-16 15:56:37 UTC +++ utils/mdb2rec.c -@@ -33,7 +33,7 @@ +@@ -26,7 +26,7 @@ #include #define _(str) gettext (str) -#include +#define HAVE_GLIB #include #include -@@ -472,16 +472,14 @@ process_mdb (void) +@@ -427,14 +427,12 @@ 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); - } + 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 c0be591493a5..6124cb3fcc54 100644 --- a/databases/recutils/pkg-plist +++ b/databases/recutils/pkg-plist @@ -1,46 +1,44 @@ bin/csv2rec %%MDB%%bin/mdb2rec bin/rec2csv bin/recdel bin/recfix bin/recfmt bin/recinf bin/recins bin/recsel bin/recset include/rec.h 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 man/man1/recdel.1.gz man/man1/recfix.1.gz man/man1/recfmt.1.gz man/man1/recinf.1.gz man/man1/recins.1.gz man/man1/recsel.1.gz man/man1/recset.1.gz -share/emacs/site-lisp/ob-rec.el -share/emacs/site-lisp/rec-mode.el %%NLS%%share/locale/de/LC_MESSAGES/recutils.mo %%NLS%%share/locale/es/LC_MESSAGES/recutils.mo %%NLS%%share/locale/fi/LC_MESSAGES/recutils.mo %%NLS%%share/locale/fr/LC_MESSAGES/recutils.mo %%NLS%%share/locale/nl/LC_MESSAGES/recutils.mo %%NLS%%share/locale/pt_BR/LC_MESSAGES/recutils.mo %%NLS%%share/locale/sr/LC_MESSAGES/recutils.mo %%NLS%%share/locale/sv/LC_MESSAGES/recutils.mo %%NLS%%share/locale/uk/LC_MESSAGES/recutils.mo %%NLS%%share/locale/vi/LC_MESSAGES/recutils.mo share/recutils/etc/FSD.rec