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, 9 insertions, 8 deletions

diff --git a/Mk/bsd.kde.mk b/Mk/bsd.kde.mk
index c82abff33f6b..5673c34686e3 100644
--- a/Mk/bsd.kde.mk
+++ b/Mk/bsd.kde.mk
@@ -113,7 +113,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.2.0
+KDE_VERSION=		3.2.1
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
@@ -123,9 +123,9 @@ QTCGFLIBS?=
 # Qt 3.x common stuff
 QT_PREFIX?=		${X11BASE}
 MOC?=			${QT_PREFIX}/bin/moc
-#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt32
-BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
-RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
+#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
+BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
+RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
 QTCPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include \
 				-I${QT_PREFIX}/include -D_GETOPT_H
 QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
diff --git a/Mk/bsd.kde4.mk b/Mk/bsd.kde4.mk
index c82abff33f6b..5673c34686e3 100644
--- a/Mk/bsd.kde4.mk
+++ b/Mk/bsd.kde4.mk
@@ -113,7 +113,7 @@ CONFIGURE_ENV+=	MOC="${MOC}" CPPFLAGS="${CPPFLAGS} ${QTCPPFLAGS}" LIBS="${QTCFGL
 
 # Yeah, it's namespace pollution, but this is really the best place for this
 # stuff. Arts does NOT use it anymore.
-KDE_VERSION=		3.2.0
+KDE_VERSION=		3.2.1
 KDE_ORIGVER=	${KDE_VERSION}
 KDE_PREFIX?=	${LOCALBASE}
 
@@ -123,9 +123,9 @@ QTCGFLIBS?=
 # Qt 3.x common stuff
 QT_PREFIX?=		${X11BASE}
 MOC?=			${QT_PREFIX}/bin/moc
-#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt32
-BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
-RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt32
+#LIB_DEPENDS+=	qt-mt.3:${PORTSDIR}/x11-toolkits/qt33
+BUILD_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
+RUN_DEPENDS+=	${QT_PREFIX}/bin/moc:${PORTSDIR}/x11-toolkits/qt33
 QTCPPFLAGS+=	-I${LOCALBASE}/include -I${PREFIX}/include \
 				-I${QT_PREFIX}/include -D_GETOPT_H
 QTCFGLIBS+=		-Wl,-export-dynamic -L${LOCALBASE}/lib -L${X11BASE}/lib -ljpeg \
diff --git a/Mk/bsd.sites.mk b/Mk/bsd.sites.mk
index 3fffe1a51947..48695f3b0dd6 100644
--- a/Mk/bsd.sites.mk
+++ b/Mk/bsd.sites.mk
@@ -443,6 +443,7 @@ MASTER_SITE_ISC+=	\
 	ftp://ftp.metu.edu.tr/pub/mirrors/ftp.isc.org/%SUBDIR%/
 
 MASTER_SITE_KDE+=	\
+	http://mirrors.isc.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.us.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://ftp.kde.org/pub/kde/%SUBDIR%/ \
 	ftp://ibiblio.org/pub/packages/desktops/kde/%SUBDIR%/ \