From 195aacee0c6f4490218a25feb24fc422fd59c872 Mon Sep 17 00:00:00 2001 From: espie Date: Mon, 18 Dec 2006 16:05:23 +0000 Subject: [PATCH] update to 1.4.4, builds and runs... --- audio/amarok/Makefile | 10 +++++---- audio/amarok/distinfo | 8 +++---- audio/amarok/patches/patch-configure_in | 8 +++---- audio/amarok/pkg/PLIST | 29 +++++++++++++++++++++---- 4 files changed, 39 insertions(+), 16 deletions(-) diff --git a/audio/amarok/Makefile b/audio/amarok/Makefile index f1b4f5192e4..747ade803b3 100644 --- a/audio/amarok/Makefile +++ b/audio/amarok/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.13 2006/12/18 09:51:29 robert Exp $ +# $OpenBSD: Makefile,v 1.14 2006/12/18 16:05:23 espie Exp $ CATEGORIES= audio x11 x11/kde COMMENT= 'music player for kde' HOMEPAGE= http://amarok.kde.org/ -V= 1.4.3 +V= 1.4.4 MASTER_SITES= ${MASTER_SITE_KDE:=stable/amarok/$V/src/} DISTNAME= amarok-$V PKGNAME= ${DISTNAME} @@ -16,12 +16,14 @@ LIB_DEPENDS+= lib/qt3/qt-mt.>=3.33::x11/qt3,mt \ kdecore.>=6,DCOP,khtml,kwalletclient,kdefx,kdeprint,kutils,kdeui,kparts,kio,kdesu,kjs,knewstuff,kdnssd::x11/kde/libs3 \ tag.>=5.0:taglib->=1.4:audio/taglib \ xine::multimedia/xine-lib \ - sqlite3::databases/sqlite3 + sqlite3::databases/sqlite3 \ + gpod::audio/libgpod WANTLIB= stdc++ Xext Xrender z X11 util m SM c \ pthread ICE idn freetype \ iconv pcre pcreposix \ - jpeg png art_lgpl_2 intl + jpeg png art_lgpl_2 intl \ + gdk_pixbuf-2.0 glib-2.0 gmodule-2.0 gobject-2.0 LIB_DEPENDS+= konqsidebarplugin::x11/kde/base3 diff --git a/audio/amarok/distinfo b/audio/amarok/distinfo index 2d4426bf103..9be41df982b 100644 --- a/audio/amarok/distinfo +++ b/audio/amarok/distinfo @@ -1,4 +1,4 @@ -MD5 (amarok-1.4.3.tar.bz2) = b0b4f8952ad23705c70815d50fd0af52 -RMD160 (amarok-1.4.3.tar.bz2) = 287d6652868f50023d8602941fdc99aed5296d22 -SHA1 (amarok-1.4.3.tar.bz2) = 624b5f9fd74ead1c0e75f7d8f935abcaf0313e70 -SIZE (amarok-1.4.3.tar.bz2) = 17175603 +MD5 (amarok-1.4.4.tar.bz2) = 56a9aec42088c338b81252f8e0651781 +RMD160 (amarok-1.4.4.tar.bz2) = 61cd2748ce0111f4ba388a71e9504abb7362b0d7 +SHA1 (amarok-1.4.4.tar.bz2) = 932ab971407172a86746e473a1d1cf6871aea93c +SIZE (amarok-1.4.4.tar.bz2) = 17635707 diff --git a/audio/amarok/patches/patch-configure_in b/audio/amarok/patches/patch-configure_in index ac963f41c9e..23a1721cf80 100644 --- a/audio/amarok/patches/patch-configure_in +++ b/audio/amarok/patches/patch-configure_in @@ -1,7 +1,7 @@ -$OpenBSD: patch-configure_in,v 1.1 2006/06/11 11:33:52 espie Exp $ ---- configure.in.orig Sat Jun 10 11:53:04 2006 -+++ configure.in Sat Jun 10 11:54:55 2006 -@@ -819,7 +819,7 @@ AC_MSG_RESULT($amarok_glibcsched_works) +$OpenBSD: patch-configure_in,v 1.2 2006/12/18 16:05:23 espie Exp $ +--- configure.in.orig Thu Oct 26 22:40:21 2006 ++++ configure.in Mon Nov 6 12:13:13 2006 +@@ -850,7 +850,7 @@ AC_MSG_RESULT($amarok_glibcsched_works) ############################################################################### KDE_CHECK_HEADER(konqsidebarplugin.h, have_konqsidebar=yes, have_konqsidebar=no) diff --git a/audio/amarok/pkg/PLIST b/audio/amarok/pkg/PLIST index 38adc76810e..8564e04d94b 100644 --- a/audio/amarok/pkg/PLIST +++ b/audio/amarok/pkg/PLIST @@ -1,4 +1,4 @@ -@comment $OpenBSD: PLIST,v 1.5 2006/09/18 09:03:30 espie Exp $ +@comment $OpenBSD: PLIST,v 1.6 2006/12/18 16:05:23 espie Exp $ bin/amarok bin/amarok_daapserver.rb bin/amarok_proxy.rb @@ -10,6 +10,8 @@ ${KDE}/libamarok_daap-mediadevice.la ${KDE}/libamarok_daap-mediadevice.so ${KDE}/libamarok_generic-mediadevice.la ${KDE}/libamarok_generic-mediadevice.so +${KDE}/libamarok_ipod-mediadevice.la +${KDE}/libamarok_ipod-mediadevice.so ${KDE}/libamarok_massstorage-device.la ${KDE}/libamarok_massstorage-device.so ${KDE}/libamarok_nfs-device.la @@ -22,6 +24,10 @@ ${KDE}/libamarok_xine-engine.la ${KDE}/libamarok_xine-engine.so lib/libamarok.la @lib lib/libamarok.so.${LIBamarok_VERSION} +lib/ruby_lib/ +lib/ruby_lib/http11.rb +lib/ruby_lib/libhttp11.la +@lib lib/ruby_lib/libhttp11.so.${LIBhttp11_VERSION} share/applications/kde/amarok.desktop share/apps/amarok/ share/apps/amarok/amarokui.rc @@ -33,6 +39,8 @@ share/apps/amarok/data/dot.png share/apps/amarok/data/equalizer_presets.xml share/apps/amarok/data/firstrun.m3u share/apps/amarok/data/grid.png +share/apps/amarok/data/magnatune_logo.png +share/apps/amarok/data/magnatune_start_page.html share/apps/amarok/data/wirl1.png share/apps/amarok/data/wirl2.png share/apps/amarok/icons/ @@ -97,6 +105,7 @@ share/apps/amarok/icons/hicolor/16x16/actions/amarok_files2.png share/apps/amarok/icons/hicolor/16x16/actions/amarok_info.png share/apps/amarok/icons/hicolor/16x16/actions/amarok_love.png share/apps/amarok/icons/hicolor/16x16/actions/amarok_lyrics.png +share/apps/amarok/icons/hicolor/16x16/actions/amarok_magnatune.png share/apps/amarok/icons/hicolor/16x16/actions/amarok_mostplayed.png share/apps/amarok/icons/hicolor/16x16/actions/amarok_music.png share/apps/amarok/icons/hicolor/16x16/actions/amarok_next.png @@ -165,6 +174,7 @@ share/apps/amarok/icons/hicolor/22x22/actions/amarok_files2.png share/apps/amarok/icons/hicolor/22x22/actions/amarok_info.png share/apps/amarok/icons/hicolor/22x22/actions/amarok_love.png share/apps/amarok/icons/hicolor/22x22/actions/amarok_lyrics.png +share/apps/amarok/icons/hicolor/22x22/actions/amarok_magnatune.png share/apps/amarok/icons/hicolor/22x22/actions/amarok_mostplayed.png share/apps/amarok/icons/hicolor/22x22/actions/amarok_music.png share/apps/amarok/icons/hicolor/22x22/actions/amarok_next.png @@ -233,6 +243,7 @@ share/apps/amarok/icons/hicolor/32x32/actions/amarok_files2.png share/apps/amarok/icons/hicolor/32x32/actions/amarok_info.png share/apps/amarok/icons/hicolor/32x32/actions/amarok_love.png share/apps/amarok/icons/hicolor/32x32/actions/amarok_lyrics.png +share/apps/amarok/icons/hicolor/32x32/actions/amarok_magnatune.png share/apps/amarok/icons/hicolor/32x32/actions/amarok_mostplayed.png share/apps/amarok/icons/hicolor/32x32/actions/amarok_music.png share/apps/amarok/icons/hicolor/32x32/actions/amarok_next.png @@ -302,6 +313,7 @@ share/apps/amarok/icons/hicolor/48x48/actions/amarok_files2.png share/apps/amarok/icons/hicolor/48x48/actions/amarok_info.png share/apps/amarok/icons/hicolor/48x48/actions/amarok_love.png share/apps/amarok/icons/hicolor/48x48/actions/amarok_lyrics.png +share/apps/amarok/icons/hicolor/48x48/actions/amarok_magnatune.png share/apps/amarok/icons/hicolor/48x48/actions/amarok_mostplayed.png share/apps/amarok/icons/hicolor/48x48/actions/amarok_music.png share/apps/amarok/icons/hicolor/48x48/actions/amarok_next.png @@ -370,6 +382,7 @@ share/apps/amarok/icons/hicolor/64x64/actions/amarok_files2.png share/apps/amarok/icons/hicolor/64x64/actions/amarok_info.png share/apps/amarok/icons/hicolor/64x64/actions/amarok_love.png share/apps/amarok/icons/hicolor/64x64/actions/amarok_lyrics.png +share/apps/amarok/icons/hicolor/64x64/actions/amarok_magnatune.png share/apps/amarok/icons/hicolor/64x64/actions/amarok_mostplayed.png share/apps/amarok/icons/hicolor/64x64/actions/amarok_music.png share/apps/amarok/icons/hicolor/64x64/actions/amarok_next.png @@ -456,10 +469,8 @@ share/apps/amarok/images/wizard_xmms.png share/apps/amarok/images/xine_logo.png share/apps/amarok/ruby_lib/ share/apps/amarok/ruby_lib/codes.rb +share/apps/amarok/ruby_lib/gem_plugin.rb share/apps/amarok/ruby_lib/gemconfigure.rb -share/apps/amarok/ruby_lib/http11.rb -share/apps/amarok/ruby_lib/libhttp11.la -@lib share/apps/amarok/ruby_lib/libhttp11.so.${LIBhttp11_VERSION} share/apps/amarok/ruby_lib/mongrel/ share/apps/amarok/ruby_lib/mongrel.rb share/apps/amarok/ruby_lib/mongrel/cgi.rb @@ -568,7 +579,9 @@ share/apps/amarok/themes/reinhardt/stylesheet.css share/apps/konqsidebartng/add/amarok.desktop share/apps/konqsidebartng/entries/amarok.desktop share/apps/konqsidebartng/kicker_entries/amarok.desktop +share/apps/konqueror/servicemenus/amarok_addaspodcast.desktop share/apps/konqueror/servicemenus/amarok_append.desktop +share/apps/konqueror/servicemenus/amarok_play_audiocd.desktop share/apps/profiles/ share/apps/profiles/amarok.profile.xml share/config.kcfg/amarok.kcfg @@ -678,11 +691,13 @@ share/doc/HTML/en/amarok/vis_window.png share/doc/HTML/es/ share/doc/HTML/es/amarok/ share/doc/HTML/es/amarok/add_dynamic.png +share/doc/HTML/es/amarok/advanced.docbook share/doc/HTML/es/amarok/amarok_playlist.png share/doc/HTML/es/amarok/analyzer.png share/doc/HTML/es/amarok/browser_choice.png share/doc/HTML/es/amarok/buttons.png share/doc/HTML/es/amarok/collection.png +share/doc/HTML/es/amarok/config.docbook share/doc/HTML/es/amarok/config_appearance.png share/doc/HTML/es/amarok/config_collection.png share/doc/HTML/es/amarok/config_engine.png @@ -697,6 +712,7 @@ share/doc/HTML/es/amarok/dynamic_mode1.png share/doc/HTML/es/amarok/dynamic_mode2.png share/doc/HTML/es/amarok/dynamic_settings.png share/doc/HTML/es/amarok/equalizer.png +share/doc/HTML/es/amarok/faq.docbook share/doc/HTML/es/amarok/file_browser.png share/doc/HTML/es/amarok/logo.png share/doc/HTML/es/amarok/media_device.png @@ -710,12 +726,14 @@ share/doc/HTML/es/amarok/playlist_browser.png share/doc/HTML/es/amarok/playlist_window.png share/doc/HTML/es/amarok/queue_manager.png share/doc/HTML/es/amarok/quick.docbook +share/doc/HTML/es/amarok/requirements.docbook share/doc/HTML/es/amarok/rmb_menu.png share/doc/HTML/es/amarok/script_manager.png share/doc/HTML/es/amarok/status_bar.png share/doc/HTML/es/amarok/tab_lyrics.png share/doc/HTML/es/amarok/tab_music.png share/doc/HTML/es/amarok/tab_wiki.png +share/doc/HTML/es/amarok/using.docbook share/doc/HTML/es/amarok/vis_window.png share/doc/HTML/et/ share/doc/HTML/et/amarok/ @@ -1051,7 +1069,9 @@ share/locale/pt_BR/LC_MESSAGES/amarok.mo share/locale/ro/LC_MESSAGES/amarok.mo share/locale/ru/LC_MESSAGES/amarok.mo share/locale/rw/LC_MESSAGES/amarok.mo +share/locale/sk/LC_MESSAGES/amarok.mo share/locale/sl/LC_MESSAGES/amarok.mo +share/locale/sq/LC_MESSAGES/amarok.mo share/locale/sr/LC_MESSAGES/amarok.mo share/locale/sr@Latn/LC_MESSAGES/amarok.mo share/locale/sv/LC_MESSAGES/amarok.mo @@ -1069,6 +1089,7 @@ share/locale/zh_CN/LC_MESSAGES/amarok.mo share/locale/zh_TW/LC_MESSAGES/amarok.mo share/services/amarok_daap-mediadevice.desktop share/services/amarok_generic-mediadevice.desktop +share/services/amarok_ipod-mediadevice.desktop share/services/amarok_massstorage-device.desktop share/services/amarok_nfs-device.desktop share/services/amarok_smb-device.desktop