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).

13 files changed, 110 insertions, 84 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 336d047d2a71..685003c5e754 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -36,47 +35,60 @@ KDE_BUILD_PLIST=yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	esound
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" \
-			--enable-audio=oss,esd
+CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+
+OPTIONS=	XINE "Enable support for video playback, using libxine" off \
+		MPEGLIB "Use mpeglib for audio playback" on
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
 .if exists(${X11BASE}/bin/xine-config)
+.	if !defined(WITH_XINE)
+XINE_OVERRIDE=	yes
 WITH_XINE=	yes
-.endif # exists(${LOCALBASE}/bin/xine-config)
+.	endif
+.endif
 
-.if defined(WITHOUT_XINE)
-DO_NOT_COMPILE+=	xine_artsplugin
-CONFIGURE_ARGS+=	--disable-xinetest
-.elif defined(WITH_XINE)
+.if defined(WITH_XINE)
 PLIST_APPEND+=	plist.xine
 LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.endif # defined(WITHOUT_XINE)
-
-.if defined(WITHOUT_MPEGLIB)
-PLIST_APPEND+=	plist.no-mpeglib
 .else
+DO_NOT_COMPILE+=        xine_artsplugin
+CONFIGURE_ARGS+=        --disable-xinetest
+.endif
+
+.if defined(WITH_MPEGLIB)
 PLIST_APPEND+=	plist.mpeglib
+.else
+PLIST_APPEND+=	plist.no-mpeglib
 .endif
 
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+pre-everything::
+.if defined(XINE_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG} "*    libxine is installed but WITH_XINE is not set!    *"
+	@${ECHO_MSG} "*       WITH_XINE has been enabled automatically.      *"
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG}
+.endif
 
 pre-configure:
-.if defined(WITHOUT_MPEGLIB)
+.if !defined(WITH_MPEGLIB)
 	${REINPLACE_CMD} -e \
 	'/FreeBSD/,/;$$/s/kde_mpeglib_compiles=yes/kde_mpeglib_compiles=no/g' \
 		${WRKSRC}/configure
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index ef8a80408285..dad125cb93a7 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdemultimedia-3.2.0.tar.bz2) = caa8578190d032acd3c8fa996cf9585a
+MD5 (KDE/kdemultimedia-3.2.1.tar.bz2) = 6e03faa44ff7fdf60fd2fef0d23d5c43
+SIZE (KDE/kdemultimedia-3.2.1.tar.bz2) = 4926192
diff --git a/multimedia/kdemultimedia3/files/patch-configure b/multimedia/kdemultimedia3/files/patch-configure
index 9b45322fceeb..7185d93fc46b 100644
--- a/multimedia/kdemultimedia3/files/patch-configure
+++ b/multimedia/kdemultimedia3/files/patch-configure
@@ -9,19 +9,12 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_X86_SSE 1
---- configure.orig	Tue Feb  3 11:30:24 2004
-+++ configure	Tue Feb  3 11:30:53 2004
-@@ -32539,13 +32539,6 @@
- echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6
- 
- fi
--if test $ac_cv_header_linux_cdrom_h = yes; then
--  :
--else
--  { echo "$as_me:$LINENO: WARNING: This doesn't seem to be a Linux system. KAudioCreator has been disabled." >&5
--echo "$as_me: WARNING: This doesn't seem to be a Linux system. KAudioCreator has been disabled." >&2;}
--enable_kac=no
--fi
- 
- 
-    CPPFLAGS=$kde_safe_cppflags
+@@ -32634,7 +32634,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lFLAC  $LIBS"
++LIBS="-lFLAC -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* #line $LINENO "configure" */
+ /* confdefs.h.  */
diff --git a/multimedia/kdemultimedia3/files/plist.base b/multimedia/kdemultimedia3/files/plist.base
index 695007fe4827..3a24ba9347ee 100644
--- a/multimedia/kdemultimedia3/files/plist.base
+++ b/multimedia/kdemultimedia3/files/plist.base
@@ -279,6 +279,9 @@ lib/libkdeinit_krec.la
 lib/libkdeinit_krec.so
 lib/libkdeinit_noatun.la
 lib/libkdeinit_noatun.so
