- Update to 2.2.12

PR:		ports/105029
Submitted by:	KATO Tsuguru <tkato432@yahoo.com>
Sponsored by:   FreeBSD Bug-a-thon #2

9 files changed, 6 insertions, 88 deletions

diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 3efb5e6592fd..ea3fd158126e 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	unixODBC
-PORTVERSION=	2.2.11
-PORTREVISION=	1
+PORTVERSION=	2.2.12
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
@@ -18,7 +17,7 @@ CONFLICTS=	libiodbc-*
 
 USE_GNOME=	gnomehack gnometarget
 USE_ICONV=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 CONFIGURE_ARGS=	--enable-static --enable-shared \
 		--with-libiconv-prefix=${LOCALBASE}
 USE_LDCONFIG=	yes
diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo
index e29e4fae2202..9a9b626f5864 100644
--- a/databases/unixODBC/distinfo
+++ b/databases/unixODBC/distinfo
@@ -1,3 +1,3 @@
-MD5 (unixODBC-2.2.11.tar.gz) = 9ae806396844e38244cf65ad26ba0f23
-SHA256 (unixODBC-2.2.11.tar.gz) = 7990bc1652c083ccd2b7915a14e4a3bb1901c5bf988be20001dfcb3dfb58ed88
-SIZE (unixODBC-2.2.11.tar.gz) = 2406740
+MD5 (unixODBC-2.2.12.tar.gz) = 9a116aad4059c31d231b626ffdf1869a
+SHA256 (unixODBC-2.2.12.tar.gz) = d8b425e9cd8bf55ac21653d27e017045013a155a6149ca2930e257a146f9fe40
+SIZE (unixODBC-2.2.12.tar.gz) = 2798077
diff --git a/databases/unixODBC/files/patch-DataManager::Makefile.in b/databases/unixODBC/files/patch-DataManager::Makefile.in
deleted file mode 100644
index ec00104bc257..000000000000
--- a/databases/unixODBC/files/patch-DataManager::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- DataManager/Makefile.in.orig	Tue Sep 28 17:48:15 2004
-+++ DataManager/Makefile.in	Sun Oct 31 02:04:31 2004
-@@ -200,7 +200,7 @@
- 
- @QT_TRUE@bin_PROGRAMS = DataManager
- 
--@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
-+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
- 
- @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ \
- @QT_TRUE@	@QT_LDFLAGS@ \
diff --git a/databases/unixODBC/files/patch-DataManagerII::Makefile.in b/databases/unixODBC/files/patch-DataManagerII::Makefile.in
deleted file mode 100644
index 619b51b045d8..000000000000
--- a/databases/unixODBC/files/patch-DataManagerII::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- DataManagerII/Makefile.in.orig	Sun Oct 31 02:06:57 2004
-+++ DataManagerII/Makefile.in	Sun Oct 31 02:06:57 2004
-@@ -200,7 +200,7 @@
- 
- @QT_TRUE@bin_PROGRAMS = DataManagerII
- 
--@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@
-+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
- 
- @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ \
- @QT_TRUE@	@QT_LDFLAGS@ \
diff --git a/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in b/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in
deleted file mode 100644
index edc1850a2a6d..000000000000
--- a/databases/unixODBC/files/patch-Drivers-MiniSQL-Makefile.in
+++ /dev/null
@@ -1,27 +0,0 @@
---- Drivers/MiniSQL/Makefile.in.orig	Tue Sep 28 17:48:19 2004
-+++ Drivers/MiniSQL/Makefile.in	Sun Oct 31 02:09:32 2004
-@@ -197,13 +197,13 @@
- qt_libraries = @qt_libraries@
- x_includes = @x_includes@
- x_libraries = @x_libraries@
--@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
-+#@MSQL_TRUE@lib_LTLIBRARIES = libodbcmini.la
- 
- @MSQL_TRUE@INCLUDES = -I@top_srcdir@/include -I. -I@msql_headers@ -I${INCLTDL}
- 
- 
- # PAH - Redundant?
--# DEFS = -DUNIXODBC @DEFS@ -DDRIVER_NAME=\"odbcminisql\"
-+DEFS = -DUNIXODBC @DEFS@ -DDRIVER_NAME=\"odbcminisql\"
- @MSQL_TRUE@libodbcmini_la_SOURCES = \
- @MSQL_TRUE@	SQLAllocConnect.c \
- @MSQL_TRUE@	SQLAllocEnv.c \
-@@ -439,7 +439,7 @@
- @MSQL_TRUE@	sqlFreeConnect.lo sqlFreeEnv.lo sqlFreeStmt.lo
- libodbcmini_la_OBJECTS = $(am_libodbcmini_la_OBJECTS)
- 
--DEFS = @DEFS@
-+#DEFS = @DEFS@
- DEFAULT_INCLUDES =  -I. -I$(srcdir)
- CPPFLAGS = @CPPFLAGS@
- LDFLAGS = @LDFLAGS@
diff --git a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
deleted file mode 100644
index 864515369a8f..000000000000
--- a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- ODBCConfig/Makefile.in.orig	Tue Sep 28 17:48:25 2004
-+++ ODBCConfig/Makefile.in	Sun Oct 31 02:09:58 2004
-@@ -200,7 +200,7 @@
- 
- @QT_TRUE@bin_PROGRAMS = ODBCConfig
- 
--@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
-+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ \
- @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
- 
- 
diff --git a/databases/unixODBC/files/patch-odbcinstQ::Makefile.in b/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
deleted file mode 100644
index 23d5371f2d93..000000000000
--- a/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- odbcinstQ/Makefile.in.orig	Tue Sep 28 17:48:35 2004
-+++ odbcinstQ/Makefile.in	Sun Oct 31 02:10:20 2004
-@@ -206,7 +206,7 @@
- 
- @QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la 
- 
--@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ \
-+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ \
- @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
- 
- 
diff --git a/databases/unixODBC/files/patch-odbctest::Makefile.in b/databases/unixODBC/files/patch-odbctest::Makefile.in
deleted file mode 100644
index abc6df04a196..000000000000
--- a/databases/unixODBC/files/patch-odbctest::Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- odbctest/Makefile.in.orig	Tue Sep 28 17:48:35 2004
-+++ odbctest/Makefile.in	Sun Oct 31 02:10:44 2004
-@@ -200,7 +200,7 @@
- 
- @QT_TRUE@bin_PROGRAMS = odbctest
- 
--@QT_TRUE@INCLUDES = -I@top_srcdir@/include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
-+@QT_TRUE@INCLUDES = -I@top_srcdir@/include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
- 
- @QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ \
- @QT_TRUE@	@QT_LDFLAGS@ \
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index bbba6e165e57..859c8ddcf0ac 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -16,6 +16,7 @@ include/sql.h
 include/sqlext.h
 include/sqltypes.h
 include/sqlucode.h
+include/uodbc_extras.h
 include/uodbc_stats.h
 lib/libboundparam.a
 lib/libboundparam.la