10 files changed, 24 insertions, 36 deletions

diff --git a/audio/akode-plugins-jack/Makefile b/audio/akode-plugins-jack/Makefile
index a04d468c2b14..e1e819eaf59c 100644
--- a/audio/akode-plugins-jack/Makefile
+++ b/audio/akode-plugins-jack/Makefile
@@ -37,7 +37,7 @@ CONFIGURE_ARGS+=--with-extra-libs=${LOCALBASE}/lib \
 
 .include <bsd.port.pre.mk>
 
-.if (${OSVERSION} < 502102 )
+.if (${OSVERSION} > 500000 ) && (${OSVERSION} < 502102 )
 IGNORE= Jack not available
 .endif
 
diff --git a/audio/akode-plugins-xiph/Makefile b/audio/akode-plugins-xiph/Makefile
index b08971b8c616..b64c20ff414c 100644
--- a/audio/akode-plugins-xiph/Makefile
+++ b/audio/akode-plugins-xiph/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=   akode-plugins-${PORTNAMESUFX}
 PORTVERSION=    2.0.1
-PORTREVISION=	2
+PORTREVISION=	1
 PORTEPOCH=  1
 CATEGORIES= audio kde
 MASTER_SITES=   ${MASTER_SITE_GENTOO}
diff --git a/audio/arts/Makefile b/audio/arts/Makefile
index a8381222e7bb..c7a0bd956cf3 100644
--- a/audio/arts/Makefile
+++ b/audio/arts/Makefile
@@ -7,8 +7,8 @@
 #
 
 PORTNAME=	arts
-PORTVERSION=	1.5.7
-PORTREVISION=	1
+PORTVERSION=	1.5.8
+PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
diff --git a/audio/arts/distinfo b/audio/arts/distinfo
index 34cdaf07a8fd..c1f310e5e3c2 100644
--- a/audio/arts/distinfo
+++ b/audio/arts/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/arts-1.5.7.tar.bz2) = 28ac10541e5d8daf9009f6af1f7857af
-SHA256 (KDE/arts-1.5.7.tar.bz2) = 2a88114d0b41249284e5e33c61a2f168571c04a9fc92de82a0c63d04a8206c54
-SIZE (KDE/arts-1.5.7.tar.bz2) = 980842
+MD5 (KDE/arts-1.5.8.tar.bz2) = 061ce49351d970a81f4c0a1b0339fb34
+SHA256 (KDE/arts-1.5.8.tar.bz2) = ec2f4541740bb7b4bfa4a0ae1d9d1e2b0f6fcb31953b317497129dfc122c4f96
+SIZE (KDE/arts-1.5.8.tar.bz2) = 970899
diff --git a/audio/arts/files/patch-soundserver-Makefile.in b/audio/arts/files/patch-soundserver-Makefile.in
index f61dd7124b3b..e91c9d77efd7 100644
--- a/audio/arts/files/patch-soundserver-Makefile.in
+++ b/audio/arts/files/patch-soundserver-Makefile.in
@@ -1,6 +1,6 @@
---- soundserver/Makefile.in.orig	Sun Nov 20 20:55:24 2005
-+++ soundserver/Makefile.in	Wed Nov 30 01:33:05 2005
-@@ -44,7 +44,7 @@
+--- soundserver/Makefile.in.orig	2007-10-08 16:17:56.000000000 +0200
++++ soundserver/Makefile.in	2007-10-21 12:12:11.000000000 +0200
+@@ -40,7 +40,7 @@
  host_triplet = @host@
  target_triplet = @target@
  bin_PROGRAMS = artsd$(EXEEXT) artsplay$(EXEEXT) artscat$(EXEEXT) \
@@ -9,7 +9,7 @@
  subdir = soundserver
  DIST_COMMON = $(artsinclude_HEADERS) $(srcdir)/Makefile.am \
  	$(srcdir)/Makefile.in $(srcdir)/artsversion-new.h.in
-@@ -190,12 +190,12 @@
+@@ -265,12 +265,12 @@
  	$(libartswavplayobject_la_SOURCES) $(libkmedia2_la_SOURCES) \
  	$(libkmedia2_idl_la_SOURCES) $(libsoundserver_idl_la_SOURCES) \
  	$(artscat_SOURCES) $(artsd_SOURCES) $(artsplay_SOURCES) \
@@ -24,7 +24,7 @@
  mcopclassDATA_INSTALL = $(INSTALL_DATA)
  mcoptypeDATA_INSTALL = $(INSTALL_DATA)
  DATA = $(mcopclass_DATA) $(mcoptype_DATA)
-@@ -540,11 +540,6 @@
+@@ -573,11 +573,6 @@
  artsplay_LDFLAGS = $(USE_THREADS)
  artsplay_SOURCES = artsplay.cc
  artsplay_COMPILE_FIRST = soundserver.h artsversion.h
@@ -36,7 +36,7 @@
  artsshell_LDADD = libsoundserver_idl.la $(LIBPTHREAD)
  artsshell_LDFLAGS = $(USE_THREADS)
  artsshell_SOURCES = artsshell.cc tradercheck.cc
-@@ -556,10 +551,6 @@
+@@ -589,10 +584,6 @@
  mcopclassdir = $(libdir)/mcop/Arts
  mcopclass_DATA = FileInputStream.mcopclass $(WAV_MCOPCLASS) GSLPlayObject.mcopclass
  
@@ -47,13 +47,13 @@
  ######## install idl typeinfo files
  mcoptypedir = $(libdir)/mcop
  mcoptype_DATA = soundserver.mcoptype soundserver.mcopclass \