+lib/libkmidlib.la
+lib/libkmidlib.so
+lib/libkmidlib.so.0
 lib/libmpeg-0.3.0.so
 lib/libmpeg.la
 lib/libmpeg.so
@@ -298,7 +301,6 @@ lib/libwinskinvis.so
 lib/libworkman.la
 lib/libworkman.so
 lib/libworkman.so.6
-lib/libworkmanaudio.a
 lib/libyafcore.la
 lib/libyafcore.so
 lib/libyafcore.so.0
@@ -963,6 +965,7 @@ share/icons/crystalsvg/16x16/apps/artsbuilder.png
 share/icons/crystalsvg/16x16/apps/artscontrol.png
 share/icons/crystalsvg/16x16/apps/juk.png
 share/icons/crystalsvg/16x16/apps/kaboodle.png
+share/icons/crystalsvg/16x16/apps/kaudiocreator.png
 share/icons/crystalsvg/16x16/apps/kmid.png
 share/icons/crystalsvg/16x16/apps/kmix.png
 share/icons/crystalsvg/16x16/apps/krec.png
@@ -987,6 +990,7 @@ share/icons/crystalsvg/32x32/actions/artsmidimanager.png
 share/icons/crystalsvg/32x32/apps/artscontrol.png
 share/icons/crystalsvg/32x32/apps/juk.png
 share/icons/crystalsvg/32x32/apps/kaboodle.png
+share/icons/crystalsvg/32x32/apps/kaudiocreator.png
 share/icons/crystalsvg/32x32/apps/kmid.png
 share/icons/crystalsvg/32x32/apps/kmix.png
 share/icons/crystalsvg/32x32/apps/krec.png
@@ -1000,7 +1004,6 @@ share/icons/crystalsvg/48x48/actions/artsmidimanager.png
 share/icons/crystalsvg/48x48/apps/artscontrol.png
 share/icons/crystalsvg/48x48/apps/juk.png
 share/icons/crystalsvg/48x48/apps/kaboodle.png
-share/icons/crystalsvg/32x32/apps/kaudiocreator.png
 share/icons/crystalsvg/48x48/apps/kmid.png
 share/icons/crystalsvg/48x48/apps/kmix.png
 share/icons/crystalsvg/48x48/apps/krec.png
diff --git a/multimedia/kdemultimedia3/files/plist.base.rm b/multimedia/kdemultimedia3/files/plist.base.rm
index 8d8a64e27781..cf7d314966d4 100644
--- a/multimedia/kdemultimedia3/files/plist.base.rm
+++ b/multimedia/kdemultimedia3/files/plist.base.rm
@@ -5,6 +5,11 @@
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
 @dirrm share/icons/crystalsvg/scalable/apps
 @dirrm share/icons/crystalsvg/scalable/actions
 @dirrm share/icons/crystalsvg/scalable
diff --git a/multimedia/kdemultimedia3/pkg-message b/multimedia/kdemultimedia3/pkg-message
index 2aff439f6210..46998b1bd3e9 100644
--- a/multimedia/kdemultimedia3/pkg-message
+++ b/multimedia/kdemultimedia3/pkg-message
@@ -2,15 +2,13 @@
 ======================================================================
 In order to run the kscd program properly, please run as root:
 
-	ln -sf <cdrom_device> /dev/cdrom
 	chmod 666 <cdrom_device>
 
-to link and give permission to access the CD-ROM device.
+to give permission to access the CD-ROM device.
 
 For example, if you have an IDE/ATAPI CD-ROM device:
 
