4 files changed, 79 insertions, 21 deletions

diff --git a/audio/xmms-kde/Makefile b/audio/xmms-kde/Makefile
index c5299a4024cb..633148f1d392 100644
--- a/audio/xmms-kde/Makefile
+++ b/audio/xmms-kde/Makefile
@@ -6,30 +6,40 @@
 #
 
 PORTNAME=	xmms-kde
-PORTVERSION=	3.1
-PORTREVISION=	6
+PORTVERSION=	3.2
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Integrates XMMS into the KDE3 Panel
 
-LIB_DEPENDS=	xmms.4:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS=	id3-3.8.3:${PORTSDIR}/audio/id3lib \
+		vorbis.3:${PORTSDIR}/audio/libvorbis \
+		tag.5:${PORTSDIR}/audio/taglib \
+		smpeg.1:${PORTSDIR}/multimedia/smpeg \
+		xmms.4:${PORTSDIR}/multimedia/xmms
 
-USE_KDELIBS_VER=3
-WRKSRC=		${WRKDIR}/${DISTNAME:S/0.0/0/}
+USE_KDELIBS_VER=	3
+USE_GNOME=	gtk12 gnometarget
+USE_SDL=	sdl
 USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS=	--with-xmms-prefix=${LOCALBASE} \
+		--with-smpeg-prefix=${LOCALBASE} \
+		--with-vorbis-prefix=${LOCALBASE} \
+		--with-taglib-prefix=${LOCALBASE} \
+		ac_cv_path_PATH_NOATUN=no \
+		ac_cv_path_PATH_AMAROK=no \
+		ac_cv_path_PATH_MPLAYER=no
 USE_LDCONFIG=	yes
-CONFIGURE_TARGET=
-CONFIGURE_ARGS+=--build=${MACHINE_ARCH}-portbld-freebsd${OSREL} \
-		--with-xmms-prefix=${X11BASE}
-USE_GNOME=	gtk12
+
+CFLAGS+=	-DHAVE_NOATUN -DHAVE_AMAROK -DHAVE_MPLAYER
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 700042
-BROKEN=		Does not compile with GCC 4.2
-.endif
+post-patch:
+	@${REINPLACE_CMD} -e \
+		's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e \
+		'/^INCLUDES/s| -g||g' ${WRKSRC}/xmms-kde/Makefile.in
 
 .include <bsd.port.post.mk>
diff --git a/audio/xmms-kde/distinfo b/audio/xmms-kde/distinfo
index e5a38bd71d20..2cf550a188d9 100644
--- a/audio/xmms-kde/distinfo
+++ b/audio/xmms-kde/distinfo
@@ -1,3 +1,3 @@
-MD5 (xmms-kde-3.1.tar.gz) = b6c2b44b753a565e83e5097e4249226d
-SHA256 (xmms-kde-3.1.tar.gz) = bbb1e7af40d7fe37059098183b5afa3cc720ffe1959a67b9257ca03eed77089f
-SIZE (xmms-kde-3.1.tar.gz) = 1093328
+MD5 (xmms-kde-3.2.tar.gz) = 7d5b69ce64650178d259faaf130fd88e
+SHA256 (xmms-kde-3.2.tar.gz) = 66171f5464e8118d10abe0f3bf5bc3bf84f9803f0aaaa045729dc6c7a26c1d2a
+SIZE (xmms-kde-3.2.tar.gz) = 1340352
diff --git a/audio/xmms-kde/pkg-descr b/audio/xmms-kde/pkg-descr
index 71e35601329b..3efb0c065883 100644
--- a/audio/xmms-kde/pkg-descr
+++ b/audio/xmms-kde/pkg-descr
@@ -1,4 +1,6 @@
-XMMS-KDE is an XMMS panel applet for the KDE3 panel (kicker).
+XMMS-KDE is a MP3-player panelapplet for the KDE panel (kicker).
+it is not only useful for remote controlling xmms, but also noatun
+and it even comes with a builtin MP3 player.
 
 WWW:	http://xmms-kde.sourceforge.net/
 Author:	Flo Niebling <tranqlzer@users.sourceforge.net>
