-USE_X_PREFIX -> USE_XLIB.

-Switch an autocheck with X11BASE[..].pc to HAVE_GNOME:Mlibgnomeui.
-Bump the PORTREVISION.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@6895 df743ca5-7f9a-e211-a948-0013205c9059

13 files changed, 381 insertions, 0 deletions

diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
new file mode 100644
index 000000000..1cc87f7d1
--- /dev/null
+++ b/databases/mdbtools/Makefile
@@ -0,0 +1,49 @@
+# New ports collection makefile for:	mdbtools
+# Date created:				25 April 2001
+# Whom:	      				Anders Nordby <anders@fix.no>
+#
+# $FreeBSD$
+#
+
+PORTNAME=	mdbtools
+PORTVERSION=	0.5
+PORTREVISION=	10
+CATEGORIES=	databases
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+
+MAINTAINER=	ports@FreeBSD.org
+COMMENT=	Utilities and libraries to export data from MS Access databases (.mdb)
+
+BUILD_DEPENDS=	gawk:${PORTSDIR}/lang/gawk	# To build man-pages
+
+USE_BISON=	yes
+USE_GNOME=	glib20
+WANT_GNOME=	yes
+GNU_CONFIGURE=	yes
+INSTALLS_SHLIB=	yes
+
+DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO
+MAN1=		mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1
+
+.include <bsd.port.pre.mk>
+
+.if ${HAVE_GNOME:Mlibgnomeui}!=""
+USE_XLIB=	yes
+USE_GNOME+=	gnomeprefix gnomehack libgnomeui
+PKGNAMESUFFIX=	-gnome
+.endif
+
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$(srcdir)/$$<|$$(srcdir)/$$>|g' \
+		${WRKSRC}/doc/Makefile.in
+
+.if !defined(NOPORTDOCS)
+post-install:
+	@${MKDIR} ${DOCSDIR}
+.for f in ${DOCS}
+	${INSTALL_DATA} ${WRKSRC}/${f}  ${DOCSDIR}
+.endfor
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo
new file mode 100644
index 000000000..18eda808e
--- /dev/null
+++ b/databases/mdbtools/distinfo
@@ -0,0 +1,3 @@
+MD5 (mdbtools-0.5.tar.gz) = 4a18bf96e67161101cade64526756d22
+SHA256 (mdbtools-0.5.tar.gz) = 7a5db39fecff5ce4fb91e019acf5795b40221aff09bbd6d84f8dec60f017b05d
+SIZE (mdbtools-0.5.tar.gz) = 396485
diff --git a/databases/mdbtools/files/patch-backend.c b/databases/mdbtools/files/patch-backend.c
new file mode 100644
index 000000000..463faf004
--- /dev/null
+++ b/databases/mdbtools/files/patch-backend.c
@@ -0,0 +1,11 @@
+--- src/libmdb/backend.c	Tue Dec 10 18:35:25 2002
++++ src/libmdb/backend.c	Tue Apr  8 16:19:29 2003
+@@ -114,6 +114,5 @@
+ {
+-char buf[100];
++	static char buf[16];
+         if (col_type > 0x10) {
+-                // return NULL;
+-					sprintf(buf,"type %04x", col_type);
++		snprintf(buf, sizeof(buf), "type %04x", col_type);
+                 return buf;
diff --git a/databases/mdbtools/files/patch-configure b/databases/mdbtools/files/patch-configure
new file mode 100644
index 000000000..f195f07b4
--- /dev/null
+++ b/databases/mdbtools/files/patch-configure
@@ -0,0 +1,10 @@
+--- configure.orig	Wed Dec 11 18:31:51 2002
++++ configure	Thu Dec 12 12:07:17 2002
+@@ -7414,6 +7414,7 @@
+ 
+ # This can be used to rebuild libtool when needed
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
++$ac_aux_dir/ltconfig $LIBTOOL_DEPS
+ 
+ # Always use our own libtool.
+ LIBTOOL='$(SHELL) $(top_builddir)/libtool'
diff --git a/databases/mdbtools/files/patch-include_mdbsql.h b/databases/mdbtools/files/patch-include_mdbsql.h
new file mode 100644
index 000000000..0b4f8a69c
--- /dev/null
+++ b/databases/mdbtools/files/patch-include_mdbsql.h
@@ -0,0 +1,21 @@
+--- include/mdbsql.h.orig	Sun Dec 11 18:22:34 2005
++++ include/mdbsql.h	Sun Dec 11 18:23:20 2005
+@@ -6,6 +6,10 @@
+ #ifndef _mdbsql_h_
+ #define _mdbsql_h_
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ typedef struct {
+ 	MdbHandle *mdb;
+ 	int all_columns;
+@@ -59,4 +63,7 @@
+ void mdb_sql_listtables(MdbSQL *sql);
+ void mdb_sql_select(MdbSQL *sql);
+ 
++#ifdef __cplusplus
++}
++#endif
+ #endif
diff --git a/databases/mdbtools/files/patch-include_mdbtools.h b/databases/mdbtools/files/patch-include_mdbtools.h
new file mode 100644
index 000000000..6933bc322
--- /dev/null
+++ b/databases/mdbtools/files/patch-include_mdbtools.h
@@ -0,0 +1,22 @@
+--- include/mdbtools.h.orig	Sun Dec 11 18:22:42 2005
++++ include/mdbtools.h	Sun Dec 11 18:23:32 2005
+@@ -40,6 +40,10 @@
+ #define MDB_MEMO_OVERHEAD 12
+ #define MDB_BIND_SIZE 16384
+ 
++#ifdef __cplusplus
++extern "C" {
++#endif
++
+ enum {
+ 	MDB_PAGE_DB = 0,
+ 	MDB_PAGE_DATA,
+@@ -345,4 +349,8 @@
+ /* index.c */
+ extern GPtrArray *mdb_read_indices(MdbTableDef *table);
+ extern void mdb_index_dump(MdbTableDef *table, MdbIndex *idx);
++
++#ifdef __cplusplus
++}
++#endif
+ #endif /* _mdbtools_h_ */
diff --git a/databases/mdbtools/files/patch-jet4rows b/databases/mdbtools/files/patch-jet4rows
new file mode 100644
index 000000000..1471751e3
--- /dev/null
+++ b/databases/mdbtools/files/patch-jet4rows
@@ -0,0 +1,33 @@
+This patch was downloaded from SourceForge, to which it was submitted
+Matt <mws at rochester.rr.com>, who wrote:
+
+	This patch fixes the Jet4 tab_num_rows_offset constant 
+	and changes mdb_read_row so it checks the row number 
+	against the number of rows in the table. 
+ 
+	I have some MDB files for which the normal logic in 
+	mdb_read_row fails. This patch solves the problem. 
+
+--- src/libmdb/data.c	2003-01-12 17:59:43.000000000 -0500
++++ src/libmdb/data.c	2003-01-23 14:42:57.000000000 -0500
+@@ -171,6 +171,9 @@
+ unsigned char null_mask[33]; /* 256 columns max / 8 bits per byte */
+ unsigned char isnull;
+ 
++	if (table->num_rows <= row)
++		return 0;
++
+ 	row_start = mdb_get_int16(mdb, (fmt->row_count_offset + 2) + (row*2)); 
+ 	row_end = mdb_find_end_of_row(mdb, row);
+ 
+--- src/libmdb/file.c	2003-01-12 17:59:43.000000000 -0500
++++ src/libmdb/file.c	2003-01-23 14:43:04.000000000 -0500
+@@ -20,7 +20,7 @@
+ #include "mdbtools.h"
+ 
+ MdbFormatConstants MdbJet4Constants = {
+-	4096, 0x0c, 12, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25
++	4096, 0x0c, 16, 45, 47, 51, 55, 56, 63, 12, 15, 23, 5, 25
+ };
+ MdbFormatConstants MdbJet3Constants = {
+ 	2048, 0x08, 12, 25, 27, 31, 35, 36, 43, 8, 13, 16, 1, 18
diff --git a/databases/mdbtools/files/patch-src_gmdb2_debug.c b/databases/mdbtools/files/patch-src_gmdb2_debug.c
new file mode 100644
index 000000000..7b04908f5
--- /dev/null
+++ b/databases/mdbtools/files/patch-src_gmdb2_debug.c
@@ -0,0 +1,63 @@
+--- src/gmdb2/debug.c.orig	Tue Apr 15 12:02:39 2003
++++ src/gmdb2/debug.c	Tue Apr 15 12:05:13 2003
+@@ -354,6 +354,8 @@
+ 	GtkTextIter iter;
+ 	GtkTextView *textview;
+ 	GtkWidget *entry;
++	GtkWidget *tree;
++	GtkTreeView *store;
+ 	char pagestr[20];
+ 
+ 	textview = (GtkTextView *) glade_xml_get_widget (xml, "debug_textview");
+@@ -395,8 +397,8 @@
+ 	gtk_text_buffer_get_iter_at_offset (buffer, &iter, 0);
+ 	gtk_text_buffer_insert(buffer,&iter,tbuf,strlen(tbuf));
+ 	
+-	GtkWidget *tree = glade_xml_get_widget(xml, "debug_treeview");
+-	GtkTreeView *store = (GtkTreeView *) gtk_tree_view_get_model(GTK_TREE_VIEW(tree));
++	tree = glade_xml_get_widget(xml, "debug_treeview");
++	store = (GtkTreeView *) gtk_tree_view_get_model(GTK_TREE_VIEW(tree));
+ 
+ 	gmdb_debug_dissect(GTK_TREE_STORE(store), fbuf, 0, length);
+ 
+@@ -884,6 +886,11 @@
+ guint32 page;
+ GtkWidget *entry, *mi, *button, *debugwin;
+ gchar text[20];
++GtkWidget *tree;
++GtkTreeStore *store;
++GtkCellRenderer *renderer;
++GtkTreeViewColumn *column;
++GtkTreeSelection *select;
+ GladeXML *debugwin_xml;
+ 
+ 	/* load the interface */
+@@ -947,11 +954,10 @@
+ 		pango_font_description_from_string("Courier"));
+ 			                			                
+ 	/* set up treeview, libglade only gives us the empty widget */
+-	GtkWidget *tree = glade_xml_get_widget(debugwin_xml, "debug_treeview");
+-	GtkTreeStore *store = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
++	tree = glade_xml_get_widget(debugwin_xml, "debug_treeview");
++	store = gtk_tree_store_new(3, G_TYPE_STRING, G_TYPE_INT, G_TYPE_INT);
+ 	gtk_tree_view_set_model(GTK_TREE_VIEW(tree), GTK_TREE_MODEL(store));
+ 
+-	GtkCellRenderer *renderer;
+ 	button = glade_xml_get_widget (debugwin_xml, "debug_button");
+ 	g_signal_connect (G_OBJECT (button), "clicked",
+ 		G_CALLBACK (gmdb_debug_display_cb), debugwin_xml);
+@@ -960,13 +966,12 @@
+ 	gtk_signal_connect (GTK_OBJECT (debugwin), "delete_event",
+ 		GTK_SIGNAL_FUNC (gmdb_debug_delete_cb), debugwin_xml);
+ 
+-	GtkTreeViewColumn *column;
+ 	renderer = gtk_cell_renderer_text_new();
+ 	column = gtk_tree_view_column_new_with_attributes("Field",
+ 		renderer, "text", 0, NULL);
+ 	gtk_tree_view_append_column(GTK_TREE_VIEW (tree), column);
+ 
+-	GtkTreeSelection *select = 
++	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",
diff --git a/databases/mdbtools/files/patch-src_gmdb2_sql.c b/databases/mdbtools/files/patch-src_gmdb2_sql.c
new file mode 100644
index 000000000..f78336a2a
--- /dev/null
+++ b/databases/mdbtools/files/patch-src_gmdb2_sql.c
@@ -0,0 +1,62 @@
+--- src/gmdb2/sql.c.orig	Tue Apr 15 12:05:45 2003
++++ src/gmdb2/sql.c	Tue Apr 15 12:07:32 2003
+@@ -375,6 +375,7 @@
+ GType *gtypes;
+ GtkTreeIter iter;
+ GtkTreeViewColumn *column;
++GtkCellRenderer *renderer;
+ long row, maxrow;
+ 
+ 	/* stuff this query on the history */
+@@ -422,7 +423,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++) { 
+@@ -464,6 +464,12 @@
+ 	GtkWidget *mi, *but, *combo;
+ 	GladeXML *sqlwin_xml;
+ 	GValue value = {0, };
++	GtkWidget *tree;
++	GtkTreeStore *store;
++	GtkCellRenderer *renderer;
++	GtkTreeViewColumn *column;
++	GtkTreeSelection *select;
++	GtkWidget *textview;
+ 
+ 	/* load the interface */
+ 	sqlwin_xml = glade_xml_new(GMDB_GLADEDIR "gmdb-sql.glade", NULL, NULL);
+@@ -537,18 +543,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 = 
++	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",
+@@ -557,7 +561,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 --git a/databases/mdbtools/files/patch-src_sql_parser.y b/databases/mdbtools/files/patch-src_sql_parser.y
new file mode 100644
index 000000000..22c412bac
--- /dev/null
+++ b/databases/mdbtools/files/patch-src_sql_parser.y
@@ -0,0 +1,10 @@
+--- src/sql/parser.y.orig	Tue Apr 15 01:26:03 2003
++++ src/sql/parser.y	Tue Apr 15 01:26:08 2003
+@@ -109,6 +109,7 @@
+ database:
+ 	PATH
+ 	|	NAME 
++	;
+ 
+ table:
+ 	NAME { mdb_sql_add_table(_mdb_sql(NULL), $1); free($1); }
diff --git a/databases/mdbtools/files/patch-write.c b/databases/mdbtools/files/patch-write.c
new file mode 100644
index 000000000..edce42eaa
--- /dev/null
+++ b/databases/mdbtools/files/patch-write.c
@@ -0,0 +1,12 @@
+--- src/libmdb/write.c	Thu Jan  9 15:24:27 2003
++++ src/libmdb/write.c	Tue Apr  8 16:29:38 2003
+@@ -308,3 +308,3 @@
+ 	}
+-	num_fields = mdb_crack_row(table, row_start, row_end, &fields);
++	num_fields = mdb_crack_row(table, row_start, row_end, fields);
+ 
+@@ -324,3 +324,3 @@
+ 
+-	new_row_size = mdb_pack_row(table, row_buffer, num_fields, &fields);
++	new_row_size = mdb_pack_row(table, row_buffer, num_fields, fields);
+ #if MDB_DEBUG_WRITE
diff --git a/databases/mdbtools/pkg-descr b/databases/mdbtools/pkg-descr
new file mode 100644
index 000000000..b1b5e855e
--- /dev/null
+++ b/databases/mdbtools/pkg-descr
@@ -0,0 +1,15 @@
+What is MDB Tools? 
+
+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/
+
+- Anders Nordby <anders@fix.no>
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
new file mode 100644
index 000000000..7cc614a3d
--- /dev/null
+++ b/databases/mdbtools/pkg-plist
@@ -0,0 +1,70 @@
+%%GNOME:%%bin/gmdb2
+bin/mdb-array
+bin/mdb-dump
+bin/mdb-export
+bin/mdb-header
+bin/mdb-parsecsv
+bin/mdb-schema
+bin/mdb-sql
+bin/mdb-tables
+bin/mdb-ver
+bin/prcat
+bin/prdata
+bin/prdump
+bin/prindex
+bin/prkkd
+bin/prole
+bin/prtable
+bin/updrow
+%%GNOME:%%include/gmdb.h
+include/mdbodbc.h
+include/mdbsql.h
+include/mdbtools.h
+lib/libmdb.a
+lib/libmdb.la
+lib/libmdb.so
+lib/libmdb.so.0
+lib/libmdbsql.a
+lib/libmdbsql.la
+lib/libmdbsql.so
+lib/libmdbsql.so.0
+%%PORTDOCS%%share/doc/mdbtools/AUTHORS
+%%PORTDOCS%%share/doc/mdbtools/ChangeLog
+%%PORTDOCS%%share/doc/mdbtools/HACKING
+%%PORTDOCS%%share/doc/mdbtools/NEWS
+%%PORTDOCS%%share/doc/mdbtools/README
+%%PORTDOCS%%share/doc/mdbtools/TODO
+%%GNOME:%%share/gnome/gmdb/glade/code.xpm
+%%GNOME:%%share/gnome/gmdb/glade/debug.xpm
+%%GNOME:%%share/gnome/gmdb/glade/form_big.xpm
+%%GNOME:%%share/gnome/gmdb/glade/forms.xpm
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-debug.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-export.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-prefs.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-props.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-schema.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-sql-file.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb-sql.glade
+%%GNOME:%%share/gnome/gmdb/glade/gmdb.glade
+%%GNOME:%%share/gnome/gmdb/glade/logo.xpm
+%%GNOME:%%share/gnome/gmdb/glade/macro_big.xpm
+%%GNOME:%%share/gnome/gmdb/glade/macros.xpm
+%%GNOME:%%share/gnome/gmdb/glade/module_big.xpm
+%%GNOME:%%share/gnome/gmdb/glade/pk.xpm
+%%GNOME:%%share/gnome/gmdb/glade/query.xpm
+%%GNOME:%%share/gnome/gmdb/glade/query_big.xpm
+%%GNOME:%%share/gnome/gmdb/glade/report_big.xpm
+%%GNOME:%%share/gnome/gmdb/glade/reports.xpm
+%%GNOME:%%share/gnome/gmdb/glade/stock_export-16.png
+%%GNOME:%%share/gnome/gmdb/glade/stock_export.png
+%%GNOME:%%share/gnome/gmdb/glade/table.xpm
+%%GNOME:%%share/gnome/gmdb/glade/table_big.xpm
+%%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:%%@dirrm share/gnome/help/gmdb/C/figures
+%%GNOME:%%@dirrm share/gnome/help/gmdb/C
+%%GNOME:%%@dirrm share/gnome/help/gmdb
+%%GNOME:%%@dirrm share/gnome/gmdb/glade
+%%GNOME:%%@dirrm share/gnome/gmdb
+%%PORTDOCS%%@dirrm share/doc/mdbtools