-@@ -710,9 +701,6 @@
+@@ -728,9 +719,6 @@
  artsshell$(EXEEXT): $(artsshell_OBJECTS) $(artsshell_DEPENDENCIES) 
  	@rm -f artsshell$(EXEEXT)
- 	$(CXXLINK) $(artsshell_LDFLAGS) $(artsshell_OBJECTS) $(artsshell_LDADD) $(LIBS)
+ 	$(artsshell_LINK) $(artsshell_OBJECTS) $(artsshell_LDADD) $(LIBS)
 -artswrapper$(EXEEXT): $(artswrapper_OBJECTS) $(artswrapper_DEPENDENCIES) 
 -	@rm -f artswrapper$(EXEEXT)
--	$(LINK) $(artswrapper_LDFLAGS) $(artswrapper_OBJECTS) $(artswrapper_LDADD) $(LIBS)
+-	$(artswrapper_LINK) $(artswrapper_OBJECTS) $(artswrapper_LDADD) $(LIBS)
  
  mostlyclean-compile:
  	-rm -f *.$(OBJEXT)
diff --git a/audio/juk/distinfo b/audio/juk/distinfo
index e5a3658d052d..205a5351d44e 100644
--- a/audio/juk/distinfo
+++ b/audio/juk/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.7.tar.bz2) = 3d18574ca14258fb565160aa84bf217c
-SHA256 (KDE/kdemultimedia-3.5.7.tar.bz2) = 7fda798eed8ad5c2b3a2f729f9790aba24ff23f5e40c0fc4aca77c40d5d6f6a5
-SIZE (KDE/kdemultimedia-3.5.7.tar.bz2) = 6347766
+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
diff --git a/audio/juk/pkg-plist b/audio/juk/pkg-plist
index 79510c0e3448..3c620acf13ad 100644
--- a/audio/juk/pkg-plist
+++ b/audio/juk/pkg-plist
@@ -4,6 +4,7 @@ share/apps/juk/jukui-rtl.rc
 share/apps/juk/jukui.rc
 share/apps/juk/pics/playing.png
 share/apps/juk/pics/splash.png
+share/apps/juk/pics/yahoo_credit.png
 share/apps/konqueror/servicemenus/jukservicemenu.desktop
 share/icons/crystalsvg/22x22/actions/juk_dock.png
 share/icons/hicolor/128x128/apps/juk.png
diff --git a/audio/mpeglib_artsplug/Makefile b/audio/mpeglib_artsplug/Makefile
index 90d81f73923c..6c411584fa3b 100644
--- a/audio/mpeglib_artsplug/Makefile
+++ b/audio/mpeglib_artsplug/Makefile
@@ -7,7 +7,6 @@
 
 PORTNAME=	mpeglib_artsplug
 PORTVERSION=	${KDE_VERSION}
-PORTREVISION=	1
 CATEGORIES=	audio kde
 MASTER_SITES=	${MASTER_SITE_KDE}
 MASTER_SITE_SUBDIR=	stable/${PORTVERSION:S/.0//}/src
@@ -19,7 +18,7 @@ MAINTAINER=	kde@FreeBSD.org
 COMMENT=	Legacy KDE audio backend
 
 LIB_DEPENDS=	ogg:${PORTSDIR}/audio/libogg \
-		vorbis.4:${PORTSDIR}/audio/libvorbis
+		vorbis:${PORTSDIR}/audio/libvorbis
 
 CONFLICTS=	kdemultimedia-3.1.* kdemultimedia-3.2.[0-3]
 
diff --git a/audio/mpeglib_artsplug/distinfo b/audio/mpeglib_artsplug/distinfo
index e5a3658d052d..205a5351d44e 100644
--- a/audio/mpeglib_artsplug/distinfo
+++ b/audio/mpeglib_artsplug/distinfo
@@ -1,3 +1,3 @@
-MD5 (KDE/kdemultimedia-3.5.7.tar.bz2) = 3d18574ca14258fb565160aa84bf217c
-SHA256 (KDE/kdemultimedia-3.5.7.tar.bz2) = 7fda798eed8ad5c2b3a2f729f9790aba24ff23f5e40c0fc4aca77c40d5d6f6a5
-SIZE (KDE/kdemultimedia-3.5.7.tar.bz2) = 6347766
+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
diff --git a/audio/mpeglib_artsplug/files/patch-mpeglib_lib_util_render_dither2YUV_rgb2yuvdefs.h b/audio/mpeglib_artsplug/files/patch-mpeglib_lib_util_render_dither2YUV_rgb2yuvdefs.h
deleted file mode 100644
index 3f7b25f2b643..000000000000
--- a/audio/mpeglib_artsplug/files/patch-mpeglib_lib_util_render_dither2YUV_rgb2yuvdefs.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h.orig	Tue Sep  2 07:04:27 2003
-+++ mpeglib/lib/util/render/dither2YUV/rgb2yuvdefs.h	Wed Aug  4 12:48:40 2004
-@@ -20,6 +20,9 @@
- 
- /* gcc 3.3.1 and later optimise the "not used" (only in asm code)
-    symbols away. So we need to mark them as used. */
-+#if defined(__GNUC_PREREQ__) && !defined(__GNUC_PREREQ)
-+#define __GNUC_PREREQ __GNUC_PREREQ__
-+#endif
- #ifdef __GNUC_PREREQ
- #if __GNUC_PREREQ (3,1)
- # define __attribute_used__ __attribute__ ((__used__))
\ No newline at end of file