The KDE FreeBSD team is proud to announce the release

of KDE 3.5.9 for FreeBSD. The official KDE 3.5.9 release
notes can be found at:
http://www.kde.org/announcements/announce-3.5.9.php

After the KDE 4.1.0 import the team found time to make
KDE 3.5.9 ready for the Ports tree.

KDE 3.5.9 was released six months ago and 3.5.10 is coming
soon. We are not sure we have time to get 3.5.10 for FreeBSD
7.1/6.4 release, but we would have minimum 3.5.9 for those
people who prefer to stay with KDE3.

Of course Thanks to all Testers.

12 files changed, 28 insertions, 133 deletions

diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile
index 96b0dde9a135..1ce686a8e00e 100644
--- a/multimedia/kdemultimedia3/Makefile
+++ b/multimedia/kdemultimedia3/Makefile
@@ -8,7 +8,7 @@
 
 PORTNAME=	kdemultimedia
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	3
+PORTREVISION=	0
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -33,7 +33,7 @@ PREFIX=		${KDE_PREFIX}
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	autoconf:261:env libtool:15
+USE_AUTOTOOLS=	libtool:15
 
 MAKE_ENV=	${CONFIGURE_ENV}
 
@@ -42,9 +42,6 @@ CONFIGURE_ENV+=	AKODE_CONFIG=${LOCALBASE}/bin/akode-config
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib %%PREFIX%%/lib/kde3
 DO_NOT_COMPILE+=akode juk mpeglib mpeglib_artsplug xine_artsplugin
-# short-circuit auto frameworks rebuilds
-MAKE_ARGS=	ACLOCAL="${TRUE}" AUTOCONF="${TRUE}" AUTOMAKE="${TRUE}" \
-		AUTOHEADER="${TRUE}"
 
 OPTIONS=	AKODE "Use akode for audio playback" on \
 		MPEGLIB "Use mpeglib for audio playback" off \
@@ -56,8 +53,10 @@ OPTIONS=	AKODE "Use akode for audio playback" on \
 .if !defined(WITHOUT_AKODE)
 LIB_DEPENDS+=	akode:${PORTSDIR}/audio/akode
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode.so:${PORTSDIR}/audio/akode
+PLIST_SUB+= AKODE=""
 .else
 DO_NOT_COMPILE+=akode_artsplugin
+PLIST_SUB+= AKODE="@comment "
 .endif
 
 .if defined(WITH_XINE)
@@ -75,8 +74,6 @@ CONFIGURE_ENV+=	DO_NOT_COMPILE="${DO_NOT_COMPILE}"
 pre-configure:
 	${REINPLACE_CMD} -e "s,applications-merged,kde-applications-merged,g" \
 		${WRKSRC}/kappfinder-data/Makefile.in
-	@cd ${CONFIGURE_WRKSRC} \
-		&& ${SETENV} ${AUTOTOOLS_ENV} ${AUTOCONF} ${AUTOCONF_ARGS}
 
 post-install:
 	@${CAT} ${PKGMESSAGE}
diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo
index 205a5351d44e..1b3c3932e5d7 100644
--- a/multimedia/kdemultimedia3/distinfo
+++ b/multimedia/kdemultimedia3/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.8.tar.bz2) = 9f3c95231ea265b09f3010adb954ae30
-SHA256 (KDE/kdemultimedia-3.5.8.tar.bz2) = 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1
-SIZE (KDE/kdemultimedia-3.5.8.tar.bz2) = 6316739
+MD5 (KDE/kdemultimedia-3.5.9.tar.bz2) = fdfafe38d2c7e3019dafc80c177add15
+SHA256 (KDE/kdemultimedia-3.5.9.tar.bz2) = 9b7bb2fea17f5e7b271acdaec09e939a7dea60f66237cda00aabda6ed33e5183
+SIZE (KDE/kdemultimedia-3.5.9.tar.bz2) = 6327361
diff --git a/multimedia/kdemultimedia3/files/patch-configure.in b/multimedia/kdemultimedia3/files/patch-configure.in
deleted file mode 100644
index 2e04bffa5e92..000000000000
--- a/multimedia/kdemultimedia3/files/patch-configure.in
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.in.orig	2008-03-27 18:04:50.000000000 +0100
-+++ configure.in	2008-03-27 18:06:26.000000000 +0100
-@@ -937,9 +937,9 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
-   AC_LANG_SAVE
-   AC_LANG_C
-   have_libFLAC=no
--  KDE_CHECK_HEADER(FLAC/metadata.h,
-+  KDE_CHECK_HEADER(FLAC/stream_decoder.h,
-   [
--     KDE_CHECK_LIB(FLAC,FLAC__seekable_stream_decoder_process_single,
-+     KDE_CHECK_LIB(FLAC,FLAC__stream_decoder_init_ogg_stream,
- 	          have_libFLAC=yes)
- 
-     ])
-@@ -947,28 +947,10 @@ AC_DEFUN([AC_CHECK_LIBFLAC],
-       LIBFLAC="-lFLAC"
-       AC_DEFINE(HAVE_LIBFLAC, 1,
-         [Define if you have libFLAC (required for loading FLAC files)])
--  fi
--  AC_SUBST(LIBFLAC)
--  AC_LANG_RESTORE
--])
--
--AC_DEFUN([AC_CHECK_LIBOGGFLAC],
--[
--  AC_LANG_SAVE
--  AC_LANG_C
--  have_libOggFLAC=no
--  KDE_CHECK_HEADER(OggFLAC/seekable_stream_decoder.h,
--  [
--     KDE_CHECK_LIB(OggFLAC,OggFLAC__seekable_stream_decoder_process_single,
--	          have_libOggFLAC=yes,,[-lm -lOggFLAC -lFLAC])
--
--    ])
--  if test "x$have_libOggFLAC" = "xyes"; then
--      LIBOGGFLAC="-lOggFLAC"
-       AC_DEFINE(HAVE_LIBOGGFLAC, 1,
-         [Define if you have libOggFLAC (required for loading OggFLAC files)])
-   fi
--  AC_SUBST(LIBOGGFLAC)
-+  AC_SUBST(LIBFLAC)
-   AC_LANG_RESTORE
- ])
- 
-@@ -976,7 +958,6 @@ AC_ARG_WITH(flac,AC_HELP_STRING([--with-
- 
- if test "x$flac_test" = "xyes" ; then
-   AC_CHECK_LIBFLAC
--  AC_CHECK_LIBOGGFLAC
- fi
- dnl =======================================================
- dnl FILE: ./kmid/configure.in.in
diff --git a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp b/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp
deleted file mode 100644
index d718b1dd1209..000000000000
--- a/multimedia/kdemultimedia3/files/patch-kioslave_audiocd_plugins_flac_encoderflac.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
---- kioslave/audiocd/plugins/flac/encoderflac.cpp.orig	2006-01-19 17:40:33.000000000 +0100
-+++ kioslave/audiocd/plugins/flac/encoderflac.cpp	2008-03-27 18:03:56.000000000 +0100
-@@ -47,7 +47,7 @@ public:
-     unsigned long data;
- };
- 
--static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], unsigned bytes, unsigned samples, unsigned current_frame, void *client_data)
-+static FLAC__StreamEncoderWriteStatus WriteCallback(const FLAC__StreamEncoder *encoder, const FLAC__byte buffer[], size_t bytes, unsigned samples, unsigned current_frame, void *client_data)
- {
-     EncoderFLAC::Private *d = (EncoderFLAC::Private*)client_data;
- 
-@@ -109,9 +109,6 @@ unsigned long EncoderFLAC::size(long tim
- long EncoderFLAC::readInit(long size) {
-     kdDebug(7117) << "EncoderFLAC::readInit() called"<< endl;
-     d->data = 0;
--    FLAC__stream_encoder_set_write_callback(d->encoder, WriteCallback);
--    FLAC__stream_encoder_set_metadata_callback(d->encoder, MetadataCallback);
--    FLAC__stream_encoder_set_client_data(d->encoder, d);
- 
-     // The options match approximely those of flac compression-level-3
-     FLAC__stream_encoder_set_do_mid_side_stereo(d->encoder, true);
-@@ -124,7 +121,7 @@ long EncoderFLAC::readInit(long size) {
-     if (size > 0)
-         FLAC__stream_encoder_set_total_samples_estimate(d->encoder, size/4);
- 
--    FLAC__stream_encoder_init(d->encoder);
-+    FLAC__stream_encoder_init_stream(d->encoder, WriteCallback, NULL, NULL, MetadataCallback, d);
-     return d->data;
- }
- 
diff --git a/multimedia/kdemultimedia3/files/patch-kmix_mixer_oss.cpp b/multimedia/kdemultimedia3/files/patch-kmix_mixer_oss.cpp
deleted file mode 100644
index b5be16597dea..000000000000
--- a/multimedia/kdemultimedia3/files/patch-kmix_mixer_oss.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
---- kmix/mixer_oss.cpp	Fri Sep 14 18:02:58 2007
-+++ kmix/mixer_oss.cpp	Fri Sep 14 19:45:27 2007
-@@ -243,6 +243,18 @@
-   if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1)
-     errormsg(Mixer::ERR_READ);
- 
-+  // If the record source is supposed to be on, but wasn't set, explicitly
-+  // set the record source. Not all cards support multiple record sources.
-+  // As a result, we also need to do the read & write again.
-+  if (((i_recsrc & ( 1<<devnum)) == 0) && on)
-+  {
-+     oldrecsrc = i_recsrc = 1 << devnum;
-+     if (ioctl(m_fd, SOUND_MIXER_WRITE_RECSRC, &i_recsrc) == -1)
-+       errormsg (Mixer::ERR_WRITE);
-+     if (ioctl(m_fd, SOUND_MIXER_READ_RECSRC, &i_recsrc) == -1)
-+       errormsg(Mixer::ERR_READ);
-+  }
-+
-   // PORTING: Hint: Do not forget to set i_recsrc to the new valid
-   //                record source mask.
- 
diff --git a/multimedia/kdemultimedia3/pkg-message b/multimedia/kdemultimedia3/pkg-message
index 46998b1bd3e9..06d66d9f5b8e 100644
--- a/multimedia/kdemultimedia3/pkg-message
+++ b/multimedia/kdemultimedia3/pkg-message
@@ -20,8 +20,8 @@ the CAM transport layer and CAM passthrough layer devices to 666, i.e.:
 
 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.
+In order to make these changes permanent, you have to add them to
+/etc/devfs.conf. Further instructions and examples on how to do this
+can be found there as well.
  
 ======================================================================
diff --git a/multimedia/kdemultimedia3/pkg-plist b/multimedia/kdemultimedia3/pkg-plist
index 2dc072e91738..4b469df355ab 100644
--- a/multimedia/kdemultimedia3/pkg-plist
+++ b/multimedia/kdemultimedia3/pkg-plist
@@ -411,14 +411,14 @@ lib/mcop/Noatun/StereoVolumeControlSSE.mcopclass
 lib/mcop/Noatun/WinSkinFFT.mcopclass
 lib/mcop/RawWriter.mcopclass
 lib/mcop/VoiceRemoval.mcopclass
-lib/mcop/akodeMPCPlayObject.mcopclass
-lib/mcop/akodeMPEGPlayObject.mcopclass
-lib/mcop/akodePlayObject.mcopclass
-lib/mcop/akodeSpeexStreamPlayObject.mcopclass
-lib/mcop/akodeVorbisStreamPlayObject.mcopclass
-lib/mcop/akodeXiphPlayObject.mcopclass
-lib/mcop/akodearts.mcopclass
-lib/mcop/akodearts.mcoptype
+%%AKODE%%lib/mcop/akodeMPCPlayObject.mcopclass
+%%AKODE%%lib/mcop/akodeMPEGPlayObject.mcopclass
+%%AKODE%%lib/mcop/akodePlayObject.mcopclass
+%%AKODE%%lib/mcop/akodeSpeexStreamPlayObject.mcopclass
+%%AKODE%%lib/mcop/akodeVorbisStreamPlayObject.mcopclass
+%%AKODE%%lib/mcop/akodeXiphPlayObject.mcopclass
+%%AKODE%%lib/mcop/akodearts.mcopclass
+%%AKODE%%lib/mcop/akodearts.mcoptype
 lib/mcop/artsbuilder.mcopclass
 lib/mcop/artsbuilder.mcoptype
 lib/mcop/artseffects.mcopclass
diff --git a/multimedia/noatun-plugins/Makefile b/multimedia/noatun-plugins/Makefile
index ef46ba9afc83..2031ab83cec0 100644
--- a/multimedia/noatun-plugins/Makefile
+++ b/multimedia/noatun-plugins/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	${NOATUNPLUG_PORTNAME}
 PORTVERSION=	${NOATUNPLUG_PORTVERSION}
-PORTREVISION=	1
+PORTREVISION=	${NOATUNPLUG_PORTREVISION}
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -31,6 +31,8 @@ USE_SDL=	sdl
 USE_LDCONFIG=	yes
 LDCONFIG_DIRS+=	%%PREFIX%%/lib/kde3
 
+PLIST_SUB+=	KDE_VER="${KDE_VERSION}"
+
 .include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include "${.CURDIR}/../../misc/kdeaddons3/Makefile.split"
 .include <bsd.port.mk>
diff --git a/multimedia/noatun-plugins/distinfo b/multimedia/noatun-plugins/distinfo
index 7eac88841e0f..72f6011a9604 100644
--- a/multimedia/noatun-plugins/distinfo
+++ b/multimedia/noatun-plugins/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdeaddons-3.5.8.tar.bz2) = 4a338f14210ad920bb54624cd330dd89
-SHA256 (KDE/kdeaddons-3.5.8.tar.bz2) = e505a472ef2dd70e36992802fc33939a65be80bb8610a28bac6f639fa2ce2868
-SIZE (KDE/kdeaddons-3.5.8.tar.bz2) = 1726291
+MD5 (KDE/kdeaddons-3.5.9.tar.bz2) = eaa3832a25b483d1a9613f75991c3d7b
+SHA256 (KDE/kdeaddons-3.5.9.tar.bz2) = 2860d74dca92f4b6a08dc93620a6af85050ae43037a7cffe0c88377015804e34
+SIZE (KDE/kdeaddons-3.5.9.tar.bz2) = 1727652
diff --git a/multimedia/noatun-plugins/pkg-plist b/multimedia/noatun-plugins/pkg-plist
index 532cc91a2944..1ecaeee5d812 100644
--- a/multimedia/noatun-plugins/pkg-plist
+++ b/multimedia/noatun-plugins/pkg-plist
@@ -43,7 +43,7 @@ lib/kde3/noatunwakeup.so
 lib/kde3/noatunwavecapture.a
 lib/kde3/noatunwavecapture.la
 lib/kde3/noatunwavecapture.so
-share/applications/kdeaddons-noatun-plugins-3.5.8
+share/applications/kdeaddons-noatun-plugins-%%KDE_VER%%
 share/apps/noatun/alsaplayerui.plugin
 share/apps/noatun/blurscope.plugin
 share/apps/noatun/charlatanui.plugin
diff --git a/multimedia/xine_artsplugin/Makefile b/multimedia/xine_artsplugin/Makefile
index ddbfe72d7159..46cb58b76f9d 100644
--- a/multimedia/xine_artsplugin/Makefile
+++ b/multimedia/xine_artsplugin/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	xine_artsplugin
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
diff --git a/multimedia/xine_artsplugin/distinfo b/multimedia/xine_artsplugin/distinfo
index 205a5351d44e..1b3c3932e5d7 100644
--- a/multimedia/xine_artsplugin/distinfo
+++ b/multimedia/xine_artsplugin/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.8.tar.bz2) = 9f3c95231ea265b09f3010adb954ae30
-SHA256 (KDE/kdemultimedia-3.5.8.tar.bz2) = 07fc79e38bd7d50a8e2b9910a5d78ef565557b2a746b31d5d440829e9f05b0c1
-SIZE (KDE/kdemultimedia-3.5.8.tar.bz2) = 6316739
+MD5 (KDE/kdemultimedia-3.5.9.tar.bz2) = fdfafe38d2c7e3019dafc80c177add15
+SHA256 (KDE/kdemultimedia-3.5.9.tar.bz2) = 9b7bb2fea17f5e7b271acdaec09e939a7dea60f66237cda00aabda6ed33e5183
+SIZE (KDE/kdemultimedia-3.5.9.tar.bz2) = 6327361