diff options
author | Mikhail Teterin <mi@FreeBSD.org> | 2003-04-08 20:42:50 +0000 |
---|---|---|
committer | Mikhail Teterin <mi@FreeBSD.org> | 2003-04-08 20:42:50 +0000 |
commit | 7bf5f9ef0cda3e4b351ccb09c449051a691ac96d (patch) | |
tree | a3a42305d9ece8948c53254bee0cd1fc78cba3c9 | |
parent | Enable compilation with GCC 3 (tested with 3.2.2). (diff) |
Upgrade to 0.5 (from 0.4). BUILD_DEPEND on gawk to ensure the man-pages are built.
Add some bug-fixes noticed by the compiler.
Notes
Notes:
svn path=/head/; revision=78621
-rw-r--r-- | databases/mdbtools/Makefile | 12 | ||||
-rw-r--r-- | databases/mdbtools/distinfo | 2 | ||||
-rw-r--r-- | databases/mdbtools/files/patch-backend.c | 11 | ||||
-rw-r--r-- | databases/mdbtools/files/patch-write.c | 12 | ||||
-rw-r--r-- | databases/mdbtools/pkg-plist | 9 |
5 files changed, 41 insertions, 5 deletions
diff --git a/databases/mdbtools/Makefile b/databases/mdbtools/Makefile index 99cf50ccefb5..da0ff3b93180 100644 --- a/databases/mdbtools/Makefile +++ b/databases/mdbtools/Makefile @@ -6,7 +6,7 @@ # PORTNAME= mdbtools -PORTVERSION= 0.4 +PORTVERSION= 0.5 CATEGORIES= databases MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} @@ -14,17 +14,23 @@ 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_REINPLACE= yes USE_GNOMENG= yes USE_GNOME= glib12 USE_LIBTOOL= yes INSTALLS_SHLIB= yes -DOCS= AUTHORS ChangeLog HACKING NEWS README TODO INSTALL +DOCS= AUTHORS ChangeLog HACKING NEWS README TODO +MAN1= mdb-ver.1 mdb-tables.1 mdb-schema.1 mdb-sql.1 mdb-export.1 post-patch: @${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} \ - -e "s|glib-config|${GLIB_CONFIG}|g" + -e "s|glib-config|${GLIB_CONFIG}|g" \ + -e "s|@GLIB_CFLAGS@|`${GLIB_CONFIG} --cflags`|g" \ + -e "s|@GLIB_LIBS@|`${GLIB_CONFIG} --libs`|g" + ${REINPLACE_CMD} -e 's|$$(srcdir)/$$<|$$(srcdir)/$$>|g' ${WRKSRC}/doc/Makefile.in .if !defined(NOPORTDOCS) post-install: diff --git a/databases/mdbtools/distinfo b/databases/mdbtools/distinfo index faeb7ca1a209..55d0d481b15e 100644 --- a/databases/mdbtools/distinfo +++ b/databases/mdbtools/distinfo @@ -1 +1 @@ -MD5 (mdbtools-0.4.tar.gz) = 70015c0c33e910fa817ea6fa0700dd50 +MD5 (mdbtools-0.5.tar.gz) = 4a18bf96e67161101cade64526756d22 diff --git a/databases/mdbtools/files/patch-backend.c b/databases/mdbtools/files/patch-backend.c new file mode 100644 index 000000000000..463faf0043aa --- /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-write.c b/databases/mdbtools/files/patch-write.c new file mode 100644 index 000000000000..edce42eaa835 --- /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-plist b/databases/mdbtools/pkg-plist index c96f65c3c6d8..245eed5fb670 100644 --- a/databases/mdbtools/pkg-plist +++ b/databases/mdbtools/pkg-plist @@ -10,12 +10,20 @@ bin/mdb-ver bin/prcat bin/prdata bin/prdump +bin/prindex bin/prkkd +bin/prole bin/prtable +bin/updrow include/mdbodbc.h include/mdbsql.h include/mdbtools.h +lib/libmdbsql.a +lib/libmdbsql.la +lib/libmdbsql.so +lib/libmdbsql.so.0 lib/libmdb.a +lib/libmdb.la lib/libmdb.so lib/libmdb.so.0 %%PORTDOCS%%share/doc/mdbtools/AUTHORS @@ -24,5 +32,4 @@ lib/libmdb.so.0 %%PORTDOCS%%share/doc/mdbtools/NEWS %%PORTDOCS%%share/doc/mdbtools/README %%PORTDOCS%%share/doc/mdbtools/TODO -%%PORTDOCS%%share/doc/mdbtools/INSTALL %%PORTDOCS%%@dirrm share/doc/mdbtools |