7 files changed, 105 insertions, 85 deletions

diff --git a/audio/amarok-kde4/Makefile b/audio/amarok-kde4/Makefile
index 50de245ea76e..fefd129eed7a 100644
--- a/audio/amarok-kde4/Makefile
+++ b/audio/amarok-kde4/Makefile
@@ -5,26 +5,15 @@
 # $FreeBSD$
 
 PORTNAME=	amarok
-PORTVERSION=	0.9
-PORTREVISION=	2
+PORTVERSION=	1.0
 CATEGORIES=	audio kde
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE_EXTENDED}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	markus@FreeBSD.org
 COMMENT=	Media player for KDE
 
-LIB_DEPENDS=	artsgui:${PORTSDIR}/multimedia/kdemultimedia3
-
-.if defined(WITH_GSTREAMER)
-LIB_DEPENDS+=	gstplay-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
-.else
-CONFIGURE_ARGS=	--without-gstreamer
-.endif
-
-.if defined(WITHOUT_OPENGL)
-CONFIGURE_ARGS+=--without-opengl
-.endif
+LIB_DEPENDS=    tag:${PORTSDIR}/audio/taglib
 
 USE_BZIP2=	yes
 USE_KDELIBS_VER=3
@@ -32,17 +21,47 @@ USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 
-pre-everything::
-.if !defined(WITH_GSTREAMER)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITH_GSTREAMER to enable experimental GStreamer support'
+OPTIONS=	ARTS "aRts support" on \
+		GSTREAMER "GStreamer support" off \
+		XMMS "XMMS visualizations" on \
+		OPENGL "OpenGL support" on \
+
+.include <bsd.port.pre.mk>
+
+.if defined(WITHOUT_ARTS)
+CONFIGURE_ARGS+=--without-arts
+PLIST_SUB+=	ARTS="@comment "
+.else
+LIB_DEPENDS+=	artsgui:${PORTSDIR}/multimedia/kdemultimedia3
+PLIST_SUB+=	ARTS=""
 .endif
-.if !defined(WITHOUT_OPENGL)
-	@${ECHO_MSG} '===>'
-	@${ECHO_MSG} '===> Define WITHOUT_OPENGL to disable OpenGL support'
+
+.if defined(WITHOUT_GSTREAMER)
+CONFIGURE_ARGS+=--without-gstreamer
+PLIST_SUB+=	GSTREAMER="@comment "
+.else
+LIB_DEPENDS+=	gstplay-0.8.1:${PORTSDIR}/multimedia/gstreamer-plugins
+PLIST_SUB+=	GSTREAMER=""
+.endif
+
+.if defined(WITHOUT_XMMS)
+PLIST_SUB+=	XMMS="@comment "
+.else
+BUILD_DEPENDS+=	xmms-config:${PORTSDIR}/multimedia/xmms
+LIB_DEPENDS+=	xmms.4:${PORTSDIR}/multimedia/xmms
+PLIST_SUB+=	XMMS=""
+.endif
+
+.if defined(WITHOUT_OPENGL)
+CONFIGURE_ARGS+=--without-opengl
 .endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-O2||g'	${WRKSRC}/${CONFIGURE_SCRIPT}
 
