summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--index.html2
-rw-r--r--src/mdbtools-1-header.patch15
-rw-r--r--src/mdbtools.mk14
3 files changed, 10 insertions, 21 deletions
diff --git a/index.html b/index.html
index c829cc3..1be8fca 100644
--- a/index.html
+++ b/index.html
@@ -1595,7 +1595,7 @@ USE_OSGPLUGIN(<plugin2>)
</tr>
<tr>
<td id="mdbtools-package">mdbtools</td>
- <td id="mdbtools-version">0.6pre1</td>
+ <td id="mdbtools-version">0.7</td>
<td id="mdbtools-website"><a href="http://sourceforge.net/projects/mdbtools/">mdbtools</a></td>
</tr>
<tr>
diff --git a/src/mdbtools-1-header.patch b/src/mdbtools-1-header.patch
deleted file mode 100644
index 90874c5..0000000
--- a/src/mdbtools-1-header.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-This file is part of MXE.
-See index.html for further information.
-
-diff -ur mdbtools-0.6pre1-orig//include/mdbtools.h mdbtools-0.6pre1//include/mdbtools.h
---- mdbtools-0.6pre1-orig//include/mdbtools.h 2011-06-01 00:07:12.336088034 +0900
-+++ mdbtools-0.6pre1//include/mdbtools.h 2011-06-01 00:10:51.536088143 +0900
-@@ -147,7 +147,7 @@
- #define IS_JET3(mdb) (mdb->f->jet_version==MDB_VER_JET3)
-
- /* hash to store registered backends */
--extern GHashTable *mdb_backends;
-+static GHashTable *mdb_backends;
-
- /* forward declarations */
- typedef struct mdbindex MdbIndex;
diff --git a/src/mdbtools.mk b/src/mdbtools.mk
index 42e887a..8826ec9 100644
--- a/src/mdbtools.mk
+++ b/src/mdbtools.mk
@@ -4,21 +4,25 @@
# mdbtools
PKG := mdbtools
$(PKG)_IGNORE :=
-$(PKG)_CHECKSUM := 37a50d623a444ec690d2677b12b59c2f11e497c0
-$(PKG)_SUBDIR := $(PKG)-$($(PKG)_VERSION)
+$(PKG)_CHECKSUM := 62fe0703fd8691e4536e1012317406bdb72594cf
+$(PKG)_SUBDIR := brianb-mdbtools-004cc9f
$(PKG)_FILE := $(PKG)-$($(PKG)_VERSION).tar.gz
-$(PKG)_URL := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
+$(PKG)_URL := http://github.com/brianb/$(PKG)/tarball/$($(PKG)_VERSION)/$($(PKG)_FILE)
$(PKG)_DEPS := gcc glib
define $(PKG)_UPDATE
- $(WGET) -q -O- 'http://sourceforge.net/projects/mdbtools/files/mdbtools/' | \
- $(SED) -n 's,.*/\([0-9][^"]*\)/".*,\1,p' | \
+ $(WGET) -q -O- 'https://github.com/brianb/mdbtools/tags' | \
+ grep '<a href="/brianb/mdbtools/tarball/' | \
+ $(SED) -n 's,.*href="/brianb/mdbtools/tarball/\([0-9][^"_]*\)".*,\1,p' | \
head -1
endef
define $(PKG)_BUILD
+ '$(SED)' -i 's/libtooloze/libtoolize/g;' '$(1)/autogen.sh'
+ cd '$(1)' && NOCONFIGURE=1 ./autogen.sh
cd '$(1)' && ./configure \
--host='$(TARGET)' \
+ --build="`config.guess`" \
--disable-shared \
--prefix='$(PREFIX)/$(TARGET)' \
PKG_CONFIG='$(PREFIX)/bin/$(TARGET)-pkg-config'