Hi! Below comes an update for databases/mdbtools. The major difference between version 0.7.1 (new) and 20070603 snapshot (old) is support for non-ASCII text, which may come handy.
Currently the path to mdbtools port is "databases/mdbtools/snapshots".
I found no ports depending on mdbtools, and I see no reason for keeping
several versions of mdbtools in ports tree, so the updated port expect
"databases/mdbtools" path.
The update itself comes in tarball. As I made whitespace between
variable names and "=" signs consistant, added and removed several
variables, the actual diff is too noisy to be readable; I tempered a bit
with my update to make cleaner diff, and then manually rearranged
several lines.
Another port, for build dependency of mdbtools - textproc/txt2man - also
follows. It is required for producing manual pages.
Tested only on amd64; the list of supported architecures was copied from
lang/gcc/4.8/Makefile.
--
Dmitrij D. Czarkoff
diff -urNx CVS snapshot/Makefile 0.7.1/Makefile
--- snapshot/Makefile Sun Sep 7 20:11:07 2014
+++ 0.7.1/Makefile Mon Feb 16 16:25:27 2015
@@ -1,67 +1,80 @@
# $OpenBSD: Makefile,v 1.39 2014/09/07 18:11:07 jasper Exp $
+ ONLY_FOR_ARCHS = alpha amd64 i386 powerpc mips64 mips64el sparc64
COMMENT-main= read microsoft Access MDB
COMMENT-gmdb= graphical interface to MDB tools
+GH_ACCOUNT= brianb
+GH_PROJECT= mdbtools
+GH_TAGNAME= 0.7.1
-DATE= 20070603
-DISTNAME= mdbtools-${DATE}
+DISTNAME= mdbtools-${GH_TAGNAME}
-PKGNAME-main= mdbtools-${DATE}
+PKGNAME-main= mdbtools-${GH_TAGNAME}
-PKGNAME-gmdb= gmdb-${DATE}
+PKGNAME-gmdb= gmdb-${GH_TAGNAME}
-REVISION-main= 9
-REVISION-gmdb= 15
+EPOCH= 0
CATEGORIES= databases converters
HOMEPAGE= http://mdbtools.sourceforge.net/
-MASTER_SITES= http://distfiles.nl/
+MAINTAINER= Dmitrij D. Czarkoff <czark...@gmail.com>
-# https://github.com/brianb/mdbtools
-#MASTER_SITES=${MASTER_SITE_SOURCEFORGE:=mdbtools/}
-MULTI_PACKAGES= -main -gmdb
+MULTI_PACKAGES= -main
+PSEUDO_FLAVORS= no_x11
+FLAVOR?=
-SHARED_LIBS += mdb 1.0 # 1.0
-SHARED_LIBS += mdbsql 1.0 # 1.0
+SHARED_LIBS += mdb 2.0
+SHARED_LIBS += mdbsql 2.0
+SHARED_LIBS += mdbodbc 0.0
+SHARED_LIBS += mdbodbcW 0.0
+
# GPLv2+, LGPL v2+
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += c pcre glib-2.0 pthread
+WANTLIB += c glib-2.0 intl pthread
-WANTLIB-main += ${WANTLIB} readline termcap
+WANTLIB-main += ${WANTLIB} iconv iodbcinst pcre readline
-WANTLIB-gmdb += ${WANTLIB}
-WANTLIB-gmdb += ICE ORBit-2 ORBitCosNaming-2 SM X11 Xcomposite Xcursor
-WANTLIB-gmdb += Xdamage Xext Xfixes Xi Xinerama Xrandr Xrender art_lgpl_2
-WANTLIB-gmdb += atk-1.0 bonobo-2 bonobo-activation bonoboui-2 cairo
-WANTLIB-gmdb += canberra crypto dbus-1 dbus-glib-1 expat ffi fontconfig
-WANTLIB-gmdb += freetype gailutil gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0
-WANTLIB-gmdb += gio-2.0 glade-2.0 gmodule-2.0 gnome-2 gnome-keyring
-WANTLIB-gmdb += gnomecanvas-2 gnomeui-2 gnomevfs-2 gobject-2.0 gpg-error
-WANTLIB-gmdb += graphite2 gthread-2.0 gtk-x11-2.0 harfbuzz ltdl m mdb
-WANTLIB-gmdb += mdbsql ogg pango-1.0 pangocairo-1.0 pangoft2-1.0 pixman-1
-WANTLIB-gmdb += png popt pthread-stubs ssl util vorbis vorbisfile xcb
-WANTLIB-gmdb += xcb-render xcb-shm xml2 z
+WANTLIB-gmdb += ${WANTLIB} gdk-x11-2.0 gdk_pixbuf-2.0 glade-2.0 gnome-2
+WANTLIB-gmdb += gnomeui-2 gobject-2.0 gtk-x11-2.0 mdb mdbsql pango-1.0
MODULES= devel/gettext \
+ gcc4 \
x11/gnome
+MODGCC4_ARCHS = alpha amd64 i386 powerpc mips64 mips64el sparc64
MODGNOME_TOOLS += yelp
-WRKDIST= ${WRKDIR}/mdbtools
-
BUILD_DEPENDS= devel/bison \
- lang/gawk
+ textproc/txt2man
+LIB_DEPENDS= devel/glib2
LIB_DEPENDS-main= ${LIB_DEPENDS} \
- devel/glib2
+ databases/iodbc,-main \
+ devel/pcre
RUN_DEPENDS-main= ${MODGETTEXT_RUN_DEPENDS}
LIB_DEPENDS-gmdb= ${LIB_DEPENDS} \
x11/gnome/libgnomeui \
- devel/glib2 \
- databases/mdbtools/snapshot
+ databases/mdbtools,-main>=0.7.1v0
+CONFIGURE_ENV= YACC="bison -y"
CONFIGURE_STYLE= gnu
+CONFIGURE_ARGS= --with-iodbc=${LOCALBASE}
+
+AUTOCONF_VERSION= 2.69
+AUTOMAKE_VERSION= 1.15
+
+.if ${FLAVOR:Mno_x11}
+CONFIGURE_ARGS+= --disable-gmdb2
+.else
+MULTI_PACKAGES+= -gmdb
+.endif
+
+pre-configure:
+ cd${WRKSRC}&& AUTOCONF_VERSION=${AUTOCONF_VERSION} \
+ AUTOMAKE_VERSION=${AUTOMAKE_VERSION} \
+ autoreconf -i -f
.include <bsd.port.mk>
diff -urNx CVS snapshot/distinfo 0.7.1/distinfo
--- snapshot/distinfo Sat Aug 10 15:15:36 2013
+++ 0.7.1/distinfo Mon Feb 16 16:09:12 2015
@@ -1,2 +1,2 @@
-SHA256 (mdbtools-20070603.tar.gz) =
cKGzrLKlsyRUZnT0oWyepU+t5oBL6GGqSurdr6G8Ksg=
-SIZE (mdbtools-20070603.tar.gz) = 1100644
+SHA256 (mdbtools-0.7.1.tar.gz) = 3PMQ3HsH560vn2vhYEfcgTEs/hqxvZTQ+nOcgFmvCxY=
+SIZE (mdbtools-0.7.1.tar.gz) = 277257
diff -urNx CVS snapshot/patches/patch-doc_Makefile_in
0.7.1/patches/patch-doc_Makefile_in
--- snapshot/patches/patch-doc_Makefile_in Mon May 1 11:55:33 2006
+++ 0.7.1/patches/patch-doc_Makefile_in Thu Jan 1 01:00:00 1970
@@ -1,28 +0,0 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.1.1.1 2006/05/01 09:55:33 espie Exp $
---- doc/Makefile.in.orig Tue Apr 25 19:49:57 2006
-+++ doc/Makefile.in Tue Apr 25 19:50:38 2006
-@@ -418,19 +418,19 @@ install.tgz: $(srcdir)/install.sgml
- man: mdb-tables.1 mdb-ver.1 mdb-export.1 mdb-sql.1
-
- mdb-tables.1: mdb-tables.txt
-- - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE) $(srcdir)/$< > $@
-+ - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE)
$(srcdir)/mdb-tables.txt > $@
-
- mdb-ver.1: mdb-ver.txt
-- - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE) $(srcdir)/$< > $@
-+ - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE)
$(srcdir)/mdb-ver.txt > $@
-
- mdb-export.1: mdb-export.txt
-- - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE) $(srcdir)/$< > $@
-+ - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE)
$(srcdir)/mdb-export.txt > $@
-
- mdb-schema.1: mdb-schema.txt
-- - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE) $(srcdir)/$< > $@
-+ - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE)
$(srcdir)/mdb-schema.txt > $@
-
- mdb-sql.1: mdb-sql.txt
-- - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE) $(srcdir)/$< > $@
-+ - $(TXT2MAN) -P $(PRODUCT) -t $(PRODUCT) -r $(RELEASE)
$(srcdir)/mdb-sql.txt > $@
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
diff -urNx CVS snapshot/patches/patch-src_gmdb2_sql_c
0.7.1/patches/patch-src_gmdb2_sql_c
--- snapshot/patches/patch-src_gmdb2_sql_c Mon May 1 11:55:33 2006
+++ 0.7.1/patches/patch-src_gmdb2_sql_c Thu Jan 1 01:00:00 1970
@@ -1,63 +0,0 @@
---- src/gmdb2/sql.c.orig Sat Jan 15 06:02:12 2005
-+++ src/gmdb2/sql.c Thu Apr 27 10:18:39 2006
-@@ -390,6 +390,7 @@
- GType *gtypes;
- GtkTreeIter iter;
- GtkTreeViewColumn *column;
-+ GtkCellRenderer *renderer;
- long row, maxrow;
- /* GdkCursor *watch, *pointer; */
-
-@@ -449,7 +450,6 @@
-
- gtk_tree_view_set_model(GTK_TREE_VIEW(treeview), GTK_TREE_MODEL(store));
-
-- GtkCellRenderer *renderer;
- renderer = gtk_cell_renderer_text_new();
-
- for (i=0;i<sql->num_columns;i++) {
-@@ -497,6 +497,12 @@
- GtkWidget *mi, *but, *combo;
- GladeXML *sqlwin_xml;
- GValue value = {0, };
-+ GtkCellRenderer *renderer;
-+ GtkTreeViewColumn *column;
-+ GtkWidget *tree;
-+ GtkTreeStore *store;
-+ GtkWidget *textview;
-+ GtkTreeSelection *select;
-
- /* load the interface */
- sqlwin_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-sql.glade", NULL, NULL);
-@@ -570,19 +576,16 @@
- G_CALLBACK (gmdb_sql_execute_cb), sqlwin_xml);
-
- /* set up treeview, libglade only gives us the empty widget */
-- GtkWidget *tree = glade_xml_get_widget(sqlwin_xml, "sql_treeview");
-- GtkTreeStore *store = gtk_tree_store_new(1, G_TYPE_STRING);
-+ tree = glade_xml_get_widget(sqlwin_xml, "sql_treeview");
-+ store = gtk_tree_store_new(1, G_TYPE_STRING);
- gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store));
-
-- GtkCellRenderer *renderer;
-- GtkTreeViewColumn *column;
- renderer = gtk_cell_renderer_text_new();
- column = gtk_tree_view_column_new_with_attributes("Name",
- renderer, "text", 0, NULL);
- gtk_tree_view_append_column(GTK_TREE_VIEW (tree), column);
-
-- GtkTreeSelection *select =
-- gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
-+ select = gtk_tree_view_get_selection (GTK_TREE_VIEW (tree));
- gtk_tree_selection_set_mode (select, GTK_SELECTION_SINGLE);
- //g_signal_connect (G_OBJECT (select), "changed",
- //G_CALLBACK (gmdb_sql_select_cb), sqlwin_xml);
-@@ -590,7 +593,7 @@
- /* populate first level of tree */
- gmdb_sql_tree_populate(mdb, sqlwin_xml);
-
-- GtkWidget *textview = glade_xml_get_widget(sqlwin_xml, "sql_textview");
-+ textview = glade_xml_get_widget(sqlwin_xml, "sql_textview");
- src.target = "table";
- src.flags = 0;
- src.info = 1;
diff -urNx CVS snapshot/patches/patch-src_libmdb_file_c
0.7.1/patches/patch-src_libmdb_file_c
--- snapshot/patches/patch-src_libmdb_file_c Mon May 1 11:55:33 2006
+++ 0.7.1/patches/patch-src_libmdb_file_c Thu Jan 1 01:00:00 1970
@@ -1,12 +0,0 @@
-$OpenBSD: patch-src_libmdb_file_c,v 1.1.1.1 2006/05/01 09:55:33 espie Exp $
---- src/libmdb/file.c.orig Wed Apr 26 17:12:01 2006
-+++ src/libmdb/file.c Wed Apr 26 17:12:19 2006
-@@ -123,7 +123,7 @@ MdbHandle *mdb_open(const char *filename
- mdb->f->fd = -1;
- mdb->f->filename = mdb_find_file(filename);
- if (!mdb->f->filename) {
-- fprintf(stderr, "Can't alloc filename\n");
-+ fprintf(stderr, "Can't find mdb file% s\n", filename);
- mdb_close(mdb);
- return NULL;
- }
diff -urNx CVS snapshot/patches/patch-src_odbc_Makefile_am
0.7.1/patches/patch-src_odbc_Makefile_am
--- snapshot/patches/patch-src_odbc_Makefile_am Thu Jan 1 01:00:00 1970
+++ 0.7.1/patches/patch-src_odbc_Makefile_am Mon Feb 16 16:09:12 2015
@@ -0,0 +1,12 @@
+$OpenBSD$
+--- src/odbc/Makefile.am.orig Mon Feb 16 10:34:35 2015
++++ src/odbc/Makefile.am Mon Feb 16 10:35:27 2015
+@@ -3,7 +3,7 @@ lib_LTLIBRARIES = libmdbodbc.la
+ AM_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS)
+ libmdbodbc_la_SOURCES = odbc.c connectparams.c mdbodbc.h connectparams.h
+ libmdbodbc_la_LIBADD = ../libmdb/libmdb.la ../sql/libmdbsql.la
+-libmdbodbc_la_LDFLAGS = -avoid-version -export-symbols-regex '^(SQL|ODBCINST)'
++libmdbodbc_la_LDFLAGS = -export-symbols-regex '^(SQL|ODBCINST)'
+ if ICONV
+ lib_LTLIBRARIES += libmdbodbcW.la
+ libmdbodbcW_la_SOURCES = $(libmdbodbc_la_SOURCES)
diff -urNx CVS snapshot/patches/patch-src_util_Makefile_am
0.7.1/patches/patch-src_util_Makefile_am
--- snapshot/patches/patch-src_util_Makefile_am Thu Jan 1 01:00:00 1970
+++ 0.7.1/patches/patch-src_util_Makefile_am Mon Feb 16 16:09:12 2015
@@ -0,0 +1,14 @@
+$OpenBSD$
+--- src/util/Makefile.am.orig Sun Feb 15 11:59:24 2015
++++ src/util/Makefile.am Sun Feb 15 12:00:11 2015
+@@ -1,9 +1,8 @@
+ bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv
mdb-header mdb-sql mdb-ver mdb-prop
+ noinst_PROGRAMS = mdb-import prtable prcat prdata prkkd prdump prole updrow
prindex
+-LIBS = $(GLIB_LIBS) @LIBS@ @LEXLIB@
++LIBS = ../libmdb/libmdb.la $(GLIB_LIBS) @LIBS@ @LEXLIB@
+ DEFS = @DEFS@ -DLOCALEDIR=\"$(localedir)\"
+ AM_CFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS)
+-LDADD = ../libmdb/libmdb.la
+ if SQL
+ mdb_sql_LDADD = ../libmdb/libmdb.la ../sql/libmdbsql.la $(LIBREADLINE)
+ endif
diff -urNx CVS snapshot/pkg/PLIST-gmdb 0.7.1/pkg/PLIST-gmdb
--- snapshot/pkg/PLIST-gmdb Tue Dec 30 21:56:41 2008
+++ 0.7.1/pkg/PLIST-gmdb Mon Feb 16 16:09:12 2015
@@ -1,7 +1,9 @@
@comment $OpenBSD: PLIST-gmdb,v 1.2 2008/12/30 20:56:41 sthen Exp $
@bin bin/gmdb2
+@man man/man1/gmdb2.1
share/gmdb/
share/gmdb/glade/
+share/gmdb/glade/COPYING
share/gmdb/glade/code.xpm
share/gmdb/glade/debug.xpm
share/gmdb/glade/form_big.xpm
@@ -11,8 +13,8 @@
share/gmdb/glade/gmdb-prefs.glade
share/gmdb/glade/gmdb-props.glade
share/gmdb/glade/gmdb-schema.glade
-share/gmdb/glade/gmdb-sql-file.glade
share/gmdb/glade/gmdb-sql.glade
+share/gmdb/glade/gmdb-tabledef.glade
share/gmdb/glade/gmdb.glade
share/gmdb/glade/logo.xpm
share/gmdb/glade/macro_big.xpm
diff -urNx CVS snapshot/pkg/PLIST-main 0.7.1/pkg/PLIST-main
--- snapshot/pkg/PLIST-main Sat Aug 10 15:15:37 2013
+++ 0.7.1/pkg/PLIST-main Mon Feb 16 16:09:12 2015
@@ -11,22 +11,34 @@
@bin bin/mdb-tables
@bin bin/mdb-ver
include/gmdb.h
-include/mdbodbc.h
-include/mdbprivate.h
include/mdbsql.h
include/mdbtools.h
include/mdbver.h
lib/libmdb.a
lib/libmdb.la
@lib lib/libmdb.so.${LIBmdb_VERSION}
+lib/libmdbodbc.a
+lib/libmdbodbc.la
+@lib lib/libmdbodbc.so.${LIBmdbodbc_VERSION}
+lib/libmdbodbcW.a
+lib/libmdbodbcW.la
+@lib lib/libmdbodbcW.so.${LIBmdbodbcW_VERSION}
lib/libmdbsql.a
lib/libmdbsql.la
@lib lib/libmdbsql.so.${LIBmdbsql_VERSION}
-lib/pkgconfig/
lib/pkgconfig/libmdb.pc
lib/pkgconfig/libmdbsql.pc
+@man man/man1/mdb-array.1
@man man/man1/mdb-export.1
+@man man/man1/mdb-header.1
+@man man/man1/mdb-hexdump.1
+@man man/man1/mdb-parsecsv.1
+@man man/man1/mdb-prop.1
@man man/man1/mdb-schema.1
@man man/man1/mdb-sql.1
@man man/man1/mdb-tables.1
@man man/man1/mdb-ver.1
+man/mant/
+share/omf/
+share/omf/mdbtools/
+share/omf/mdbtools/gmdb-C.omf
mdbtools.tgz
Description: application/tar-gz
txt2man.tgz
Description: application/tar-gz
