7 files changed, 23 insertions, 76 deletions

diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile
index 3df2729fcd12..5b9e93f94679 100644
--- a/databases/mdbtools/Makefile
+++ b/databases/mdbtools/Makefile
@@ -6,29 +6,30 @@
 #
 
 PORTNAME=	mdbtools
-PORTVERSION=	0.3
+PORTVERSION=	0.4
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE} \
-		ftp://ftp.nuug.no/pub/anders/distfiles/ \
-		http://atreides.freenix.no/~anders/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
-GNU_CONFIGURE=	yes
-MAKE_ARGS+=	GLIB_CONFIG="${GLIB_CONFIG}"
+USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 DOCS=		AUTHORS ChangeLog HACKING NEWS README TODO INSTALL
 
+post-patch:
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \
+		-e "s|glib-config|${GLIB_CONFIG}|g"
+
 .if !defined(NOPORTDOCS)
 post-install:
-	${MKDIR} ${PREFIX}/share/doc/${PORTNAME}
+	@${MKDIR} ${DOCSDIR}
 .for f in ${DOCS}
-	${INSTALL_DATA} ${WRKSRC}/${f}  ${PREFIX}/share/doc/${PORTNAME}/
+	${INSTALL_DATA} ${WRKSRC}/${f}  ${DOCSDIR}
 .endfor
 .endif
 
diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo
index 76b6abe22cb7..faeb7ca1a209 100644
--- a/databases/mdbtools/distinfo
+++ b/databases/mdbtools/distinfo
@@ -1 +1 @@
-MD5 (mdbtools-0.3.tgz) = b484b14481c98511e95e6c8fd956d1c1
+MD5 (mdbtools-0.4.tar.gz) = 70015c0c33e910fa817ea6fa0700dd50
diff --git a/databases/mdbtools/files/patch-aa b/databases/mdbtools/files/patch-aa
deleted file mode 100644
index 6c3d47e47840..000000000000
--- a/databases/mdbtools/files/patch-aa
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/libmdb/Makefile.in.orig	Wed Apr 25 15:11:32 2001
-+++ src/libmdb/Makefile.in	Wed Apr 25 15:11:56 2001
-@@ -77,8 +77,8 @@
- 
- lib_LTLIBRARIES = libmdb.la
- libmdb_la_SOURCES = catalog.c mem.c file.c kkd.c table.c data.c dump.c backend.c money.c sargs.c index.c
--INCLUDES = -I$(top_srcdir)/include `glib-config --cflags`
--LIBS = `glib-config --libs`
-+INCLUDES = -I$(top_srcdir)/include `$(GLIB_CONFIG) --cflags`
-+LIBS = `$(GLIB_CONFIG) --libs`
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- LTLIBRARIES =  $(lib_LTLIBRARIES)
diff --git a/databases/mdbtools/files/patch-ab b/databases/mdbtools/files/patch-ab
deleted file mode 100644
index 2b6595edadeb..000000000000
--- a/databases/mdbtools/files/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/util/Makefile.in.orig	Wed Apr 25 15:19:45 2001
-+++ src/util/Makefile.in	Wed Apr 25 15:20:26 2001
-@@ -76,9 +76,9 @@
- YACC = @YACC@
- 
- bin_PROGRAMS = mdb-export mdb-array mdb-schema mdb-tables mdb-parsecsv mdb-header prtable prcat prdata prkkd prdump
--INCLUDES = -I$(top_srcdir)/include `glib-config --cflags`
-+INCLUDES = -I$(top_srcdir)/include `$(GLIB_CONFIG) --cflags`
- LDADD = ../libmdb/libmdb.la 
--LIBS = `glib-config --libs`
-+LIBS = `$(GLIB_CONFIG) --libs`
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- PROGRAMS =  $(bin_PROGRAMS)
diff --git a/databases/mdbtools/files/patch-ac b/databases/mdbtools/files/patch-ac
deleted file mode 100644
index b18a440142a0..000000000000
--- a/databases/mdbtools/files/patch-ac
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/extras/Makefile.in.orig	Wed Apr 25 15:21:00 2001
-+++ src/extras/Makefile.in	Wed Apr 25 15:21:23 2001
-@@ -77,9 +77,9 @@
- 
- bin_PROGRAMS = mdb-dump
- mdb_dump_SOURCES = mdb-dump.c mdbsupport.c
--INCLUDES = -I$(top_srcdir)/include `glib-config --cflags`
-+INCLUDES = -I$(top_srcdir)/include `$(GLIB_CONFIG) --cflags`
- LDADD = ../libmdb/libmdb.la 
--LIBS = `glib-config --libs`
-+LIBS = `$(GLIB_CONFIG) --libs`
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- CONFIG_CLEAN_FILES = 
- PROGRAMS =  $(bin_PROGRAMS)
diff --git a/databases/mdbtools/files/patch-ad b/databases/mdbtools/files/patch-ad
deleted file mode 100644
index d84eb34b1700..000000000000
--- a/databases/mdbtools/files/patch-ad
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/sql/Makefile.in.orig	Wed Apr 25 15:23:54 2001
-+++ src/sql/Makefile.in	Wed Apr 25 15:24:13 2001
-@@ -75,9 +75,9 @@
- VERSION = @VERSION@
- 
- bin_PROGRAMS = mdb-sql
--INCLUDES = -I$(top_srcdir)/include `glib-config --cflags`
-+INCLUDES = -I$(top_srcdir)/include `$(GLIB_CONFIG) --cflags`
- LDADD = ../libmdb/libmdb.la 
--LIBS = `glib-config --libs` $(READLINE_LIBS) @LEXLIB@
-+LIBS = `$(GLIB_CONFIG) --libs` $(READLINE_LIBS) @LEXLIB@
- mdb_sql_SOURCES = mdbsql.c main.c parser.y lexer.l 
- YACC = yacc -d
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/databases/mdbtools/pkg-plist b/databases/mdbtools/pkg-plist
index 43c120d47548..c96f65c3c6d8 100644
--- a/databases/mdbtools/pkg-plist
+++ b/databases/mdbtools/pkg-plist
@@ -1,22 +1,23 @@
-bin/mdb-export
 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-parsecsv
-bin/mdb-header
-bin/prtable
+bin/mdb-ver
 bin/prcat
 bin/prdata
-bin/prkkd
 bin/prdump
-bin/mdb-dump
-bin/mdb-sql
-include/mdbtools.h
+bin/prkkd
+bin/prtable
+include/mdbodbc.h
 include/mdbsql.h
-lib/libmdb.so.0
-lib/libmdb.so
-lib/libmdb.la
+include/mdbtools.h
 lib/libmdb.a
+lib/libmdb.so
+lib/libmdb.so.0
 %%PORTDOCS%%share/doc/mdbtools/AUTHORS
 %%PORTDOCS%%share/doc/mdbtools/ChangeLog
 %%PORTDOCS%%share/doc/mdbtools/HACKING