-	ln -sf /dev/racd0c /dev/cdrom
-	chmod 666 /dev/racd0c
+	chmod 666 /dev/acd0c
 
 Additional instructions for using the audiocd:/ kioslave:
 
@@ -20,8 +18,10 @@ the CAM transport layer and CAM passthrough layer devices to 666, i.e.:
 
 	chmod 666 /dev/xpt0 /dev/pass0
 
+For ATAPI CD-ROMs and no ATAPICAM, the instructions for kscd apply.
+
 In order to make these changes permanent on FreeBSD 5.x, you have to
 add them to /etc/devfs.conf. Further instructions and examples on how
-to do this, can be found there as well.
+to do this can be found there as well.
  
 ======================================================================
diff --git a/multimedia/kdemultimedia4/Makefile b/multimedia/kdemultimedia4/Makefile
index 336d047d2a71..685003c5e754 100644
--- a/multimedia/kdemultimedia4/Makefile
+++ b/multimedia/kdemultimedia4/Makefile
@@ -8,10 +8,9 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
+MASTER_SITE_SUBDIR=	stable/${PORTVERSION}/src
 DIST_SUBDIR=	KDE
 
 MAINTAINER=	kde@FreeBSD.org
@@ -36,47 +35,60 @@ KDE_BUILD_PLIST=yes
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	esound
 USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
-CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}" \
-			--enable-audio=oss,esd
+CONFIGURE_ARGS+=	--with-vorbis="${LOCALBASE}"
+INSTALLS_SHLIB=	yes
+LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+
+OPTIONS=	XINE "Enable support for video playback, using libxine" off \
+		MPEGLIB "Use mpeglib for audio playback" on
 
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.pre.mk>
 
 .if exists(${X11BASE}/bin/xine-config)
+.	if !defined(WITH_XINE)
+XINE_OVERRIDE=	yes
 WITH_XINE=	yes
-.endif # exists(${LOCALBASE}/bin/xine-config)
+.	endif
+.endif
 
-.if defined(WITHOUT_XINE)
-DO_NOT_COMPILE+=	xine_artsplugin
-CONFIGURE_ARGS+=	--disable-xinetest
-.elif defined(WITH_XINE)
+.if defined(WITH_XINE)
 PLIST_APPEND+=	plist.xine
 LIB_DEPENDS+=	xine:${PORTSDIR}/multimedia/libxine
 BUILD_DEPENDS+=	xine-config:${PORTSDIR}/multimedia/libxine
 CONFIGURE_ARGS+=--with-xine-prefix=${X11BASE}
-.endif # defined(WITHOUT_XINE)
-
-.if defined(WITHOUT_MPEGLIB)
-PLIST_APPEND+=	plist.no-mpeglib
 .else
+DO_NOT_COMPILE+=        xine_artsplugin
+CONFIGURE_ARGS+=        --disable-xinetest
+.endif
+
+.if defined(WITH_MPEGLIB)
 PLIST_APPEND+=	plist.mpeglib
+.else
+PLIST_APPEND+=	plist.no-mpeglib
 .endif
 
 .if defined(DO_NOT_COMPILE)
 CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 .endif # defined(DO_NOT_COMPILE)
 
-INSTALLS_SHLIB=	yes
-LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
+pre-everything::
+.if defined(XINE_OVERRIDE)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG} "*    libxine is installed but WITH_XINE is not set!    *"
+	@${ECHO_MSG} "*       WITH_XINE has been enabled automatically.      *"
+	@${ECHO_MSG} "********************************************************"
+	@${ECHO_MSG}
+.endif
 
 pre-configure:
-.if defined(WITHOUT_MPEGLIB)
+.if !defined(WITH_MPEGLIB)
 	${REINPLACE_CMD} -e \
 	'/FreeBSD/,/;$$/s/kde_mpeglib_compiles=yes/kde_mpeglib_compiles=no/g' \
 		${WRKSRC}/configure