diff --git a/audio/xmms-kde/pkg-plist b/audio/xmms-kde/pkg-plist
index f6e4666496cc..4d629396c6ec 100644
--- a/audio/xmms-kde/pkg-plist
+++ b/audio/xmms-kde/pkg-plist
@@ -2,6 +2,8 @@ lib/kde3/libxmmskde.a
 lib/kde3/libxmmskde.la
 lib/kde3/libxmmskde.so
 share/apps/kicker/applets/xmms-kde.desktop
+share/apps/xmms-kde/a-style.rc
+share/apps/xmms-kde/a-style.tgz
 share/apps/xmms-kde/aluminum25.rc
 share/apps/xmms-kde/aluminum25.tgz
 share/apps/xmms-kde/aluminum42.rc
@@ -10,18 +12,32 @@ share/apps/xmms-kde/aqua42.rc
 share/apps/xmms-kde/aqua42.tgz
 share/apps/xmms-kde/aspirit.rc
 share/apps/xmms-kde/aspirit.tgz
+share/apps/xmms-kde/at.rc
+share/apps/xmms-kde/at.tgz
 share/apps/xmms-kde/beige-stripes.rc
 share/apps/xmms-kde/beige-stripes.tgz
+share/apps/xmms-kde/bluecurve52.rc
+share/apps/xmms-kde/bluecurve52.tgz
+share/apps/xmms-kde/bluecurvee.rc
+share/apps/xmms-kde/bluecurvee.tgz
 share/apps/xmms-kde/blueish.rc
 share/apps/xmms-kde/blueish.tgz
 share/apps/xmms-kde/coldsteel.rc
 share/apps/xmms-kde/coldsteel.tgz
 share/apps/xmms-kde/convert.rc
 share/apps/xmms-kde/convert.tgz
+share/apps/xmms-kde/dot.rc
+share/apps/xmms-kde/dot.tgz
 share/apps/xmms-kde/eazel.rc
 share/apps/xmms-kde/eazel.tgz
 share/apps/xmms-kde/flat.rc
 share/apps/xmms-kde/flat.tgz
+share/apps/xmms-kde/flatFlo.rc
+share/apps/xmms-kde/flatFlo.tgz
+share/apps/xmms-kde/flatter.rc
+share/apps/xmms-kde/flatter.tgz
+share/apps/xmms-kde/fruit.rc
+share/apps/xmms-kde/fruit.tgz
 share/apps/xmms-kde/grayish.rc
 share/apps/xmms-kde/grayish.tgz
 share/apps/xmms-kde/horizontal25.rc
@@ -37,12 +53,22 @@ share/apps/xmms-kde/jezza.rc
 share/apps/xmms-kde/jezza.tgz
 share/apps/xmms-kde/kde42.rc
 share/apps/xmms-kde/kde42.tgz
+share/apps/xmms-kde/keramik42.rc
+share/apps/xmms-kde/keramik42.tgz
 share/apps/xmms-kde/liquid.rc
 share/apps/xmms-kde/liquid.tgz
 share/apps/xmms-kde/liquid42.rc
 share/apps/xmms-kde/liquid42.tgz
+share/apps/xmms-kde/mini-xmms-grey.rc
+share/apps/xmms-kde/mini-xmms-grey.tgz
+share/apps/xmms-kde/mini-xmms-white.rc
+share/apps/xmms-kde/mini-xmms-white.tgz
 share/apps/xmms-kde/mini-xmms.rc
 share/apps/xmms-kde/mini-xmms.tgz
+share/apps/xmms-kde/minimalblue.rc
+share/apps/xmms-kde/minimalblue.tgz
+share/apps/xmms-kde/minimalgreen.rc
+share/apps/xmms-kde/minimalgreen.tgz
 share/apps/xmms-kde/murphy1.rc
 share/apps/xmms-kde/murphy1.tgz
 share/apps/xmms-kde/murphy2.rc
@@ -55,11 +81,19 @@ share/apps/xmms-kde/murphys2.rc
 share/apps/xmms-kde/murphys2.tgz
 share/apps/xmms-kde/murphys3.rc
 share/apps/xmms-kde/murphys3.tgz
+share/apps/xmms-kde/murphys4.rc
+share/apps/xmms-kde/murphys4.tgz
 share/apps/xmms-kde/no-ones-laughing.rc
 share/apps/xmms-kde/no-ones-laughing.tgz
 share/apps/xmms-kde/noscreen.tgz
+share/apps/xmms-kde/plastikcrystal.rc
+share/apps/xmms-kde/plastikcrystal.tgz
 share/apps/xmms-kde/point_reyes_green.rc
 share/apps/xmms-kde/point_reyes_green.tgz
+share/apps/xmms-kde/silver_bullet1.rc
+share/apps/xmms-kde/silver_bullet1.tgz
+share/apps/xmms-kde/small-trans.rc
+share/apps/xmms-kde/small-trans.tgz
 share/apps/xmms-kde/small.rc
 share/apps/xmms-kde/small.tgz
 share/apps/xmms-kde/small_gray.rc
@@ -74,10 +108,20 @@ share/apps/xmms-kde/tiny3.rc
 share/apps/xmms-kde/tiny3.tgz
 share/apps/xmms-kde/tinyblueish.rc
 share/apps/xmms-kde/tinyblueish.tgz
+share/apps/xmms-kde/transparent63x46.rc
+share/apps/xmms-kde/transparent63x46.tgz
 share/apps/xmms-kde/vertical26.rc
 share/apps/xmms-kde/vertical26.tgz
 share/apps/xmms-kde/verticalblue.rc
 share/apps/xmms-kde/verticalblue.tgz
+share/apps/xmms-kde/very_small.rc
+share/apps/xmms-kde/very_small.tgz
+share/apps/xmms-kde/very_small_gray.rc
+share/apps/xmms-kde/very_small_gray.tgz
+share/apps/xmms-kde/very_very_small.rc
+share/apps/xmms-kde/very_very_small.tgz
+share/apps/xmms-kde/very_very_small_gray.rc
+share/apps/xmms-kde/very_very_small_gray.tgz
 share/apps/xmms-kde/water42.rc
 share/apps/xmms-kde/water42.tgz
 share/apps/xmms-kde/white.rc
@@ -86,16 +130,18 @@ share/apps/xmms-kde/wm60x26.rc
 share/apps/xmms-kde/wm60x26.tgz
 share/apps/xmms-kde/wm63x42.rc
 share/apps/xmms-kde/wm63x42.tgz
+share/apps/xmms-kde/x.rc
+share/apps/xmms-kde/x.tgz
 share/apps/xmms-kde/xmms-kderc
+share/doc/HTML/en/xmms-kde/common
 share/doc/HTML/en/xmms-kde/index.cache.bz2
 share/doc/HTML/en/xmms-kde/index.docbook
 share/doc/HTML/en/xmms-kde/themes.txt
-share/doc/HTML/en/xmms-kde/common
-@dirrm share/doc/HTML/en/xmms-kde
 share/locale/de/LC_MESSAGES/xmms-kde.mo
 share/locale/es/LC_MESSAGES/xmms-kde.mo
 share/locale/fr/LC_MESSAGES/xmms-kde.mo
 share/locale/nl/LC_MESSAGES/xmms-kde.mo
-@dirrm share/apps/xmms-kde
+@dirrm share/doc/HTML/en/xmms-kde
 @dirrmtry share/doc/HTML/en
 @dirrmtry share/doc/HTML
+@dirrm share/apps/xmms-kde