-.include <bsd.port.mk>
+post-configure:
+.if defined(WITHOUT_XMMS)
+	@${REINPLACE_CMD} -e '/XMMS /d' ${WRKSRC}/config.h
+.endif
+
+.include <bsd.port.post.mk>
diff --git a/audio/amarok-kde4/distinfo b/audio/amarok-kde4/distinfo
index 18d57e5ff99e..d8de8fc59c94 100644
--- a/audio/amarok-kde4/distinfo
+++ b/audio/amarok-kde4/distinfo
@@ -1,2 +1,2 @@
-MD5 (amarok-0.9.tar.bz2) = e1c2726330df56b8cf9e1ee58d50d975
-SIZE (amarok-0.9.tar.bz2) = 780381
+MD5 (amarok-1.0.tar.bz2) = c52d89bde4c51b17ca7cce767b4515f3
+SIZE (amarok-1.0.tar.bz2) = 1838323
diff --git a/audio/amarok-kde4/files/patch-loader.cpp b/audio/amarok-kde4/files/patch-loader.cpp
deleted file mode 100644
index de86b33651aa..000000000000
--- a/audio/amarok-kde4/files/patch-loader.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- amarok/amarok/loader/loader.cpp.orig	Fri Mar  5 22:15:11 2004
-+++ amarok/amarok/loader/loader.cpp	Tue Mar 16 21:48:30 2004
-@@ -156,10 +156,11 @@
-     path += "/.kde/share/apps/amarok/.loader_socket";
-     ::strcpy( &local.sun_path[0], path );
- 
--    int len = ::strlen( local.sun_path ) + sizeof( local.sun_family );
-+    int len = sizeof( local );
- 
-     if ( ::connect( fd, (struct sockaddr*) &local, len ) == -1 ) {
- //         qDebug( "[Loader::tryConnect()] connect() failed" );
-+        ::close ( fd );
-         return -1;
-     }
- 
diff --git a/audio/amarok-kde4/files/patch-playerapp.cpp b/audio/amarok-kde4/files/patch-playerapp.cpp
deleted file mode 100644
index 09bbb3135cc7..000000000000
--- a/audio/amarok-kde4/files/patch-playerapp.cpp
+++ /dev/null
@@ -1,22 +0,0 @@
---- amarok/amarok/playerapp.cpp.orig	Fri Mar  5 22:15:10 2004
-+++ amarok/amarok/playerapp.cpp	Tue Mar 16 21:51:00 2004
-@@ -298,14 +298,18 @@
-     ::strcpy( &local.sun_path[0], path );
-     ::unlink( path );
- 
--    int len = ::strlen( local.sun_path ) + sizeof( local.sun_family );
-+    int len = sizeof( local );
- 
-     if ( ::bind( m_sockfd, (struct sockaddr*) &local, len ) == -1 ) {
-         kdWarning() << k_funcinfo << " bind() error\n";
-+        ::close ( m_sockfd );
-+        m_sockfd = -1;
-         return;
-     }
-     if ( ::listen( m_sockfd, 1 ) == -1 ) {
-         kdWarning() << k_funcinfo << " listen() error\n";
-+	::close ( m_sockfd );
-+        m_sockfd = -1;
-         return;
-     }
- 
diff --git a/audio/amarok-kde4/files/patch-playlistloader.h b/audio/amarok-kde4/files/patch-playlistloader.h
deleted file mode 100644
index 83e21dda4f0d..000000000000
--- a/audio/amarok-kde4/files/patch-playlistloader.h
+++ /dev/null
@@ -1,12 +0,0 @@
---- amarok/amarok/playlistloader.h.orig	Fri Mar  5 22:15:11 2004
-+++ amarok/amarok/playlistloader.h	Mon Mar  8 15:36:51 2004
-@@ -120,6 +120,9 @@
-     private:
-        PlaylistLoader *m_thread;
-     };
-+
-+    friend class MakeItemEvent;
-+    friend class DownloadPlaylistEvent;
- };
- 
- #endif
diff --git a/audio/amarok-kde4/files/patch-playlistwindow.cpp b/audio/amarok-kde4/files/patch-playlistwindow.cpp
new file mode 100644
index 000000000000..3edf945356ed
--- /dev/null
+++ b/audio/amarok-kde4/files/patch-playlistwindow.cpp
@@ -0,0 +1,15 @@
+--- amarok/src/playlistwindow.cpp.orig	Thu Jun 17 15:12:24 2004
++++ amarok/src/playlistwindow.cpp	Thu Jun 17 15:13:34 2004
+@@ -465,8 +465,11 @@
+     const KWin::WindowInfo info = KWin::windowInfo( winId() );
+     const uint desktop = KWin::currentDesktop();
+     const bool isOnThisDesktop = info.isOnDesktop( desktop );
++#if KDE_IS_VERSION(3,2,1)
+     const bool isShaded = info.hasState( NET::Shaded );
+-
++#else
++    const bool isShaded = false;
++#endif
+ 
+     if( isShaded )
+     {
diff --git a/audio/amarok-kde4/pkg-plist b/audio/amarok-kde4/pkg-plist
index a150f485de09..021875df749f 100644
--- a/audio/amarok-kde4/pkg-plist
+++ b/audio/amarok-kde4/pkg-plist
@@ -1,13 +1,20 @@
 bin/amarok
+%%XMMS%%bin/amarok_xmmswrapper
 bin/amarokapp
-lib/libamarokarts.la
-lib/libamarokarts.so
-lib/mcop/Amarok/RawScope.mcopclass
-lib/mcop/Amarok/Synth_STEREO_XFADE.mcopclass
-lib/mcop/amarokarts.mcopclass
-lib/mcop/amarokarts.mcoptype
+%%ARTS%%lib/kde3/libamarok_artsengine_plugin.la
+%%ARTS%%lib/kde3/libamarok_artsengine_plugin.so
+%%GSTREAMER%%lib/kde3/libamarok_gstengine_plugin.la
+%%GSTREAMER%%lib/kde3/libamarok_gstengine_plugin.so
+%%ARTS%%lib/libamarokarts.la
+%%ARTS%%lib/libamarokarts.so
+%%ARTS%%lib/mcop/Amarok/RawScope.mcopclass
+%%ARTS%%lib/mcop/Amarok/Synth_STEREO_XFADE.mcopclass
+%%ARTS%%lib/mcop/amarokarts.mcopclass
+%%ARTS%%lib/mcop/amarokarts.mcoptype
 share/applications/kde/amarok.desktop
 share/apps/amarok/amarokui.rc
+share/apps/amarok/amarokui_first.rc
+share/apps/amarok/amarokui_xmms.rc
 share/apps/amarok/data/ball.png
 share/apps/amarok/data/dot.png
 share/apps/amarok/data/grid.png
@@ -16,40 +23,68 @@ share/apps/amarok/data/startupTip.txt
 share/apps/amarok/data/wirl1.png
 share/apps/amarok/data/wirl2.png
 share/apps/amarok/images/b_next.png
-share/apps/amarok/images/b_next_down.png
 share/apps/amarok/images/b_pause.png
-share/apps/amarok/images/b_pause_down.png
 share/apps/amarok/images/b_play.png
-share/apps/amarok/images/b_play_down.png
 share/apps/amarok/images/b_prev.png
-share/apps/amarok/images/b_prev_down.png
 share/apps/amarok/images/b_stop.png
-share/apps/amarok/images/b_stop_down.png
 share/apps/amarok/images/bucky.png
 share/apps/amarok/images/description.png
-share/apps/amarok/images/ensure_visible.png
 share/apps/amarok/images/eq_active2.png
 share/apps/amarok/images/eq_inactive2.png
 share/apps/amarok/images/logo_splash.png
 share/apps/amarok/images/logo_web.png
 share/apps/amarok/images/pl_active2.png
 share/apps/amarok/images/pl_inactive2.png
+share/apps/amarok/images/sound.png
 share/apps/amarok/images/time_minus.png
 share/apps/amarok/images/time_plus.png
 share/apps/amarok/images/vol_speaker.png
 share/config.kcfg/amarok.kcfg
 share/config/amarokrc
+share/doc/HTML/en/amarok/buttons.png
+share/doc/HTML/en/amarok/collection.png
 share/doc/HTML/en/amarok/common
+share/doc/HTML/en/amarok/config_colors.png
+share/doc/HTML/en/amarok/config_fonts.png
+share/doc/HTML/en/amarok/config_general.png
+share/doc/HTML/en/amarok/config_osd.png
+share/doc/HTML/en/amarok/config_playback.png
+share/doc/HTML/en/amarok/context.png
+share/doc/HTML/en/amarok/file_browser.png
 share/doc/HTML/en/amarok/index.cache.bz2
 share/doc/HTML/en/amarok/index.docbook
 share/doc/HTML/en/amarok/logo.png
+share/doc/HTML/en/amarok/pl_tip1.png
+share/doc/HTML/en/amarok/play_list.png
 share/doc/HTML/en/amarok/player_window.png
 share/doc/HTML/en/amarok/playlist_window.png
+share/doc/HTML/en/amarok/search.png
+share/doc/HTML/en/amarok/status_bar.png
+share/doc/HTML/en/amarok/streams.png
+share/doc/HTML/en/amarok/vis_window.png
+share/doc/HTML/en/amarok/welcome.png
 share/icons/crystalsvg/16x16/apps/amarok.png
 share/icons/crystalsvg/22x22/apps/amarok.png
 share/icons/crystalsvg/32x32/apps/amarok.png
 share/icons/crystalsvg/48x48/apps/amarok.png
 share/icons/crystalsvg/64x64/apps/amarok.png
+share/locale/da/LC_MESSAGES/amarok-1.0.mo
+share/locale/en_GB/LC_MESSAGES/amarok-1.0.mo
+share/locale/es/LC_MESSAGES/amarok-1.0.mo
+share/locale/et/LC_MESSAGES/amarok-1.0.mo
+share/locale/fr/LC_MESSAGES/amarok-1.0.mo
+share/locale/hu/LC_MESSAGES/amarok-1.0.mo
+share/locale/pt/LC_MESSAGES/amarok-1.0.mo
+share/locale/pt_BR/LC_MESSAGES/amarok-1.0.mo
+share/locale/ru/LC_MESSAGES/amarok-1.0.mo
+share/locale/sr/LC_MESSAGES/amarok-1.0.mo
+share/locale/sv/LC_MESSAGES/amarok-1.0.mo
+share/locale/tr/LC_MESSAGES/amarok-1.0.mo
+%%ARTS%%share/services/amarok_artsengine_plugin.desktop
+%%GSTREAMER%%share/services/amarok_gstengine_plugin.desktop
+share/servicetypes/amarok_plugin.desktop
+@unexec rmdir %D/share/servicetypes 2>/dev/null || true
+@unexec rmdir %D/share/services 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64/apps 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/64x64 2>/dev/null || true
 @unexec rmdir %D/share/icons/crystalsvg/48x48/apps 2>/dev/null || true