7 files changed, 15 insertions, 40 deletions

diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index 137c69ef3741..42845cc07ab4 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	unixODBC
-PORTVERSION=	2.2.4
+PORTVERSION=	2.2.5
 CATEGORIES=	databases
 MASTER_SITES=	http://www.unixodbc.org/
 
diff --git a/databases/unixODBC/distinfo b/databases/unixODBC/distinfo
index 4a3f4e99067e..4ed19cf37fc7 100644
--- a/databases/unixODBC/distinfo
+++ b/databases/unixODBC/distinfo
@@ -1 +1 @@
-MD5 (unixODBC-2.2.4.tar.gz) = 9377765695c2ff196c97de22d4fbfc1a
+MD5 (unixODBC-2.2.5.tar.gz) = 3d65cc539bf406fb8a49749f600ce6e5
diff --git a/databases/unixODBC/files/patch-DataManager::classISQL.h b/databases/unixODBC/files/patch-DataManager::classISQL.h
deleted file mode 100644
index a201aa57167f..000000000000
--- a/databases/unixODBC/files/patch-DataManager::classISQL.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- DataManager/classISQL.h.orig	Thu Dec 13 04:55:58 2001
-+++ DataManager/classISQL.h	Sat Feb 15 03:22:44 2003
-@@ -17,7 +17,7 @@
- #include <qcombo.h>
- #include <qslider.h>
- #include <qtabbar.h>
--#include <qmlined.h>
-+#include <qtextedit.h>
- #include <qfile.h>
- #include <qfiledialog.h>
- #include <qtextstream.h>
diff --git a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
index 34b4d2ae9f68..ec3a8bb89c0a 100644
--- a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
+++ b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
@@ -1,11 +1,11 @@
---- ODBCConfig/Makefile.in.orig	Fri Aug 23 21:15:14 2002
-+++ ODBCConfig/Makefile.in	Tue Oct  1 06:47:26 2002
-@@ -188,7 +188,7 @@
+--- ODBCConfig/Makefile.in.orig	Thu Feb 27 02:42:19 2003
++++ ODBCConfig/Makefile.in	Tue Apr 22 06:22:54 2003
+@@ -176,7 +176,7 @@
  
  @QT_TRUE@bin_PROGRAMS = ODBCConfig
  
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ \
+ @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
  
- @QT_TRUE@ODBCConfig_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la 
  
diff --git a/databases/unixODBC/files/patch-odbcinstQ::Makefile.in b/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
index 6b82d488ca4f..3221a6934e2b 100644
--- a/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
+++ b/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
@@ -1,11 +1,11 @@
---- odbcinstQ/Makefile.in.orig	Fri Aug 23 21:14:25 2002
-+++ odbcinstQ/Makefile.in	Tue Oct  1 06:45:53 2002
-@@ -191,7 +191,7 @@
+--- odbcinstQ/Makefile.in.orig	Thu Feb 27 02:40:20 2003
++++ odbcinstQ/Makefile.in	Tue Apr 22 06:21:33 2003
+@@ -182,7 +182,7 @@
  
- @QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la
+ @QT_TRUE@lib_LTLIBRARIES = libodbcinstQ.la 
  
--@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
-+@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@     -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ \
++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ \
+ @QT_TRUE@    -DSYSTEM_FILE_PATH=\"@sysconfdir@\" -DDEFLIB_PATH=\"@libdir@\" $(INCLTDL)
  
- @QT_TRUE@libodbcinstQ_la_LIBADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../extras/libodbcextraslc.la 	../DriverManager/libodbc.la 
  
diff --git a/databases/unixODBC/files/patch-yac.y b/databases/unixODBC/files/patch-yac.y
deleted file mode 100644
index 6cae9498b410..000000000000
--- a/databases/unixODBC/files/patch-yac.y
+++ /dev/null
@@ -1,11 +0,0 @@
---- sqp/yac.y.orig	Tue Dec 10 18:24:32 2002
-+++ sqp/yac.y	Tue Dec 10 18:24:55 2002
-@@ -214,7 +214,7 @@
- y_escape:
- 		/* optional */				{ $$ = NULL; }
- 	|	ESCAPE STRING				{ $$ = $2;   }
--
-+	;
- y_comparisons:
- 		y_comparisons OR y_comparisons		{ $$ = sqpStoreCond( sqpor,   $1,   $3,   NULL ); }
- 	|	y_comparisons AND y_comparisons		{ $$ = sqpStoreCond( sqpand,  $1,   $3,   NULL ); }
diff --git a/databases/unixODBC/pkg-plist b/databases/unixODBC/pkg-plist
index f481654d1505..f1545c6e384e 100644
--- a/databases/unixODBC/pkg-plist
+++ b/databases/unixODBC/pkg-plist
@@ -112,7 +112,6 @@ lib/libtemplate.so.1
 %%PORTDOCS%%share/doc/unixODBC/UserManual/StarOfficeDataGrid.gif
 %%PORTDOCS%%share/doc/unixODBC/UserManual/index.html
 %%PORTDOCS%%share/doc/unixODBC/UserManual/unixODBC.gif
-%%PORTDOCS%%share/doc/unixODBC/index.html
 %%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.gif
 %%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.html
 %%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure.vsd
@@ -134,8 +133,6 @@ lib/libtemplate.so.1
 %%PORTDOCS%%share/doc/unixODBC/lst/InternalStructure9.html
 %%PORTDOCS%%share/doc/unixODBC/lst/back.gif
 %%PORTDOCS%%share/doc/unixODBC/lst/next.gif
-%%PORTDOCS%%share/doc/unixODBC/smallbook.gif
-%%PORTDOCS%%share/doc/unixODBC/unixODBC.gif
 %%PORTDOCS%%@dirrm share/doc/unixODBC/lst
 %%PORTDOCS%%@dirrm share/doc/unixODBC/UserManual
 %%PORTDOCS%%@dirrm share/doc/unixODBC/ProgrammerManual/Tutorial