Update to KDE 3.5.0

5 files changed, 51 insertions, 34 deletions

diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index d705ddd06492..5c671c52ac1d 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -6,50 +6,54 @@
 #
 
 PORTNAME=	akode-plugins-${PORTNAMESUFX}
-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=	Jack output plugin for akode
 
-EXTRA_PATCHES=	${.CURDIR}/../../multimedia/kdemultimedia3/files/patch-configure
-
 LIB_DEPENDS=	jack:${PORTSDIR}/audio/jack
 
 CONFLICTS=	kdemultimedia-3.[1-3]*
 
+FETCH_CMD=	/usr/bin/fetch -Rr
+
 PLUGIN=		jack_sink
 PORTNAMESUFX=	${PLUGIN:S/_sink//:S/_decoder//:S/src_//}
 
-USE_KDELIBS_VER=3
-PREFIX=		${KDE_PREFIX}
-
-USE_BZIP2=	yes
+USE_AUTOTOOLS=	libltdl
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-WRKSRC=		${WRKDIR}/kdemultimedia-${PORTVERSION}
+USE_REINPLACE=	yes
+WRKSRC=		${WRKDIR}/akode-2.0rc1
 INSTALLS_SHLIB=	yes
 
+CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
+		--with-extra-includes=${LOCALBASE}/include
+
 .include <bsd.port.pre.mk>
 
 .if (${OSVERSION} > 500000 ) && (${OSVERSION} < 502102 )
-IGNORE=		"Jack not available"
+IGNORE= Jack not available
 .endif
 
+post-patch:
+	@${SETENV} TZ=UTC \
+	${TOUCH} -t 200511231529.06 ${WRKSRC}/akode/lib/akode_export.h.in
+
 pre-configure:
 	@${REINPLACE_CMD} -e 's@%%SUBDIRS%%@${PLUGIN}@g' ${WRKSRC}/akode/plugins/Makefile.in
 
 do-build:
-	cd ${WRKSRC}/arts/runtime && gmake
-	cd ${WRKSRC}/akode && gmake
+	cd ${WRKSRC}/akode && ${GMAKE}
 
 do-install:
-	cd ${WRKSRC}/akode/plugins/${PLUGIN} && gmake install
+	cd ${WRKSRC}/akode/plugins/${PLUGIN} && ${GMAKE} install
 
-.include "${.CURDIR}/../../x11/kde3/Makefile.kde"
 .include <bsd.port.post.mk>
diff --git a/audio/akode-plugins-jack/distinfo b/audio/akode-plugins-jack/distinfo
index 87b7455e0327..fb41904535c8 100644
--- a/audio/akode-plugins-jack/distinfo
+++ b/audio/akode-plugins-jack/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-plugins-jack/files/patch-akode_Makefile.in b/audio/akode-plugins-jack/files/patch-akode_Makefile.in
new file mode 100644
index 000000000000..2b2f77e6972a
--- /dev/null
+++ b/audio/akode-plugins-jack/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 plugins
+ #>- all: all-recursive
+ #>+ 1
+ all: docs-am  all-recursive
diff --git a/audio/akode-plugins-jack/files/patch-akode_plugins-Makefile.in b/audio/akode-plugins-jack/files/patch-akode_plugins-Makefile.in
new file mode 100644
index 000000000000..c43387754ff0
--- /dev/null
+++ b/audio/akode-plugins-jack/files/patch-akode_plugins-Makefile.in
@@ -0,0 +1,15 @@
+--- akode/plugins/Makefile.in.orig	Tue Nov 29 18:10:20 2005
++++ akode/plugins/Makefile.in	Tue Nov 29 18:10:45 2005
+@@ -252,11 +252,7 @@
+ @include_sun_sink_TRUE@AKODE_SUN_SINK = sun_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_FFMPEG_DECODER) \
+-         $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \
+-         $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \
+-         $(AKODE_SRC_RESAMPLER)
++SUBDIRS = %%SUBDIRS%%
+ 
+ #>- all: all-recursive
+ #>+ 1
diff --git a/audio/akode-plugins-jack/files/patch_akode_plugins_Makefile.in b/audio/akode-plugins-jack/files/patch_akode_plugins_Makefile.in
deleted file mode 100644
index b83c697c3593..000000000000
--- a/audio/akode-plugins-jack/files/patch_akode_plugins_Makefile.in
+++ /dev/null
@@ -1,14 +0,0 @@
---- akode/plugins/Makefile.in.orig	Wed Mar 16 14:00:40 2005
-+++ akode/plugins/Makefile.in	Wed Mar 16 14:02:20 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 = %%SUBDIRS%%
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive