- Update QT to version 3.2.3.

- s/USE_MESA/USE_GL
- Get rid of the nvidia-driver warning
- Unhook database-plugin ports from the main port.
- Use and depend on devel/qmake.

Thanks to Mikhail Teterin <mi+kde@aldan.algebra.com> for ideas
and code for the dependency on the qmake-port and the database-
plugins.

Approved by:    Maintainer (for qt-mysql-plugins)

6 files changed, 49 insertions, 35 deletions

diff --git a/databases/qt-mysql-plugin/Makefile b/databases/qt-mysql-plugin/Makefile
index 1430d4f4fa22..a66aab38c3eb 100644
--- a/databases/qt-mysql-plugin/Makefile
+++ b/databases/qt-mysql-plugin/Makefile
@@ -6,32 +6,11 @@
 # $FreeBSD$
 #
 
-PORTNAME=	qt-mysql-plugin
-PORTREVISION=	0
-CATEGORIES=	databases x11-toolkits
-
 MAINTAINER=	kay_lehmann@web.de
 COMMENT=	A plugin for QT to connect to MySQL-Databases
 
 USE_MYSQL=	yes
-USE_QT_VER=	3
-QT_NONSTANDARD=	yes
-
-LDCONFIG_DIRS=	%%PREFIX%%/lib/plugins/sqldrivers
-CONFIGURE_ARGS=	-plugin-sql-mysql -fast
-CONFIGURE_ENV=	${ECHO} yes | MOC="${MOC}" CPPFLAGS="${QTCPPFLAGS}" \
-		LIBS="${QTCFGLIBS}" LOCALBASE="${LOCALBASE}"
-
-BUILD_PLUGIN_ONLY=	yes
-
-
-do-build:
-	cd ${WRKSRC}/plugins/src/sqldrivers/mysql; \
-		${SETENV} ${MAKE_ENV} ${GMAKE}
 
-do-install:
-	${MKDIR} ${PREFIX}/lib/plugins/sqldrivers
-	${INSTALL_DATA} ${WRKSRC}/plugins/sqldrivers/libqsqlmysql.so \
-		${PREFIX}/lib/plugins/sqldrivers/
+DB?=		mysql
 
-.include "../../x11-toolkits/qt32/Makefile"
+.include "../qt-mysql-plugin/Makefile.dbplugin"
diff --git a/databases/qt-mysql-plugin/Makefile.dbplugin b/databases/qt-mysql-plugin/Makefile.dbplugin
new file mode 100644
index 000000000000..914cd40e3e29
--- /dev/null
+++ b/databases/qt-mysql-plugin/Makefile.dbplugin
@@ -0,0 +1,26 @@
+PORTNAME=	qt-${DB}-plugin
+PORTVERSION=	3.2.3
+CATEGORIES=	databases
+DISTNAME=	qt-x11-free-${PORTVERSION}
+MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/      \
+		ftp://ftp.silug.org/pub/qt/             \
+		ftp://ftp.bero.org/pub/qt/              \
+		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
+DIST_SUBDIR=	KDE
+
+LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt32
+
+USE_BZIP2=	yes
+PLUGIN=		plugins/src/sqldrivers/${DB}
+DRIVER=		src/sql/drivers/${DB}
+EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \
+		${DISTNAME}/${DRIVER}
+MAKEFILE=	${FILESDIR}/Makefile.bsd
+MAKE_ENV+=	DRIVER="${DRIVER}" PLUGIN="${PLUGIN}"
+MASTERDIR=	${PORTSDIR}/databases/qt-mysql-plugin
+
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS=	%%PREFIX%%/lib/plugins/sqldrivers
+PLIST_SUB=	DB=${DB}
+
+.include <bsd.port.mk>
diff --git a/databases/qt-mysql-plugin/distinfo b/databases/qt-mysql-plugin/distinfo
index e2cdecd987cc..3d346c5edda8 100644
--- a/databases/qt-mysql-plugin/distinfo
+++ b/databases/qt-mysql-plugin/distinfo
@@ -1 +1 @@
-MD5 (KDE/qt-x11-free-3.2.1.tar.bz2) = 9ae022ffe7603ec34aba150f6cca257a
+MD5 (KDE/qt-x11-free-3.2.3.tar.bz2) = cd6df28c81ac00d97d62bd9942b8da03
diff --git a/databases/qt-mysql-plugin/files/Makefile.bsd b/databases/qt-mysql-plugin/files/Makefile.bsd
new file mode 100644
index 000000000000..2f6cd74f5939
--- /dev/null
+++ b/databases/qt-mysql-plugin/files/Makefile.bsd
@@ -0,0 +1,19 @@
+DB=${PLUGIN:T}
+
+SHLIB_NAME=	libqsql${DB}.so
+
+VPATH=		${PLUGIN}:${DRIVER}
+CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
+		-I${LOCALBASE}/include/mysql \
+		-I${LOCALBASE}/include/postgresql/server \
+		-I${LOCALBASE}/include -I${X11BASE}/include
+
+SRCS=		qsql_${DB}.cpp main.cpp
+LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
+
+${LIBDIR}:
+	mkdir -p ${LIBDIR}
+
+beforeinstall:	${LIBDIR}
+
+.include <bsd.lib.mk>
diff --git a/databases/qt-mysql-plugin/files/patch-mysql.pro b/databases/qt-mysql-plugin/files/patch-mysql.pro
deleted file mode 100644
index a19b07c91dd5..000000000000
--- a/databases/qt-mysql-plugin/files/patch-mysql.pro
+++ /dev/null
@@ -1,10 +0,0 @@
---- plugins/src/sqldrivers/mysql/mysql.pro.orig	Wed Aug  6 13:21:58 2003
-+++ plugins/src/sqldrivers/mysql/mysql.pro	Wed Aug  6 13:22:46 2003
-@@ -10,6 +10,7 @@
- 	!contains( LIBS, .*mysql.* ) {
- 	    LIBS    *= -lmysqlclient
- 	}
-+	INCLUDEPATH	+= ${LOCALBASE}/include/mysql
- }
- win32 {
- 	OBJECTS_DIR = obj
diff --git a/databases/qt-mysql-plugin/pkg-plist b/databases/qt-mysql-plugin/pkg-plist
index dbdd89ca4b33..482facca168e 100644
--- a/databases/qt-mysql-plugin/pkg-plist
+++ b/databases/qt-mysql-plugin/pkg-plist
@@ -1,2 +1,2 @@
-lib/plugins/sqldrivers/libqsqlmysql.so
+lib/plugins/sqldrivers/libqsql%%DB%%.so
 @dirrm lib/plugins/sqldrivers