6 files changed, 60 insertions, 9 deletions
diff --git a/databases/unixODBC/Makefile b/databases/unixODBC/Makefile
index bf656eac7064..a0c60eb066e4 100644
--- a/databases/unixODBC/Makefile
+++ b/databases/unixODBC/Makefile
@@ -21,11 +21,11 @@ CONFIGURE_ARGS=	--enable-static --enable-shared \
 INSTALLS_SHLIB=	yes
 
 .if defined(WITH_GUI)
-USE_QT_VER=	2
+USE_QT_VER=	3
 QT_NONSTANDARD=	yes
 CONFIGURE_ENV=	MOC="${MOC}" \
-		QTINC="${X11BASE}/include/qt2" \
-		QTLIB="${X11BASE}/lib" \
+		QTINC="${QT_PREFIX}/include" \
+		QTLIB="${QT_PREFIX}/lib" \
 		USER_INCLUDES="${QTCPPFLAGS}" \
 		USER_LDFLAGS="${QTCFGLIBS}"
 CONFIGURE_ARGS+=	--enable-gui
@@ -35,18 +35,14 @@ CONFIGURE_ARGS+=	--disable-gui
 PLIST_SUB=	GUI:="@comment "
 .endif
 
-.if defined(WITH_PTHREAD)
+.if defined(WITH_PTHREAD) || defined(WITH_GUI)
 CONFIGURE_ARGS+=	--enable-threads=yes
-QT_NAME=		qt2-mt
 .else
 CONFIGURE_ARGS+=	--enable-threads=no
-QT_NAME=		qt2
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|"-lqt"|"-l${QT_NAME}"|g ; \
-		 s|"-lqt-mt"|"-l${QT_NAME}"|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/databases/unixODBC/files/patch-DataManager::Makefile.in b/databases/unixODBC/files/patch-DataManager::Makefile.in
new file mode 100644
index 000000000000..481f28789846
--- /dev/null
+++ b/databases/unixODBC/files/patch-DataManager::Makefile.in
@@ -0,0 +1,11 @@
+--- DataManager/Makefile.in.orig	Fri Aug 23 21:15:16 2002
++++ DataManager/Makefile.in	Tue Oct  1 06:48:32 2002
+@@ -188,7 +188,7 @@
+ 
+ @QT_TRUE@bin_PROGRAMS = DataManager
+ 
+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
+ 
+ @QT_TRUE@DataManager_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
+ 
diff --git a/databases/unixODBC/files/patch-DataManagerII::Makefile.in b/databases/unixODBC/files/patch-DataManagerII::Makefile.in
new file mode 100644
index 000000000000..34fe5b020841
--- /dev/null
+++ b/databases/unixODBC/files/patch-DataManagerII::Makefile.in
@@ -0,0 +1,11 @@
+--- DataManagerII/Makefile.in.orig	Fri Aug 23 21:15:18 2002
++++ DataManagerII/Makefile.in	Tue Oct  1 06:49:39 2002
+@@ -188,7 +188,7 @@
+ 
+ @QT_TRUE@bin_PROGRAMS = DataManagerII
+ 
+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@
++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@
+ 
+ @QT_TRUE@DataManagerII_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 
+ 
diff --git a/databases/unixODBC/files/patch-ODBCConfig::Makefile.in b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
new file mode 100644
index 000000000000..34b4d2ae9f68
--- /dev/null
+++ b/databases/unixODBC/files/patch-ODBCConfig::Makefile.in
@@ -0,0 +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 @@
+ 
+ @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@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
new file mode 100644
index 000000000000..6b82d488ca4f
--- /dev/null
+++ b/databases/unixODBC/files/patch-odbcinstQ::Makefile.in
@@ -0,0 +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 @@
+ 
+ @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@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-odbctest::Makefile.in b/databases/unixODBC/files/patch-odbctest::Makefile.in
new file mode 100644
index 000000000000..bf4b3c667cb9
--- /dev/null
+++ b/databases/unixODBC/files/patch-odbctest::Makefile.in
@@ -0,0 +1,11 @@
+--- odbctest/Makefile.in.orig	Fri Aug 23 21:15:20 2002
++++ odbctest/Makefile.in	Tue Oct  1 06:50:44 2002
+@@ -188,7 +188,7 @@
+ 
+ @QT_TRUE@bin_PROGRAMS = odbctest
+ 
+-@QT_TRUE@INCLUDES = -I../include @QT_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
++@QT_TRUE@INCLUDES = -I../include @X_INCLUDES@	@QT_INCLUDES@	@USER_INCLUDES@ -DSYSTEM_FILE_PATH=\"@sysconfdir@\" $(INCLTDL)
+ 
+ @QT_TRUE@odbctest_LDADD = @X_LDFLAGS@ 	@QT_LDFLAGS@ 	@USER_LDFLAGS@ 	@LIB_QT@ 	../odbcinst/libodbcinst.la 	../DriverManager/libodbc.la 	$(LIBLTDL) $(LIBADD_DL)
+