Author: rhurlin
Date: Fri Jan 15 17:16:25 2021
New Revision: 561652
URL: https://svnweb.freebsd.org/changeset/ports/561652
Log:
databases/mdbtools: Update to 0.9.1
- Switch to a new fork on Github
- Split NLS (gettext) as an option
- Remove gmdb2 GUI (will come back as own port)
Changelog: https://github.com/mdbtools/mdbtools/releases
PR: 250515
Submitted by: Thaddeus Covert <tcovert+freebsd at sahuagin.net> (initial draft)
Approved by: tcberner (mentor)
Differential Revision: https://reviews.freebsd.org/D28118
Added:
head/databases/mdbtools/files/patch-src_libmdb_index.c (contents, props changed)
head/databases/mdbtools/files/patch-src_libmdb_options.c (contents, props changed)
Deleted:
head/databases/mdbtools/files/patch-doc_Makefile.am
Modified:
head/databases/libgda5-mdb/Makefile
head/databases/mdbtools/Makefile
head/databases/mdbtools/distinfo
head/databases/mdbtools/pkg-descr
head/databases/mdbtools/pkg-plist
head/databases/recutils/Makefile
Modified: head/databases/libgda5-mdb/Makefile
==============================================================================
--- head/databases/libgda5-mdb/Makefile Fri Jan 15 15:57:58 2021 (r561651)
+++ head/databases/libgda5-mdb/Makefile Fri Jan 15 17:16:25 2021 (r561652)
@@ -1,7 +1,7 @@
# Created by: Joe Marcus Clarke <marcus at FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 0
+PORTREVISION= 1
CATEGORIES= databases gnome
PKGNAMESUFFIX= 5-mdb
Modified: head/databases/mdbtools/Makefile
==============================================================================
--- head/databases/mdbtools/Makefile Fri Jan 15 15:57:58 2021 (r561651)
+++ head/databases/mdbtools/Makefile Fri Jan 15 17:16:25 2021 (r561652)
@@ -1,8 +1,8 @@
-# Created by: Anders Nordby <anders at fix.no>
# $FreeBSD$
PORTNAME= mdbtools
-DISTVERSION= 0.8.2
+DISTVERSIONPREFIX= v
+DISTVERSION= 0.9.1
CATEGORIES= databases
MAINTAINER= rhurlin at FreeBSD.org
@@ -10,38 +10,38 @@ COMMENT= Utilities and libraries to export data from M
LICENSE= GPLv2
-# To build man-pages
-BUILD_DEPENDS= gawk:lang/gawk \
+BUILD_DEPENDS= bash-completion>=0:shells/bash-completion \
+ flex:textproc/flex \
+ gawk:lang/gawk \
txt2man:textproc/txt2man
-LIB_DEPENDS= libodbc.so:databases/unixODBC
-# TODO libmswstr: https://github.com/leecher1337/libmswstr
-#LIB_DEPENDS+= libmswstr.so:databases/libmswstr
+LIB_DEPENDS= libodbcinst.so:databases/unixODBC
+RUN_DEPENDS= bash-completion>=0:shells/bash-completion
-USES= autoreconf bison gettext-runtime gnome iconv libtool pathfix \
+USES= autoreconf bison gnome iconv libtool pathfix \
pkgconfig readline
-USE_LDCONFIG= yes
+USE_GITHUB= yes
+GH_ACCOUNT= mdbtools
USE_GNOME= glib20
+USE_LDCONFIG= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= ${ICONV_CONFIGURE_ARG} \
- --enable-gtk-doc \
--with-unixodbc=${LOCALBASE}
-USE_GITHUB= yes
-GH_ACCOUNT= cyberemissary
+INSTALL_TARGET= install-strip
-OPTIONS_DEFINE= DOCS GNOME
-OPTIONS_SUB= yes
+CPPFLAGS+= -I${WRKSRC}/include
-INSTALL_TARGET= install-strip
+OPTIONS_DEFINE= DOCS MANPAGES LIBMSWSTR NLS
+OPTIONS_DEFAULT= MANPAGES
+OPTIONS_SUB= yes
-DOCS= AUTHORS ChangeLog HACKING NEWS README TODO
+LIBMSWSTR_DESC= Read and parse JET 4 mdb file indices
-GNOME_CONFIGURE_ENABLE= gmdb2
-GNOME_USE= GNOME=gconf2 \
- GNOME=gdkpixbuf2 \
- GNOME=gnomeprefix \
- GNOME=intltool \
- GNOME=libgnomeui
+LIBMSWSTR_LIB_DEPENDS= libmswstr.so:databases/libmswstr
+LIBMSWSTR_CONFIGURE_ENV_OFF= ac_cv_lib_mswstr_DBLCMapStringW=no
+NLS_USES= gettext
+
+DOCS= AUTHORS ChangeLog HACKING NEWS README TODO
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
Modified: head/databases/mdbtools/distinfo
==============================================================================
--- head/databases/mdbtools/distinfo Fri Jan 15 15:57:58 2021 (r561651)
+++ head/databases/mdbtools/distinfo Fri Jan 15 17:16:25 2021 (r561652)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1593857855
-SHA256 (cyberemissary-mdbtools-0.8.2_GH0.tar.gz) = 8f8808b03169cc16e5c97ed5add612d9d2ac9811fb2a35a0aa5fe2bfb2e2a774
-SIZE (cyberemissary-mdbtools-0.8.2_GH0.tar.gz) = 292958
+TIMESTAMP = 1610467780
+SHA256 (mdbtools-mdbtools-v0.9.1_GH0.tar.gz) = 980c705b7b93b099c2639956b029b8b0116947a75a761a0b0e233e041b0faaa3
+SIZE (mdbtools-mdbtools-v0.9.1_GH0.tar.gz) = 158762
Added: head/databases/mdbtools/files/patch-src_libmdb_index.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mdbtools/files/patch-src_libmdb_index.c Fri Jan 15 17:16:25 2021 (r561652)
@@ -0,0 +1,11 @@
+--- src/libmdb/index.c.orig 2020-12-17 19:03:05 UTC
++++ src/libmdb/index.c
+@@ -1104,7 +1104,7 @@ mdb_index_scan_init(MdbHandle *mdb, MdbTableDef *table
+ {
+ int i;
+
+- if (mdb_get_option(MDB_USE_INDEX) && mdb_choose_index(table, &i) == MDB_INDEX_SCAN) {
++ if ((IS_JET3(mdb) || mdb_get_option(MDB_USE_INDEX)) && mdb_choose_index(table, &i) == MDB_INDEX_SCAN) {
+ table->strategy = MDB_INDEX_SCAN;
+ table->scan_idx = g_ptr_array_index (table->indices, i);
+ table->chain = g_malloc0(sizeof(MdbIndexChain));
Added: head/databases/mdbtools/files/patch-src_libmdb_options.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/databases/mdbtools/files/patch-src_libmdb_options.c Fri Jan 15 17:16:25 2021 (r561652)
@@ -0,0 +1,27 @@
+--- src/libmdb/options.c.orig 2020-12-17 19:03:05 UTC
++++ src/libmdb/options.c
+@@ -50,9 +50,12 @@ load_options()
+ {
+ char *opt;
+ char *s;
+- char *ctx;
++ char *ctx;
+
+- if (!optset && (s=getenv("MDBOPTS"))) {
++ if (optset)
++ return;
++
++ if ((s=getenv("MDBOPTS"))) {
+ opt = strtok_r(s, ":", &ctx);
+ while (opt) {
+ if (!strcmp(opt, "use_index")) opts |= MDB_USE_INDEX;
+@@ -74,6 +77,9 @@ load_options()
+ opt = strtok_r(NULL,":", &ctx);
+ }
+ }
++#ifdef HAVE_LIBMSWSTR
++ opts |= MDB_USE_INDEX;
++#endif
+ optset = 1;
+ }
+ int
Modified: head/databases/mdbtools/pkg-descr
==============================================================================
--- head/databases/mdbtools/pkg-descr Fri Jan 15 15:57:58 2021 (r561651)
+++ head/databases/mdbtools/pkg-descr Fri Jan 15 17:16:25 2021 (r561652)
@@ -1,15 +1,5 @@
-What is MDB Tools?
+MDB Tools is a set of programs to help you extract data from Microsoft Access
+files in various settings. See the NEWS file for information about the latest
+release.
-MDB Tools is a planned set of libraries and utilities to facilitate exporting
-data from MS Access databases (mdb files) into a multiuser database such as
-Oracle, Sybase, DB2, Informix, MySQL, Postgresql, or similar. A nice little
-Gtk MDB file browser will probably be written as well.
-
-Ok, how much is done?
-
-You can list catalog entries. There is some preliminary schema exporting
-utility. And you can export data out to CSV (comma separated value) format.
-
-WWW: http://mdbtools.sourceforge.net/
-WWW: https://github.com/brianb/mdbtools/
-WWW: https://github.com/cyberemissary/mdbtools/
+WWW: https://github.com/mdbtools/mdbtools/
Modified: head/databases/mdbtools/pkg-plist
==============================================================================
--- head/databases/mdbtools/pkg-plist Fri Jan 15 15:57:58 2021 (r561651)
+++ head/databases/mdbtools/pkg-plist Fri Jan 15 17:16:25 2021 (r561652)
@@ -1,74 +1,61 @@
-%%GNOME%%bin/gmdb2
bin/mdb-array
bin/mdb-count
bin/mdb-export
bin/mdb-header
bin/mdb-hexdump
+bin/mdb-json
bin/mdb-parsecsv
bin/mdb-prop
+bin/mdb-queries
bin/mdb-schema
bin/mdb-sql
bin/mdb-tables
bin/mdb-ver
-%%GNOME%%include/gmdb.h
include/mdbsql.h
include/mdbtools.h
-include/mdbver.h
lib/libmdb.a
lib/libmdb.so
-lib/libmdb.so.2
-lib/libmdb.so.2.0.1
+lib/libmdb.so.3
+lib/libmdb.so.3.0.1
lib/libmdbodbc.a
lib/libmdbodbc.so
lib/libmdbodbcW.a
lib/libmdbodbcW.so
lib/libmdbsql.a
lib/libmdbsql.so
-lib/libmdbsql.so.2
-lib/libmdbsql.so.2.0.0
+lib/libmdbsql.so.3
+lib/libmdbsql.so.3.0.1
libdata/pkgconfig/libmdb.pc
libdata/pkgconfig/libmdbsql.pc
-man/man1/gmdb2.1.gz
-man/man1/mdb-array.1.gz
-man/man1/mdb-export.1.gz
-man/man1/mdb-header.1.gz
-man/man1/mdb-hexdump.1.gz
-man/man1/mdb-import.1.gz
-man/man1/mdb-parsecsv.1.gz
-man/man1/mdb-prop.1.gz
-man/man1/mdb-schema.1.gz
-man/man1/mdb-sql.1.gz
-man/man1/mdb-tables.1.gz
-man/man1/mdb-ver.1.gz
+%%MANPAGES%%man/man1/mdb-array.1.gz
+%%MANPAGES%%man/man1/mdb-count.1.gz
+%%MANPAGES%%man/man1/mdb-export.1.gz
+%%MANPAGES%%man/man1/mdb-header.1.gz
+%%MANPAGES%%man/man1/mdb-hexdump.1.gz
+%%MANPAGES%%man/man1/mdb-import.1.gz
+%%MANPAGES%%man/man1/mdb-json.1.gz
+%%MANPAGES%%man/man1/mdb-parsecsv.1.gz
+%%MANPAGES%%man/man1/mdb-prop.1.gz
+%%MANPAGES%%man/man1/mdb-queries.1.gz
+%%MANPAGES%%man/man1/mdb-schema.1.gz
+%%MANPAGES%%man/man1/mdb-sql.1.gz
+%%MANPAGES%%man/man1/mdb-tables.1.gz
+%%MANPAGES%%man/man1/mdb-ver.1.gz
+share/bash-completion/completions/mdb-count
+share/bash-completion/completions/mdb-export
+share/bash-completion/completions/mdb-hexdump
+share/bash-completion/completions/mdb-import
+share/bash-completion/completions/mdb-json
+share/bash-completion/completions/mdb-parsecsv
+share/bash-completion/completions/mdb-prop
+share/bash-completion/completions/mdb-queries
+share/bash-completion/completions/mdb-schema
+share/bash-completion/completions/mdb-sql
+share/bash-completion/completions/mdb-tables
+share/bash-completion/completions/mdb-ver
%%PORTDOCS%%%%DOCSDIR%%/AUTHORS
%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/HACKING
%%PORTDOCS%%%%DOCSDIR%%/NEWS
%%PORTDOCS%%%%DOCSDIR%%/README
%%PORTDOCS%%%%DOCSDIR%%/TODO
-%%GNOME%%share/gmdb/glade/COPYING
-%%GNOME%%share/gmdb/glade/code.xpm
-%%GNOME%%share/gmdb/glade/debug.xpm
-%%GNOME%%share/gmdb/glade/form_big.xpm
-%%GNOME%%share/gmdb/glade/forms.xpm
-%%GNOME%%share/gmdb/glade/gmdb-debug.glade
-%%GNOME%%share/gmdb/glade/gmdb-export.glade
-%%GNOME%%share/gmdb/glade/gmdb-prefs.glade
-%%GNOME%%share/gmdb/glade/gmdb-props.glade
-%%GNOME%%share/gmdb/glade/gmdb-schema.glade
-%%GNOME%%share/gmdb/glade/gmdb-sql.glade
-%%GNOME%%share/gmdb/glade/gmdb-tabledef.glade
-%%GNOME%%share/gmdb/glade/gmdb.glade
-%%GNOME%%share/gmdb/glade/logo.xpm
-%%GNOME%%share/gmdb/glade/macro_big.xpm
-%%GNOME%%share/gmdb/glade/macros.xpm
-%%GNOME%%share/gmdb/glade/module_big.xpm
-%%GNOME%%share/gmdb/glade/pk.xpm
-%%GNOME%%share/gmdb/glade/query.xpm
-%%GNOME%%share/gmdb/glade/query_big.xpm
-%%GNOME%%share/gmdb/glade/report_big.xpm
-%%GNOME%%share/gmdb/glade/reports.xpm
-%%GNOME%%share/gmdb/glade/stock_export-16.png
-%%GNOME%%share/gmdb/glade/stock_export.png
-%%GNOME%%share/gmdb/glade/table.xpm
-%%GNOME%%share/gmdb/glade/table_big.xpm
Modified: head/databases/recutils/Makefile
==============================================================================
--- head/databases/recutils/Makefile Fri Jan 15 15:57:58 2021 (r561651)
+++ head/databases/recutils/Makefile Fri Jan 15 17:16:25 2021 (r561652)
@@ -3,6 +3,7 @@
PORTNAME= recutils
PORTVERSION= 1.8
+PORTREVISION= 1
CATEGORIES= databases
MASTER_SITES= GNU