Update to KDE 3.5.0

5 files changed, 48 insertions, 46 deletions

diff --git a/audio/akode/Makefile b/audio/akode/Makefile
index bc2ab55830fd..0d2d80ab2636 100644
--- a/audio/akode/Makefile
+++ b/audio/akode/Makefile
@@ -6,24 +6,22 @@
 #
 
 PORTNAME=	akode
-PORTVERSION=	${KDE_VERSION}
+PORTVERSION=	2.0.r1
+PORTEPOCH=	1
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_KDE}
-MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
-PKGNAMEPREFIX=	kdemultimedia-
-DISTNAME=	kdemultimedia-${PORTVERSION}
-DIST_SUBDIR=	KDE
+MASTER_SITES=	${MASTER_SITE_LOCAL} \
+		http://www.kde-apps.org/content/
+MASTER_SITE_SUBDIR=lofi
+DISTNAME=	'download.php?content=30375'
+EXTRACT_SUFX=	# none
 
 MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Default KDE audio backend
 
-EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
-
-LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		vorbis.3:${PORTSDIR}/audio/libvorbis
-
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
+FETCH_CMD=	/usr/bin/fetch -Rr
+
 OPTIONS=	JACK "Jack output plugin" off \
 		MPC "Monkey's Audio decoder plugin" on \
 		MPEG "MPEG Audio (including mp3) plugin" on \
@@ -32,14 +30,18 @@ OPTIONS=	JACK "Jack output plugin" off \
 		RESAMPLER "Resampler processing plugin" on \
 		XIPH "FLAC/Speex/Vorbis decoder plugin" on
 
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
-
-USE_BZIP2=	yes
+USE_AUTOTOOLS=	libltdl
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
+WRKSRC=		${WRKDIR}/${PORTNAME}-2.0rc1
 INSTALLS_SHLIB=	yes
+PLIST_SUB+=	MACHINE_ARCH=${MACHINE_ARCH}
+
+CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
+		--program-transform-name= \
+		--with-extra-libs=${LOCALBASE}/lib \
+		--with-extra-includes=${LOCALBASE}/include
 
 .include <bsd.port.pre.mk>
 
@@ -48,7 +50,7 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_jack_sink.so:${PORTSDIR}/audio/akode-plu
 .endif
 
 .if !defined(WITHOUT_MPC)
-RUN_DEPENDS+=   ${LOCALBASE}/lib/libakode_mpc_decoder.so:${PORTSDIR}/audio/akode-plugins-mpc
+RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_mpc_decoder.so:${PORTSDIR}/audio/akode-plugins-mpc
 .endif
 
 .if !defined(WITHOUT_MPEG)
@@ -71,12 +73,16 @@ RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_src_resampler.so:${PORTSDIR}/audio/akode
 RUN_DEPENDS+=	${LOCALBASE}/lib/libakode_xiph_decoder.so:${PORTSDIR}/audio/akode-plugins-xiph
 .endif
 
+post-patch:
+	@${SETENV} TZ=UTC ${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+	${REINPLACE_CMD} -e 's|akodeplay_LDFLAGS =.*|akodeplay_LDFLAGS = \
+	$$(all_libraries) ${PTHREAD_LIBS}|g' \
+		${WRKSRC}/akode/akodeplay/Makefile.in
+
 do-build:
-	cd ${WRKSRC}/arts/runtime && gmake
-	cd ${WRKSRC}/akode && gmake
+	cd ${WRKSRC}/akode && ${GMAKE}
 
 do-install:
-	cd ${WRKSRC}/akode && gmake install
+	cd ${WRKSRC}/akode && ${GMAKE} install
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.post.mk>
diff --git a/audio/akode/distinfo b/audio/akode/distinfo
index 87b7455e0327..fb41904535c8 100644
--- a/audio/akode/distinfo
+++ b/audio/akode/distinfo
@@ -1,2 +1,3 @@
-MD5 (KDE/kdemultimedia-3.4.3.tar.bz2) = 49fed5afad01c322d3bc8c6a175d1898
-SIZE (KDE/kdemultimedia-3.4.3.tar.bz2) = 5495757
+MD5 (download.php?content=30375) = 9d3f06d36cdcbf3c5f3a57021d2abc4e
+SHA256 (download.php?content=30375) = 26f77ca7f41e494b7e97c2cf2f7aad2a3cd77f7f6728118d0b8b9b752a655b1a
+SIZE (download.php?content=30375) = 650104
diff --git a/audio/akode/files/patch-akode_Makefile.in b/audio/akode/files/patch-akode_Makefile.in
new file mode 100644
index 000000000000..f2d44639a36f
--- /dev/null
+++ b/audio/akode/files/patch-akode_Makefile.in
@@ -0,0 +1,11 @@
+--- akode/Makefile.in.orig	Tue Nov 29 17:51:19 2005
++++ akode/Makefile.in	Tue Nov 29 17:51:05 2005
+@@ -247,7 +247,7 @@
+ unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@
+ unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@
+ bin_SCRIPTS = akode-config
+-SUBDIRS = lib plugins akodeplay
++SUBDIRS = lib akodeplay
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
diff --git a/audio/akode/files/patch-akode_plugins_Makefile.in b/audio/akode/files/patch-akode_plugins_Makefile.in
deleted file mode 100644
index 502f3719920a..000000000000
--- a/audio/akode/files/patch-akode_plugins_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- akode/plugins/Makefile.in.orig	Wed Mar 16 10:34:20 2005
-+++ akode/plugins/Makefile.in	Wed Mar 16 10:34:39 2005
-@@ -468,10 +468,7 @@
- @include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink
- @include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink
- @include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink
--SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) $(AKODE_MPEG_DECODER) \
--         $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
--         $(AKODE_SRC_RESAMPLER)
--
-+SUBDIRS = 
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
diff --git a/audio/akode/pkg-plist b/audio/akode/pkg-plist
index 347f1494e828..b5459fe7685d 100644
--- a/audio/akode/pkg-plist
+++ b/audio/akode/pkg-plist
@@ -1,8 +1,13 @@
+bin/akode-config
+bin/akodeplay
+include/akode/akode_export.h
 include/akode/akodelib.h
 include/akode/audiobuffer.h
 include/akode/audioconfiguration.h
 include/akode/audioframe.h
 include/akode/auto_sink.h
+include/akode/buffered_decoder.h
+include/akode/bytebuffer.h
 include/akode/converter.h
 include/akode/crossfader.h
 include/akode/decoder.h
@@ -10,7 +15,6 @@ include/akode/encoder.h
 include/akode/fast_resampler.h
 include/akode/file.h
 include/akode/framedecoder.h
-include/akode/frametostream_decoder.h
 include/akode/localfile.h
 include/akode/magic.h
 include/akode/mmapfile.h
@@ -18,16 +22,10 @@ include/akode/player.h
 include/akode/pluginhandler.h
 include/akode/resampler.h
 include/akode/sink.h
-include/akode/streamdecoder.h
-include/akode/streamtoframe_decoder.h
+include/akode/void_sink.h
 include/akode/volumefilter.h
 include/akode/wav_decoder.h
 lib/libakode.la
 lib/libakode.so
-lib/libakode.so.1
-lib/libarts_akode.la
-lib/libarts_akode.so
-lib/mcop/akodePlayObject.mcopclass
-lib/mcop/akodearts.mcopclass
-lib/mcop/akodearts.mcoptype
+lib/libakode.so.2
 @dirrm include/akode