Update to KDE 3.2.1 / QT 3.3.1

Important changes:
==================

KDE:

- Audio/arts does not install artswrapper anymore, instead it is provided by
  audio/artswrapper. See UPDATING.

- misc/kdeaddons3 is now a metaport with

	editors/kate-plugins
	editors/vimpart
	games/atlantikdesigner
	misc/kaddressbook-plugins
	misc/kfile-plugins
	misc/kicker-applets
	misc/knewsticker-scripts
	misc/konq-plugins
	misc/ksig
	misc/renamedlgplugins
	multimedia/noatun-plugins
	net/kontact-plugins

  as slave ports.

- A number of KDE ports now uses OPTIONS do make various WITH_* options more
  visible.

- Plist fixes

- devel/kdevelop should be able to detect FreeBSD's autoconf/automake now for
  newly created projects.

- kdebase will no longer remove previous KDM configurations. This won't take
  effect during the update from 3.2.0 to 3.2.1 (as deinstalling 3.2.0 will still
  remove the configuration), but subsequent updates will merge old configs.

QT:

- Previous versions of QT could be compiled with debugging-support enabled by
  defining DEBUG. This switch has been renamed to the more unambiguous
  WANT_QT_DEBUG (similar to WANT_KDE_DEBUG in the KDE ports).

3 files changed, 19 insertions, 12 deletions

diff --git a/databases/qt-mysql-plugin/Makefile.dbplugin b/databases/qt-mysql-plugin/Makefile.dbplugin
index f22055a93d1b..f29303b8faab 100644
--- a/databases/qt-mysql-plugin/Makefile.dbplugin
+++ b/databases/qt-mysql-plugin/Makefile.dbplugin
@@ -1,6 +1,5 @@
 PORTNAME=	qt-${DB}-plugin
-PORTVERSION=	3.2.3
-PORTREVISION=	1
+PORTVERSION=	3.3.1
 CATEGORIES=	databases
 DISTNAME=	qt-x11-free-${PORTVERSION}
 MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/      \
@@ -9,15 +8,15 @@ MASTER_SITES=   ftp://ftp.trolltech.com/qt/source/      \
 		ftp://ftp.planetmirror.com.au/pub/trolltech/qt/
 DIST_SUBDIR=	KDE
 
-LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt32
+LIB_DEPENDS+=	qt-mt:${PORTSDIR}/x11-toolkits/qt33
 
 USE_BZIP2=	yes
 PLUGIN=		plugins/src/sqldrivers/${DB}
 DRIVER=		src/sql/drivers/${DB}
 EXTRACT_AFTER_ARGS?=| ${TAR} -xf - ${DISTNAME}/${PLUGIN} \
-		${DISTNAME}/${DRIVER}
+		${DISTNAME}/${DRIVER} ${DISTNAME}/src/sql/drivers/cache
 MAKEFILE=	${FILESDIR}/Makefile.bsd
-MAKE_ENV+=	DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \
+MAKE_ENV+=	DB="${DB}" DRIVER="${DRIVER}" PLUGIN="${PLUGIN}" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
 MASTERDIR=	${PORTSDIR}/databases/qt-mysql-plugin
diff --git a/databases/qt-mysql-plugin/distinfo b/databases/qt-mysql-plugin/distinfo
index 3d346c5edda8..4de0a153a14c 100644
--- a/databases/qt-mysql-plugin/distinfo
+++ b/databases/qt-mysql-plugin/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/qt-x11-free-3.2.3.tar.bz2) = cd6df28c81ac00d97d62bd9942b8da03
+MD5 (KDE/qt-x11-free-3.3.1.tar.bz2) = 4e599bedfcb3fe389bc7ec921c476432
+SIZE (KDE/qt-x11-free-3.3.1.tar.bz2) = 14397600
diff --git a/databases/qt-mysql-plugin/files/Makefile.bsd b/databases/qt-mysql-plugin/files/Makefile.bsd
index bbdbade3fe5d..93b6d8ae9e75 100644
--- a/databases/qt-mysql-plugin/files/Makefile.bsd
+++ b/databases/qt-mysql-plugin/files/Makefile.bsd
@@ -1,22 +1,29 @@
-DB=${PLUGIN:T}
-
 SHLIB_NAME=	libqsql${DB}.so
 
 VPATH=		${PLUGIN}:${DRIVER}
 CXXFLAGS+=	-I${PLUGIN} -I${DRIVER} \
+		-I${LOCALBASE}/firebird/include \
 		-I${LOCALBASE}/include/mysql \
 		-I${LOCALBASE}/include/postgresql/server \
 		-I${LOCALBASE}/include -I${X11BASE}/include \
 		${PTHREAD_CFLAGS} -DQT_THREAD_SUPPORT
-.if ${DB}==mysql
+.if ${DB}==ibase
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/firebird/lib ${PTHREAD_LIBS} -lqt-mt -lgds
+SRCS=		qsql_${DB}.cpp main.cpp
+.elif ${DB}==mysql
 LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib/mysql ${PTHREAD_LIBS} -lqt-mt -lmysqlclient 
-.elif ${DB}==psql
-LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq
+SRCS=		qsql_${DB}.cpp main.cpp
 .elif ${DB}==odbc
 LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lodbc
+SRCS=		qsql_${DB}.cpp main.cpp
+.elif ${DB}==psql
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lpq
+SRCS=		qsql_${DB}.cpp main.cpp
+.elif ${DB}==sqlite
+LDADD=		-L${X11BASE}/lib -L${LOCALBASE}/lib ${PTHREAD_LIBS} -lqt-mt -lsqlite
+SRCS=		qsql_${DB}.cpp smain.cpp
 .endif
 
-SRCS=		qsql_${DB}.cpp main.cpp
 LIBDIR=		${PREFIX}/lib/plugins/sqldrivers
 
 ${LIBDIR}: