From 28676abd08796f1f26107143deacac60fd3b06e6 Mon Sep 17 00:00:00 2001 From: markd Date: Fri, 26 Jan 2007 02:55:41 +0000 Subject: Update to KDE 3.5.6 --- multimedia/kdemultimedia3/Makefile | 18 +-- multimedia/kdemultimedia3/PLIST | 222 +++++++++++++++++------------------ multimedia/kdemultimedia3/distinfo | 8 +- multimedia/kdemultimedia3/options.mk | 15 +++ 4 files changed, 133 insertions(+), 130 deletions(-) create mode 100644 multimedia/kdemultimedia3/options.mk (limited to 'multimedia') diff --git a/multimedia/kdemultimedia3/Makefile b/multimedia/kdemultimedia3/Makefile index 6678b852e40..ca067bbbb3b 100644 --- a/multimedia/kdemultimedia3/Makefile +++ b/multimedia/kdemultimedia3/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.59 2007/01/17 23:47:22 wiz Exp $ +# $NetBSD: Makefile,v 1.60 2007/01/26 02:58:41 markd Exp $ DISTNAME= kdemultimedia-${_KDE_VERSION} -PKGREVISION= 4 CATEGORIES= multimedia COMMENT= Multimedia tools for the KDE integrated X11 desktop @@ -10,7 +9,6 @@ COMMENT= Multimedia tools for the KDE integrated X11 desktop DEPENDS+= xine-arts>=1rc0a:../../audio/xine-arts USE_TOOLS+= pkg-config -USE_DIRS+= xdg-1.2 REPLACE_PERL+= kscd/workman2cddb.pl @@ -26,18 +24,7 @@ CONFIGURE_ARGS+= --enable-cdparanoia CONFIGURE_ARGS+= --with-cdparanoia=${BUILDLINK_PREFIX.cdparanoia} CONFIGURE_ARGS+= --with-vorbis=${BUILDLINK_PREFIX.libvorbis} -PKG_OPTIONS_VAR= PKG_OPTIONS.kdemultimedia -PKG_SUPPORTED_OPTIONS= gstreamer oss -.include "../../mk/bsd.options.mk" - -.if !empty(PKG_OPTIONS:Mgstreamer) -.include "../../multimedia/gstreamer0.8/buildlink3.mk" -.include "../../multimedia/gst-plugins0.8/buildlink3.mk" -.endif - -.if !empty(PKG_OPTIONS:Moss) -CONFIGURE_ARGS+= --enable-audio=oss -.endif +.include "options.mk" # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} @@ -53,6 +40,7 @@ UNLIMIT_RESOURCES+= datasize .include "../../audio/libtunepimp/buildlink3.mk" .include "../../audio/musicbrainz/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" +.include "../../graphics/hicolor-icon-theme/buildlink3.mk" .include "../../multimedia/libtheora/buildlink3.mk" .include "../../multimedia/xine-lib/buildlink3.mk" .include "../../x11/kdebase3/buildlink3.mk" diff --git a/multimedia/kdemultimedia3/PLIST b/multimedia/kdemultimedia3/PLIST index 308609154a2..0a4faf21f16 100644 --- a/multimedia/kdemultimedia3/PLIST +++ b/multimedia/kdemultimedia3/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.23 2006/08/02 13:57:23 markd Exp $ +@comment $NetBSD: PLIST,v 1.24 2007/01/26 02:58:41 markd Exp $ bin/artsbuilder bin/artscontrol bin/juk @@ -522,6 +522,93 @@ share/doc/kde/HTML/en/noatun/common share/doc/kde/HTML/en/noatun/index.cache.bz2 share/doc/kde/HTML/en/noatun/index.docbook share/examples/kdemultimedia3/applications-merged/kde-multimedia-music.menu +share/icons/crystalsvg/128x128/actions/artsaudiomanager.png +share/icons/crystalsvg/128x128/actions/artsenvironment.png +share/icons/crystalsvg/128x128/actions/artsfftscope.png +share/icons/crystalsvg/128x128/actions/artsmediatypes.png +share/icons/crystalsvg/128x128/actions/artsmidimanager.png +share/icons/crystalsvg/16x16/actions/artsaudiomanager.png +share/icons/crystalsvg/16x16/actions/artsbuilderexecute.png +share/icons/crystalsvg/16x16/actions/artsenvironment.png +share/icons/crystalsvg/16x16/actions/artsfftscope.png +share/icons/crystalsvg/16x16/actions/artsmediatypes.png +share/icons/crystalsvg/16x16/actions/artsmidimanager.png +share/icons/crystalsvg/22x22/actions/artsaudiomanager.png +share/icons/crystalsvg/22x22/actions/artsbuilderexecute.png +share/icons/crystalsvg/22x22/actions/artsenvironment.png +share/icons/crystalsvg/22x22/actions/artsfftscope.png +share/icons/crystalsvg/22x22/actions/artsmediatypes.png +share/icons/crystalsvg/22x22/actions/artsmidimanager.png +share/icons/crystalsvg/22x22/actions/juk_dock.png +share/icons/crystalsvg/32x32/actions/artsaudiomanager.png +share/icons/crystalsvg/32x32/actions/artsenvironment.png +share/icons/crystalsvg/32x32/actions/artsfftscope.png +share/icons/crystalsvg/32x32/actions/artsmediatypes.png +share/icons/crystalsvg/32x32/actions/artsmidimanager.png +share/icons/crystalsvg/48x48/actions/artsaudiomanager.png +share/icons/crystalsvg/48x48/actions/artsenvironment.png +share/icons/crystalsvg/48x48/actions/artsfftscope.png +share/icons/crystalsvg/48x48/actions/artsmediatypes.png +share/icons/crystalsvg/48x48/actions/artsmidimanager.png +share/icons/crystalsvg/64x64/actions/artsaudiomanager.png +share/icons/crystalsvg/64x64/actions/artsenvironment.png +share/icons/crystalsvg/64x64/actions/artsfftscope.png +share/icons/crystalsvg/64x64/actions/artsmediatypes.png +share/icons/crystalsvg/64x64/actions/artsmidimanager.png +share/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz +share/icons/crystalsvg/scalable/actions/artsenvironment.svgz +share/icons/crystalsvg/scalable/actions/artsfftscope.svgz +share/icons/crystalsvg/scalable/actions/artsmediatypes.svgz +share/icons/crystalsvg/scalable/actions/artsmidimanager.svgz +share/icons/hicolor/128x128/apps/artscontrol.png +share/icons/hicolor/128x128/apps/juk.png +share/icons/hicolor/128x128/apps/kaboodle.png +share/icons/hicolor/128x128/apps/kmix.png +share/icons/hicolor/128x128/apps/krec.png +share/icons/hicolor/128x128/apps/kscd.png +share/icons/hicolor/128x128/apps/noatun.png +share/icons/hicolor/16x16/apps/artsbuilder.png +share/icons/hicolor/16x16/apps/artscontrol.png +share/icons/hicolor/16x16/apps/juk.png +share/icons/hicolor/16x16/apps/kaboodle.png +share/icons/hicolor/16x16/apps/kaudiocreator.png +share/icons/hicolor/16x16/apps/kmid.png +share/icons/hicolor/16x16/apps/kmix.png +share/icons/hicolor/16x16/apps/krec.png +share/icons/hicolor/16x16/apps/kscd.png +share/icons/hicolor/16x16/apps/noatun.png +share/icons/hicolor/22x22/apps/artscontrol.png +share/icons/hicolor/22x22/apps/kaboodle.png +share/icons/hicolor/22x22/apps/krec.png +share/icons/hicolor/22x22/apps/noatun.png +share/icons/hicolor/32x32/apps/artscontrol.png +share/icons/hicolor/32x32/apps/juk.png +share/icons/hicolor/32x32/apps/kaboodle.png +share/icons/hicolor/32x32/apps/kaudiocreator.png +share/icons/hicolor/32x32/apps/kmid.png +share/icons/hicolor/32x32/apps/kmix.png +share/icons/hicolor/32x32/apps/krec.png +share/icons/hicolor/32x32/apps/kscd.png +share/icons/hicolor/32x32/apps/noatun.png +share/icons/hicolor/48x48/apps/artscontrol.png +share/icons/hicolor/48x48/apps/juk.png +share/icons/hicolor/48x48/apps/kaboodle.png +share/icons/hicolor/48x48/apps/kmid.png +share/icons/hicolor/48x48/apps/kmix.png +share/icons/hicolor/48x48/apps/krec.png +share/icons/hicolor/48x48/apps/kscd.png +share/icons/hicolor/48x48/apps/noatun.png +share/icons/hicolor/64x64/apps/artscontrol.png +share/icons/hicolor/64x64/apps/juk.png +share/icons/hicolor/64x64/apps/kaboodle.png +share/icons/hicolor/64x64/apps/kmix.png +share/icons/hicolor/64x64/apps/krec.png +share/icons/hicolor/64x64/apps/kscd.png +share/icons/hicolor/64x64/apps/noatun.png +share/icons/hicolor/scalable/apps/artsbuilder.svgz +share/icons/hicolor/scalable/apps/artscontrol.svgz +share/icons/locolor/16x16/apps/kaudiocreator.png +share/icons/locolor/32x32/apps/kaudiocreator.png share/kde/apps/artsbuilder/artsbuilderui.rc share/kde/apps/artsbuilder/examples/README share/kde/apps/artsbuilder/examples/example_adsr.arts @@ -964,93 +1051,6 @@ share/kde/config.kcfg/kaudiocreator.kcfg share/kde/config.kcfg/kaudiocreator_encoders.kcfg share/kde/config.kcfg/kscd.kcfg share/kde/config.kcfg/libkcddb.kcfg -share/kde/icons/crystalsvg/128x128/actions/artsaudiomanager.png -share/kde/icons/crystalsvg/128x128/actions/artsenvironment.png -share/kde/icons/crystalsvg/128x128/actions/artsfftscope.png -share/kde/icons/crystalsvg/128x128/actions/artsmediatypes.png -share/kde/icons/crystalsvg/128x128/actions/artsmidimanager.png -share/kde/icons/crystalsvg/16x16/actions/artsaudiomanager.png -share/kde/icons/crystalsvg/16x16/actions/artsbuilderexecute.png -share/kde/icons/crystalsvg/16x16/actions/artsenvironment.png -share/kde/icons/crystalsvg/16x16/actions/artsfftscope.png -share/kde/icons/crystalsvg/16x16/actions/artsmediatypes.png -share/kde/icons/crystalsvg/16x16/actions/artsmidimanager.png -share/kde/icons/crystalsvg/22x22/actions/artsaudiomanager.png -share/kde/icons/crystalsvg/22x22/actions/artsbuilderexecute.png -share/kde/icons/crystalsvg/22x22/actions/artsenvironment.png -share/kde/icons/crystalsvg/22x22/actions/artsfftscope.png -share/kde/icons/crystalsvg/22x22/actions/artsmediatypes.png -share/kde/icons/crystalsvg/22x22/actions/artsmidimanager.png -share/kde/icons/crystalsvg/22x22/actions/juk_dock.png -share/kde/icons/crystalsvg/32x32/actions/artsaudiomanager.png -share/kde/icons/crystalsvg/32x32/actions/artsenvironment.png -share/kde/icons/crystalsvg/32x32/actions/artsfftscope.png -share/kde/icons/crystalsvg/32x32/actions/artsmediatypes.png -share/kde/icons/crystalsvg/32x32/actions/artsmidimanager.png -share/kde/icons/crystalsvg/48x48/actions/artsaudiomanager.png -share/kde/icons/crystalsvg/48x48/actions/artsenvironment.png -share/kde/icons/crystalsvg/48x48/actions/artsfftscope.png -share/kde/icons/crystalsvg/48x48/actions/artsmediatypes.png -share/kde/icons/crystalsvg/48x48/actions/artsmidimanager.png -share/kde/icons/crystalsvg/64x64/actions/artsaudiomanager.png -share/kde/icons/crystalsvg/64x64/actions/artsenvironment.png -share/kde/icons/crystalsvg/64x64/actions/artsfftscope.png -share/kde/icons/crystalsvg/64x64/actions/artsmediatypes.png -share/kde/icons/crystalsvg/64x64/actions/artsmidimanager.png -share/kde/icons/crystalsvg/scalable/actions/artsaudiomanager.svgz -share/kde/icons/crystalsvg/scalable/actions/artsenvironment.svgz -share/kde/icons/crystalsvg/scalable/actions/artsfftscope.svgz -share/kde/icons/crystalsvg/scalable/actions/artsmediatypes.svgz -share/kde/icons/crystalsvg/scalable/actions/artsmidimanager.svgz -share/kde/icons/hicolor/128x128/apps/artscontrol.png -share/kde/icons/hicolor/128x128/apps/juk.png -share/kde/icons/hicolor/128x128/apps/kaboodle.png -share/kde/icons/hicolor/128x128/apps/kmix.png -share/kde/icons/hicolor/128x128/apps/krec.png -share/kde/icons/hicolor/128x128/apps/kscd.png -share/kde/icons/hicolor/128x128/apps/noatun.png -share/kde/icons/hicolor/16x16/apps/artsbuilder.png -share/kde/icons/hicolor/16x16/apps/artscontrol.png -share/kde/icons/hicolor/16x16/apps/juk.png -share/kde/icons/hicolor/16x16/apps/kaboodle.png -share/kde/icons/hicolor/16x16/apps/kaudiocreator.png -share/kde/icons/hicolor/16x16/apps/kmid.png -share/kde/icons/hicolor/16x16/apps/kmix.png -share/kde/icons/hicolor/16x16/apps/krec.png -share/kde/icons/hicolor/16x16/apps/kscd.png -share/kde/icons/hicolor/16x16/apps/noatun.png -share/kde/icons/hicolor/22x22/apps/artscontrol.png -share/kde/icons/hicolor/22x22/apps/kaboodle.png -share/kde/icons/hicolor/22x22/apps/krec.png -share/kde/icons/hicolor/22x22/apps/noatun.png -share/kde/icons/hicolor/32x32/apps/artscontrol.png -share/kde/icons/hicolor/32x32/apps/juk.png -share/kde/icons/hicolor/32x32/apps/kaboodle.png -share/kde/icons/hicolor/32x32/apps/kaudiocreator.png -share/kde/icons/hicolor/32x32/apps/kmid.png -share/kde/icons/hicolor/32x32/apps/kmix.png -share/kde/icons/hicolor/32x32/apps/krec.png -share/kde/icons/hicolor/32x32/apps/kscd.png -share/kde/icons/hicolor/32x32/apps/noatun.png -share/kde/icons/hicolor/48x48/apps/artscontrol.png -share/kde/icons/hicolor/48x48/apps/juk.png -share/kde/icons/hicolor/48x48/apps/kaboodle.png -share/kde/icons/hicolor/48x48/apps/kmid.png -share/kde/icons/hicolor/48x48/apps/kmix.png -share/kde/icons/hicolor/48x48/apps/krec.png -share/kde/icons/hicolor/48x48/apps/kscd.png -share/kde/icons/hicolor/48x48/apps/noatun.png -share/kde/icons/hicolor/64x64/apps/artscontrol.png -share/kde/icons/hicolor/64x64/apps/juk.png -share/kde/icons/hicolor/64x64/apps/kaboodle.png -share/kde/icons/hicolor/64x64/apps/kmix.png -share/kde/icons/hicolor/64x64/apps/krec.png -share/kde/icons/hicolor/64x64/apps/kscd.png -share/kde/icons/hicolor/64x64/apps/noatun.png -share/kde/icons/hicolor/scalable/apps/artsbuilder.svgz -share/kde/icons/hicolor/scalable/apps/artscontrol.svgz -share/kde/icons/locolor/16x16/apps/kaudiocreator.png -share/kde/icons/locolor/32x32/apps/kaudiocreator.png share/kde/mimelnk/application/x-artsbuilder.desktop share/kde/mimelnk/audio/x-karaoke.desktop share/kde/mimelnk/interface/x-winamp-skin.desktop @@ -1084,29 +1084,6 @@ share/kde/servicetypes/krec_exportitem.desktop @comment in kde: @dirrm share/kde/mimelnk/interface @comment in kde: @dirrm share/kde/mimelnk/audio @comment in kde: @dirrm share/kde/mimelnk/application -@comment in kde: @dirrm share/kde/icons/locolor/32x32/apps -@comment in kde: @dirrm share/kde/icons/locolor/16x16/apps -@comment in kde: @dirrm share/kde/icons/hicolor/scalable/apps -@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps -@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps -@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps -@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps -@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps -@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/scalable/actions -@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/64x64/actions -@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/48x48/actions -@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/32x32/actions -@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/22x22/actions -@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/16x16/actions -@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/apps -@comment in kde: @dirrm share/kde/icons/crystalsvg/128x128/actions @comment in kde: @dirrm share/kde/config.kcfg @comment in kde: @dirrm share/kde/autostart @dirrm share/kde/apps/videothumbnail @@ -1188,6 +1165,29 @@ share/kde/servicetypes/krec_exportitem.desktop @dirrm share/kde/apps/artsbuilder/examples @dirrm share/kde/apps/artsbuilder @comment in kde: @dirrm share/kde/apps +@comment in kde: @dirrm share/icons/locolor/32x32/apps +@comment in kde: @dirrm share/icons/locolor/16x16/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps +@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps +@comment in kde: @dirrm share/icons/crystalsvg/scalable/apps +@comment in kde: @dirrm share/icons/crystalsvg/scalable/actions +@comment in kde: @dirrm share/icons/crystalsvg/64x64/apps +@comment in kde: @dirrm share/icons/crystalsvg/64x64/actions +@comment in kde: @dirrm share/icons/crystalsvg/48x48/apps +@comment in kde: @dirrm share/icons/crystalsvg/48x48/actions +@comment in kde: @dirrm share/icons/crystalsvg/32x32/apps +@comment in kde: @dirrm share/icons/crystalsvg/32x32/actions +@comment in kde: @dirrm share/icons/crystalsvg/22x22/apps +@comment in kde: @dirrm share/icons/crystalsvg/22x22/actions +@comment in kde: @dirrm share/icons/crystalsvg/16x16/apps +@comment in kde: @dirrm share/icons/crystalsvg/16x16/actions +@comment in kde: @dirrm share/icons/crystalsvg/128x128/apps +@comment in kde: @dirrm share/icons/crystalsvg/128x128/actions @dirrm share/examples/kdemultimedia3/applications-merged @dirrm share/examples/kdemultimedia3 @dirrm share/doc/kde/HTML/en/noatun diff --git a/multimedia/kdemultimedia3/distinfo b/multimedia/kdemultimedia3/distinfo index 9d98b6c0009..74f1d28d248 100644 --- a/multimedia/kdemultimedia3/distinfo +++ b/multimedia/kdemultimedia3/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.34 2007/01/13 18:33:44 wiz Exp $ +$NetBSD: distinfo,v 1.35 2007/01/26 02:58:41 markd Exp $ -SHA1 (kdemultimedia-3.5.5.tar.bz2) = 8ddc3174d400827e58e2e5cf87a5bd279a6bfdc1 -RMD160 (kdemultimedia-3.5.5.tar.bz2) = c31d81efeb02cea29048fbdefcb8c4f13726fded -Size (kdemultimedia-3.5.5.tar.bz2) = 6287234 bytes +SHA1 (kdemultimedia-3.5.6.tar.bz2) = 030ca0b5e79f04c6baa99108f1c871f194effee7 +RMD160 (kdemultimedia-3.5.6.tar.bz2) = 7411019e2765f740ad0f3fd592e74f62e04b8387 +Size (kdemultimedia-3.5.6.tar.bz2) = 6291692 bytes SHA1 (patch-aa) = dbc6e12e1c72fd0b830782d9ce512c0efe6c29f6 SHA1 (patch-ab) = 29d8a451cd7e641f67190fa3b4980678ebe7dd70 SHA1 (patch-ac) = f13b1d7b0285a3189b9b039daef771d9294ad413 diff --git a/multimedia/kdemultimedia3/options.mk b/multimedia/kdemultimedia3/options.mk new file mode 100644 index 00000000000..8e222e414f9 --- /dev/null +++ b/multimedia/kdemultimedia3/options.mk @@ -0,0 +1,15 @@ +# $NetBSD: options.mk,v 1.1 2007/01/26 02:58:41 markd Exp $ + +PKG_OPTIONS_VAR= PKG_OPTIONS.kdemultimedia +PKG_SUPPORTED_OPTIONS= gstreamer oss + +.include "../../mk/bsd.options.mk" + +.if !empty(PKG_OPTIONS:Mgstreamer) +.include "../../multimedia/gstreamer0.8/buildlink3.mk" +.include "../../multimedia/gst-plugins0.8/buildlink3.mk" +.endif + +.if !empty(PKG_OPTIONS:Moss) +CONFIGURE_ARGS+= --enable-audio=oss +.endif -- cgit v1.2.3