From nobody@FreeBSD.org  Sat Oct  5 02:34:00 2002
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 867BF37B401
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Oct 2002 02:34:00 -0700 (PDT)
Received: from www.freebsd.org (www.freebsd.org [216.136.204.117])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 309E743E65
	for <freebsd-gnats-submit@FreeBSD.org>; Sat,  5 Oct 2002 02:34:00 -0700 (PDT)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.12.6/8.12.6) with ESMTP id g959Y07R058780
	for <freebsd-gnats-submit@FreeBSD.org>; Sat, 5 Oct 2002 02:34:00 -0700 (PDT)
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.12.6/8.12.6/Submit) id g959Y01E058779;
	Sat, 5 Oct 2002 02:34:00 -0700 (PDT)
Message-Id: <200210050934.g959Y01E058779@www.freebsd.org>
Date: Sat, 5 Oct 2002 02:34:00 -0700 (PDT)
From: KATO Tsuguru <tkato@prontomail.com>
To: freebsd-gnats-submit@FreeBSD.org
Subject: Update port: databases/unixODBC
X-Send-Pr-Version: www-1.0

>Number:         43695
>Category:       ports
>Synopsis:       Update port: databases/unixODBC
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Sat Oct 05 02:40:03 PDT 2002
>Closed-Date:    Thu Jan 02 22:41:34 PST 2003
>Last-Modified:  Thu Jan 02 22:41:34 PST 2003
>Originator:     KATO Tsuguru
>Release:        4.6.2-RELEASE i386
>Organization:
>Environment:
>Description:
- Convert to support Qt3

New file:
files/patch-DataManager::Makefile.in
files/patch-DataManagerII::Makefile.in
files/patch-ODBCConfig::Makefile.in
files/patch-odbcinstQ::Makefile.in
files/patch-odbctest::Makefile.in

>How-To-Repeat:

>Fix:
diff -urN /usr/ports/databases/unixODBC/Makefile databases/unixODBC/Makefile
--- /usr/ports/databases/unixODBC/Makefile	Tue Sep 10 20:07:34 2002
+++ databases/unixODBC/Makefile	Wed Oct  2 09:15:38 2002
@@ -21,11 +21,11 @@
 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 @@
 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 -urN /usr/ports/databases/unixODBC/files/patch-DataManager::Makefile.in databases/unixODBC/files/patch-DataManager::Makefile.in
--- /usr/ports/databases/unixODBC/files/patch-DataManager::Makefile.in	Thu Jan  1 09:00:00 1970
+++ databases/unixODBC/files/patch-DataManager::Makefile.in	Tue Oct  1 08:36:36 2002
@@ -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 -urN /usr/ports/databases/unixODBC/files/patch-DataManagerII::Makefile.in databases/unixODBC/files/patch-DataManagerII::Makefile.in
--- /usr/ports/databases/unixODBC/files/patch-DataManagerII::Makefile.in	Thu Jan  1 09:00:00 1970
+++ databases/unixODBC/files/patch-DataManagerII::Makefile.in	Tue Oct  1 08:36:57 2002
@@ -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 -urN /usr/ports/databases/unixODBC/files/patch-ODBCConfig::Makefile.in databases/unixODBC/files/patch-ODBCConfig::Makefile.in
--- /usr/ports/databases/unixODBC/files/patch-ODBCConfig::Makefile.in	Thu Jan  1 09:00:00 1970
+++ databases/unixODBC/files/patch-ODBCConfig::Makefile.in	Tue Oct  1 08:37:24 2002
@@ -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 -urN /usr/ports/databases/unixODBC/files/patch-odbcinstQ::Makefile.in databases/unixODBC/files/patch-odbcinstQ::Makefile.in
--- /usr/ports/databases/unixODBC/files/patch-odbcinstQ::Makefile.in	Thu Jan  1 09:00:00 1970
+++ databases/unixODBC/files/patch-odbcinstQ::Makefile.in	Tue Oct  1 08:37:56 2002
@@ -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 -urN /usr/ports/databases/unixODBC/files/patch-odbctest::Makefile.in databases/unixODBC/files/patch-odbctest::Makefile.in
--- /usr/ports/databases/unixODBC/files/patch-odbctest::Makefile.in	Thu Jan  1 09:00:00 1970
+++ databases/unixODBC/files/patch-odbctest::Makefile.in	Tue Oct  1 08:38:21 2002
@@ -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)
+ 

>Release-Note:
>Audit-Trail:
State-Changed-From-To: open->closed 
State-Changed-By: ijliao 
State-Changed-When: Thu Jan 2 22:41:27 PST 2003 
State-Changed-Why:  
committed, thanks 

http://www.freebsd.org/cgi/query-pr.cgi?pr=43695 
>Unformatted:
