5 files changed, 33 insertions, 34 deletions

diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index bf9690066a19..4699081276f0 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mdbtools
-PORTVERSION=	0.7.1
-PORTREVISION=	7
+DISTVERSION=	0.8.2
 CATEGORIES=	databases
 
 MAINTAINER=	rhurlin@gwdg.de
@@ -15,25 +14,34 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	gawk:lang/gawk \
 		txt2man:textproc/txt2man
 LIB_DEPENDS=	libodbc.so:databases/unixODBC
-
-OPTIONS_DEFINE=	GNOME DOCS
-OPTIONS_SUB=	yes
+# TODO  libmswstr: https://github.com/leecher1337/libmswstr
+#LIB_DEPENDS+=	libmswstr.so:databases/libmswstr
 
 USES=		autoreconf bison gettext-runtime gnome iconv libtool pathfix \
 		pkgconfig readline
-USE_GITHUB=	yes
-GH_ACCOUNT=	brianb
 USE_LDCONFIG=	yes
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	${ICONV_CONFIGURE_ARG} \
+		--enable-gtk-doc \
 		--with-unixodbc=${LOCALBASE}
+
+USE_GITHUB=	yes
+GH_ACCOUNT=	cyberemissary
+
+OPTIONS_DEFINE=	DOCS GNOME
+OPTIONS_SUB=	yes
+
 INSTALL_TARGET=	install-strip
 
 DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
 
 GNOME_CONFIGURE_ENABLE=	gmdb2
-GNOME_USE=	GNOME=gnomeprefix GNOME=libgnomeui GNOME=gconf2 GNOME=intltool
+GNOME_USE=		GNOME=gconf2 \
+			GNOME=gdkpixbuf2 \
+			GNOME=gnomeprefix \
+			GNOME=intltool \
+			GNOME=libgnomeui
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo
index 6398fa2bd34a..209ad62cd6bd 100644
--- a/databases/mdbtools/distinfo
+++ b/databases/mdbtools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (brianb-mdbtools-0.7.1_GH0.tar.gz) = dcf310dc7b07e7ad2f9f6be16047dc81312cfe1ab1bd94d0fa739c8059af0b16
-SIZE (brianb-mdbtools-0.7.1_GH0.tar.gz) = 277257
+TIMESTAMP = 1593857855
+SHA256 (cyberemissary-mdbtools-0.8.2_GH0.tar.gz) = 8f8808b03169cc16e5c97ed5add612d9d2ac9811fb2a35a0aa5fe2bfb2e2a774
+SIZE (cyberemissary-mdbtools-0.8.2_GH0.tar.gz) = 292958
diff --git a/databases/mdbtools/files/patch-src__sql__Makefile.am b/databases/mdbtools/files/patch-src__sql__Makefile.am
deleted file mode 100644
index aaffe930c4d8..000000000000
--- a/databases/mdbtools/files/patch-src__sql__Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
---- src/sql/Makefile.am.orig	2013-10-13 10:51:24.000000000 +0200
-+++ src/sql/Makefile.am	2013-10-13 21:14:21.000000000 +0200
-@@ -1,3 +1,5 @@
-+BUILT_SOURCES = parser.h
-+AM_YFLAGS = -d
- lib_LTLIBRARIES	=	libmdbsql.la
- libmdbsql_la_SOURCES=	mdbsql.c parser.y lexer.l 
- libmdbsql_la_LDFLAGS = -version-info 2:0:0 -export-symbols-regex '^mdb_sql_'
diff --git a/databases/mdbtools/pkg-descr b/databases/mdbtools/pkg-descr
index cd8326abcb46..53228bccb93f 100644
--- a/databases/mdbtools/pkg-descr
+++ b/databases/mdbtools/pkg-descr
@@ -12,3 +12,4 @@ 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/
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index 43e6ffed5f06..a8bcc406c256 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -1,5 +1,6 @@
 %%GNOME%%bin/gmdb2
 bin/mdb-array
+bin/mdb-count
 bin/mdb-export
 bin/mdb-header
 bin/mdb-hexdump
@@ -13,17 +14,6 @@ bin/mdb-ver
 include/mdbsql.h
 include/mdbtools.h
 include/mdbver.h
-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-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
 lib/libmdb.a
 lib/libmdb.so
 lib/libmdb.so.2
@@ -38,6 +28,18 @@ lib/libmdbsql.so.2
 lib/libmdbsql.so.2.0.0
 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
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/ChangeLog
 %%PORTDOCS%%%%DOCSDIR%%/HACKING
@@ -70,8 +72,3 @@ libdata/pkgconfig/libmdbsql.pc
 %%GNOME%%share/gmdb/glade/stock_export.png
 %%GNOME%%share/gmdb/glade/table.xpm
 %%GNOME%%share/gmdb/glade/table_big.xpm
-%%GNOME%%share/gnome/help/gmdb/C/figures/gmdb2_sql_window.png
-%%GNOME%%share/gnome/help/gmdb/C/figures/gmdb2_window.png
-%%GNOME%%share/gnome/help/gmdb/C/gmdb.xml
-%%GNOME%%share/gnome/help/gmdb/C/legal.xml
-%%GNOME%%share/omf/mdbtools/gmdb-C.omf