diff --git a/multimedia/kdemultimedia4/distinfo b/multimedia/kdemultimedia4/distinfo
index ef8a80408285..dad125cb93a7 100644
--- a/multimedia/kdemultimedia4/distinfo
+++ b/multimedia/kdemultimedia4/distinfo
@@ -1 +1,2 @@
-MD5 (KDE/kdemultimedia-3.2.0.tar.bz2) = caa8578190d032acd3c8fa996cf9585a
+MD5 (KDE/kdemultimedia-3.2.1.tar.bz2) = 6e03faa44ff7fdf60fd2fef0d23d5c43
+SIZE (KDE/kdemultimedia-3.2.1.tar.bz2) = 4926192
diff --git a/multimedia/kdemultimedia4/files/patch-configure b/multimedia/kdemultimedia4/files/patch-configure
index 9b45322fceeb..7185d93fc46b 100644
--- a/multimedia/kdemultimedia4/files/patch-configure
+++ b/multimedia/kdemultimedia4/files/patch-configure
@@ -9,19 +9,12 @@
  
  cat >>confdefs.h <<\_ACEOF
  #define HAVE_X86_SSE 1
---- configure.orig	Tue Feb  3 11:30:24 2004
-+++ configure	Tue Feb  3 11:30:53 2004
-@@ -32539,13 +32539,6 @@
- echo "${ECHO_T}$ac_cv_header_linux_cdrom_h" >&6
- 
- fi
--if test $ac_cv_header_linux_cdrom_h = yes; then
--  :
--else
--  { echo "$as_me:$LINENO: WARNING: This doesn't seem to be a Linux system. KAudioCreator has been disabled." >&5
--echo "$as_me: WARNING: This doesn't seem to be a Linux system. KAudioCreator has been disabled." >&2;}
--enable_kac=no
--fi
- 
- 
-    CPPFLAGS=$kde_safe_cppflags
+@@ -32634,7 +32634,7 @@
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lFLAC  $LIBS"
++LIBS="-lFLAC -lm $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* #line $LINENO "configure" */
+ /* confdefs.h.  */
diff --git a/multimedia/kdemultimedia4/files/plist.base b/multimedia/kdemultimedia4/files/plist.base
index 695007fe4827..3a24ba9347ee 100644
--- a/multimedia/kdemultimedia4/files/plist.base
+++ b/multimedia/kdemultimedia4/files/plist.base
@@ -279,6 +279,9 @@ lib/libkdeinit_krec.la
 lib/libkdeinit_krec.so
 lib/libkdeinit_noatun.la
 lib/libkdeinit_noatun.so
+lib/libkmidlib.la
+lib/libkmidlib.so
+lib/libkmidlib.so.0
 lib/libmpeg-0.3.0.so
 lib/libmpeg.la
 lib/libmpeg.so
@@ -298,7 +301,6 @@ lib/libwinskinvis.so
 lib/libworkman.la
 lib/libworkman.so
 lib/libworkman.so.6
-lib/libworkmanaudio.a
 lib/libyafcore.la
 lib/libyafcore.so
 lib/libyafcore.so.0
@@ -963,6 +965,7 @@ share/icons/crystalsvg/16x16/apps/artsbuilder.png
 share/icons/crystalsvg/16x16/apps/artscontrol.png
 share/icons/crystalsvg/16x16/apps/juk.png
 share/icons/crystalsvg/16x16/apps/kaboodle.png
+share/icons/crystalsvg/16x16/apps/kaudiocreator.png
 share/icons/crystalsvg/16x16/apps/kmid.png
 share/icons/crystalsvg/16x16/apps/kmix.png
 share/icons/crystalsvg/16x16/apps/krec.png
@@ -987,6 +990,7 @@ share/icons/crystalsvg/32x32/actions/artsmidimanager.png
 share/icons/crystalsvg/32x32/apps/artscontrol.png
 share/icons/crystalsvg/32x32/apps/juk.png
 share/icons/crystalsvg/32x32/apps/kaboodle.png
