Revision: 118199 https://trac.macports.org/changeset/118199 Author: and.damore@macports.org Date: 2014-03-25 07:53:07 -0700 (Tue, 25 Mar 2014) Log Message: ----------- port mdbtools: add unixodb and iodbc variants, nomaintainer call builtin autogen.sh script rather than just autoreconf add patchfile for removing ld GNU-only option remove useless option still present in current patchfiles Modified Paths: -------------- trunk/dports/databases/mdbtools/Portfile trunk/dports/databases/mdbtools/files/patch-configure_in.diff trunk/dports/databases/mdbtools/files/patch-src_libmdb_makefile_am.diff trunk/dports/databases/mdbtools/files/patch-src_sql_makefile_am.diff Added Paths: ----------- trunk/dports/databases/mdbtools/files/patch-src_odbc_makefile_am.diff Modified: trunk/dports/databases/mdbtools/Portfile =================================================================== --- trunk/dports/databases/mdbtools/Portfile 2014-03-25 14:34:46 UTC (rev 118198) +++ trunk/dports/databases/mdbtools/Portfile 2014-03-25 14:53:07 UTC (rev 118199) @@ -28,8 +28,23 @@ sha256 6d49c52ee578dc7209865873a5715ff2adc6cab214faae6b5c2b91ee058c5c6f patchfiles patch-configure_in.diff \ - patch-src_sql_makefile_am.diff \ - patch-src_libmdb_makefile_am.diff + patch-src_libmdb_makefile_am.diff \ + patch-src_odbc_makefile_am.diff \ + patch-src_sql_makefile_am.diff use_autoreconf yes configure.args-append --mandir=${prefix}/share/man +autoreconf.cmd ./autogen.sh +autoreconf.args ${configure.args} + + +variant unixodbc conflicts iodbc description {build odbc driver against unixODBC} { + depends_lib-append port:unixodbc + configure.args-append --with-unixodbc=${prefix} +} + +variant iodbc conflicts unixodbc description {build odbc driver against iODBC} { + depends_lib-append port:libiodbc + configure.args-append --with-iodbc=${prefix} +} + Modified: trunk/dports/databases/mdbtools/files/patch-configure_in.diff =================================================================== --- trunk/dports/databases/mdbtools/files/patch-configure_in.diff 2014-03-25 14:34:46 UTC (rev 118198) +++ trunk/dports/databases/mdbtools/files/patch-configure_in.diff 2014-03-25 14:53:07 UTC (rev 118199) @@ -5,7 +5,7 @@ AC_SUBST(LFLAGS) -LDFLAGS="$LDFLAGS -Wl,--as-needed" -+LDFLAGS="$LDFLAGS -Wl," ++LDFLAGS="$LDFLAGS" dnl check for iODBC Modified: trunk/dports/databases/mdbtools/files/patch-src_libmdb_makefile_am.diff =================================================================== --- trunk/dports/databases/mdbtools/files/patch-src_libmdb_makefile_am.diff 2014-03-25 14:34:46 UTC (rev 118198) +++ trunk/dports/databases/mdbtools/files/patch-src_libmdb_makefile_am.diff 2014-03-25 14:53:07 UTC (rev 118199) @@ -4,6 +4,6 @@ lib_LTLIBRARIES = libmdb.la libmdb_la_SOURCES= catalog.c mem.c file.c table.c data.c dump.c backend.c money.c sargs.c index.c like.c write.c stats.c map.c props.c worktable.c options.c iconv.c -libmdb_la_LDFLAGS = -version-info 2:0:0 -Wl,--version-script=$(srcdir)/libmdb.map -+libmdb_la_LDFLAGS = -version-info 2:0:0 -Wl ++libmdb_la_LDFLAGS = -version-info 2:0:0 AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) LIBS = $(GLIB_LIBS) @LIBS@ Added: trunk/dports/databases/mdbtools/files/patch-src_odbc_makefile_am.diff =================================================================== --- trunk/dports/databases/mdbtools/files/patch-src_odbc_makefile_am.diff (rev 0) +++ trunk/dports/databases/mdbtools/files/patch-src_odbc_makefile_am.diff 2014-03-25 14:53:07 UTC (rev 118199) @@ -0,0 +1,11 @@ +--- src/odbc/Makefile.am.orig 2014-03-25 15:38:58.000000000 +0100 ++++ src/odbc/Makefile.am 2014-03-25 15:39:14.000000000 +0100 +@@ -12,7 +12,7 @@ + AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) $(ODBC_CFLAGS) + libmdbodbc_la_SOURCES= odbc.c connectparams.c + libmdbodbc_la_LIBADD= ../libmdb/libmdb.la ../sql/libmdbsql.la +-libmdbodbc_la_LDFLAGS = -version-info 1:0:0 -Wl,--version-script=$(srcdir)/libmdbodbc.map ++libmdbodbc_la_LDFLAGS = -version-info 1:0:0 + LIBS = @LEXLIB@ $(GLIB_LIBS) $(ODBC_LIBS) + unittest_LDADD = libmdbodbc.la ../libmdb/libmdb.la ../sql/libmdbsql.la + Modified: trunk/dports/databases/mdbtools/files/patch-src_sql_makefile_am.diff =================================================================== --- trunk/dports/databases/mdbtools/files/patch-src_sql_makefile_am.diff 2014-03-25 14:34:46 UTC (rev 118198) +++ trunk/dports/databases/mdbtools/files/patch-src_sql_makefile_am.diff 2014-03-25 14:53:07 UTC (rev 118199) @@ -4,7 +4,7 @@ lib_LTLIBRARIES = libmdbsql.la libmdbsql_la_SOURCES= mdbsql.c parser.y lexer.l -libmdbsql_la_LDFLAGS = -version-info 2:0:0 -Wl,--version-script=$(srcdir)/libmdbsql.map -+libmdbsql_la_LDFLAGS = -version-info 2:0:0 -Wl ++libmdbsql_la_LDFLAGS = -version-info 2:0:0 DISTCLEANFILES = parser.c parser.h lexer.c AM_CPPFLAGS = -I$(top_srcdir)/include $(GLIB_CFLAGS) LIBS = $(GLIB_LIBS)