+share/icons/crystalsvg/32x32/apps/kaudiocreator.png
 share/icons/crystalsvg/32x32/apps/kmid.png
 share/icons/crystalsvg/32x32/apps/kmix.png
 share/icons/crystalsvg/32x32/apps/krec.png
@@ -1000,7 +1004,6 @@ share/icons/crystalsvg/48x48/actions/artsmidimanager.png
 share/icons/crystalsvg/48x48/apps/artscontrol.png
 share/icons/crystalsvg/48x48/apps/juk.png
 share/icons/crystalsvg/48x48/apps/kaboodle.png
-share/icons/crystalsvg/32x32/apps/kaudiocreator.png
 share/icons/crystalsvg/48x48/apps/kmid.png
 share/icons/crystalsvg/48x48/apps/kmix.png
 share/icons/crystalsvg/48x48/apps/krec.png
diff --git a/multimedia/kdemultimedia4/files/plist.base.rm b/multimedia/kdemultimedia4/files/plist.base.rm
index 8d8a64e27781..cf7d314966d4 100644
--- a/multimedia/kdemultimedia4/files/plist.base.rm
+++ b/multimedia/kdemultimedia4/files/plist.base.rm
@@ -5,6 +5,11 @@
 @dirrm share/mimelnk/audio
 @dirrm share/mimelnk/application
 @dirrm share/mimelnk
+@dirrm share/icons/locolor/32x32/apps
+@dirrm share/icons/locolor/32x32
+@dirrm share/icons/locolor/16x16/apps
+@dirrm share/icons/locolor/16x16
+@dirrm share/icons/locolor
 @dirrm share/icons/crystalsvg/scalable/apps
 @dirrm share/icons/crystalsvg/scalable/actions
 @dirrm share/icons/crystalsvg/scalable
diff --git a/multimedia/kdemultimedia4/pkg-message b/multimedia/kdemultimedia4/pkg-message
index 2aff439f6210..46998b1bd3e9 100644
--- a/multimedia/kdemultimedia4/pkg-message
+++ b/multimedia/kdemultimedia4/pkg-message
@@ -2,15 +2,13 @@
 ======================================================================
 In order to run the kscd program properly, please run as root:
 
-	ln -sf <cdrom_device> /dev/cdrom
 	chmod 666 <cdrom_device>
 
-to link and give permission to access the CD-ROM device.
+to give permission to access the CD-ROM device.
 
 For example, if you have an IDE/ATAPI CD-ROM device:
 
-	ln -sf /dev/racd0c /dev/cdrom
-	chmod 666 /dev/racd0c
+	chmod 666 /dev/acd0c
 
 Additional instructions for using the audiocd:/ kioslave:
 
@@ -20,8 +18,10 @@ the CAM transport layer and CAM passthrough layer devices to 666, i.e.:
 
 	chmod 666 /dev/xpt0 /dev/pass0
 
+For ATAPI CD-ROMs and no ATAPICAM, the instructions for kscd apply.
+
 In order to make these changes permanent on FreeBSD 5.x, you have to
 add them to /etc/devfs.conf. Further instructions and examples on how
-to do this, can be found there as well.
+to do this can be found there as well.
  
 ======================================================================
diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile
index bf4fb7865bdb..c9bd2e671864 100644
--- a/multimedia/noatun-plugins/Makefile
+++ b/multimedia/noatun-plugins/Makefile
@@ -16,8 +16,6 @@ DIST_SUBDIR=	KDE
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Various plugins for Noatun
 
-IGNORE=		This port is part of KDE 3.2.1 and is not yet ready
-
 LIB_DEPENDS=	noatun:${PORTSDIR}/multimedia/kdemultimedia3
 
 KDE_SPLIT=	${NOATUNPLUG_PORTNAME:S/${KDE_SPLIT_DIST}-//}