Update icons location of KDE apps. Bump PKGREVISION

4 files changed, 61 insertions, 58 deletions

diff --git a/multimedia/kaffeine/Makefile b/multimedia/kaffeine/Makefile
index 558fe0d97bb..b1d43eea82c 100644
--- a/multimedia/kaffeine/Makefile
+++ b/multimedia/kaffeine/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2007/01/17 23:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2007/01/26 04:25:47 markd Exp $
 #
 
 DISTNAME=	kaffeine-0.8.3
-PKGREVISION=	2
+PKGREVISION=	3
 CATEGORIES=	multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kaffeine/}
 EXTRACT_SUFX=	.tar.bz2
@@ -30,9 +30,11 @@ SUBST_FILES.path=	kaffeine/src/instwizard.cpp
 SUBST_SED.path=		-e "s|/usr/lib|${PREFIX}/lib|g"
 SUBST_MESSAGE.path=	Fixing hardcoded paths.
 
+.include "../../meta-pkgs/kde3/kde3.mk"
+
 .include "../../audio/cdparanoia/buildlink3.mk"
 .include "../../audio/lame/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../multimedia/libogg/buildlink3.mk"
 .include "../../multimedia/xine-lib/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
diff --git a/multimedia/kaffeine/PLIST b/multimedia/kaffeine/PLIST
index d1089ad8806..2a0cec3fa3f 100644
--- a/multimedia/kaffeine/PLIST
+++ b/multimedia/kaffeine/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2006/12/06 18:30:11 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/01/26 04:25:47 markd Exp $
 bin/kaffeine
 include/kaffeine/kaffeineaudioencoder.h
 include/kaffeine/kaffeinepart.h
@@ -26,6 +26,31 @@ share/doc/kde/HTML/en/kaffeine/index.docbook
 share/doc/kde/HTML/en/kaffeine/kaffeinepart.png
 share/doc/kde/HTML/en/kaffeine/playlistwin.png
 share/doc/kde/HTML/en/kaffeine/startwindow.png
+share/icons/hicolor/128x128/apps/kaffeine.png
+share/icons/hicolor/16x16/actions/player_mute.png
+share/icons/hicolor/16x16/actions/player_record.png
+share/icons/hicolor/16x16/apps/kaffeine.png
+share/icons/hicolor/16x16/apps/kdvbra.png
+share/icons/hicolor/16x16/apps/kdvbrac.png
+share/icons/hicolor/16x16/apps/kdvbtv.png
+share/icons/hicolor/16x16/apps/kdvbtvc.png
+share/icons/hicolor/16x16/apps/kilogram.png
+share/icons/hicolor/16x16/mimetypes/mime_kaffeine.png
+share/icons/hicolor/22x22/actions/player_mute.png
+share/icons/hicolor/22x22/actions/player_record.png
+share/icons/hicolor/22x22/apps/kaffeine.png
+share/icons/hicolor/22x22/apps/kilogram.png
+share/icons/hicolor/32x32/actions/player_mute.png
+share/icons/hicolor/32x32/actions/player_record.png
+share/icons/hicolor/32x32/apps/kaffeine-pause.png
+share/icons/hicolor/32x32/apps/kaffeine-play.png
+share/icons/hicolor/32x32/apps/kaffeine-record.png
+share/icons/hicolor/32x32/apps/kaffeine.png
+share/icons/hicolor/32x32/apps/kilogram.png
+share/icons/hicolor/32x32/mimetypes/mime_kaffeine.png
+share/icons/hicolor/48x48/apps/kaffeine.png
+share/icons/hicolor/48x48/mimetypes/mime_kaffeine.png
+share/icons/hicolor/64x64/apps/kaffeine.png
 share/kde/apps/kaffeine/dvbdata.tar.gz
 share/kde/apps/kaffeine/kaffeinedisc.rc
 share/kde/apps/kaffeine/kaffeineplaylist.rc
@@ -43,31 +68,6 @@ share/kde/apps/konqueror/servicemenus/kaffeine_play_audiocd.desktop
 share/kde/apps/konqueror/servicemenus/kaffeine_play_dvd.desktop
 share/kde/apps/konqueror/servicemenus/kaffeine_play_vcd.desktop
 share/kde/apps/profiles/kaffeine.profile.xml
-share/kde/icons/hicolor/128x128/apps/kaffeine.png
-share/kde/icons/hicolor/16x16/actions/player_mute.png
-share/kde/icons/hicolor/16x16/actions/player_record.png
-share/kde/icons/hicolor/16x16/apps/kaffeine.png
-share/kde/icons/hicolor/16x16/apps/kdvbra.png
-share/kde/icons/hicolor/16x16/apps/kdvbrac.png
-share/kde/icons/hicolor/16x16/apps/kdvbtv.png
-share/kde/icons/hicolor/16x16/apps/kdvbtvc.png
-share/kde/icons/hicolor/16x16/apps/kilogram.png
-share/kde/icons/hicolor/16x16/mimetypes/mime_kaffeine.png
-share/kde/icons/hicolor/22x22/actions/player_mute.png
-share/kde/icons/hicolor/22x22/actions/player_record.png
-share/kde/icons/hicolor/22x22/apps/kaffeine.png
-share/kde/icons/hicolor/22x22/apps/kilogram.png
-share/kde/icons/hicolor/32x32/actions/player_mute.png
-share/kde/icons/hicolor/32x32/actions/player_record.png
-share/kde/icons/hicolor/32x32/apps/kaffeine-pause.png
-share/kde/icons/hicolor/32x32/apps/kaffeine-play.png
-share/kde/icons/hicolor/32x32/apps/kaffeine-record.png
-share/kde/icons/hicolor/32x32/apps/kaffeine.png
-share/kde/icons/hicolor/32x32/apps/kilogram.png
-share/kde/icons/hicolor/32x32/mimetypes/mime_kaffeine.png
-share/kde/icons/hicolor/48x48/apps/kaffeine.png
-share/kde/icons/hicolor/48x48/mimetypes/mime_kaffeine.png
-share/kde/icons/hicolor/64x64/apps/kaffeine.png
 share/kde/mimelnk/application/x-kaffeine.desktop
 share/kde/services/kaffeinemp3lame.desktop
 share/kde/services/kaffeineoggvorbis.desktop
@@ -117,23 +117,23 @@ share/locale/zh_TW/LC_MESSAGES/kaffeine.mo
 @comment in kde: @dirrm share/kde/servicetypes
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/48x48/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/actions
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/22x22/actions
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/actions
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
 @comment in kde: @dirrm share/kde/apps/profiles
 @comment in kde: @dirrm share/kde/apps/konqueror/servicemenus
 @dirrm share/kde/apps/kaffeine/pics
 @dirrm share/kde/apps/kaffeine
 @comment in kde: @dirrm share/kde/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/48x48/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/actions
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/actions
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/actions
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
 @comment in kde: @dirrm share/doc/kde/HTML/en
 @comment in kde: @dirrm share/applications/kde
 @comment in kde: @dirrm lib/kde3
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 2656999046b..e03b07f5492 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2007/01/17 23:47:22 wiz Exp $
+# $NetBSD: Makefile,v 1.40 2007/01/26 04:25:47 markd Exp $
 #
 
 DISTNAME=	kmplayer-0.9.3a
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	multimedia kde
 MASTER_SITES=	http://kmplayer.kde.org/pkgs/
 EXTRACT_SUFX=	.tar.bz2
@@ -31,6 +31,7 @@ SUBST_FILES.desktop=	src/kmplayer.desktop
 SUBST_SED.desktop=	-e 's|@PREFIX@|${PREFIX}|g'
 
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
diff --git a/multimedia/kmplayer/PLIST b/multimedia/kmplayer/PLIST
index cbec55713b8..6b208d82fad 100644
--- a/multimedia/kmplayer/PLIST
+++ b/multimedia/kmplayer/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2006/10/06 20:30:10 markd Exp $
+@comment $NetBSD: PLIST,v 1.16 2007/01/26 04:25:47 markd Exp $
 bin/kmplayer
 bin/kxineplayer
 bin/kxvplayer
@@ -40,19 +40,19 @@ share/doc/kde/HTML/ru/kmplayer/index.docbook
 share/doc/kde/HTML/sv/kmplayer/common
 share/doc/kde/HTML/sv/kmplayer/index.cache.bz2
 share/doc/kde/HTML/sv/kmplayer/index.docbook
+share/icons/hicolor/128x128/apps/kmplayer.png
+share/icons/hicolor/16x16/apps/kmplayer.png
+share/icons/hicolor/22x22/apps/kmplayer.png
+share/icons/hicolor/32x32/apps/kmplayer.png
+share/icons/hicolor/48x48/apps/kmplayer.png
+share/icons/hicolor/64x64/apps/kmplayer.png
+share/icons/hicolor/scalable/apps/kmplayer.svgz
 share/kde/apps/kmplayer/bookmarks.xml
 share/kde/apps/kmplayer/kmplayerpartui.rc
 share/kde/apps/kmplayer/kmplayerui.rc
 share/kde/apps/kmplayer/noise.gif
 share/kde/apps/kmplayer/pluginsinfo
 share/kde/config/kmplayerrc
-share/kde/icons/hicolor/128x128/apps/kmplayer.png
-share/kde/icons/hicolor/16x16/apps/kmplayer.png
-share/kde/icons/hicolor/22x22/apps/kmplayer.png
-share/kde/icons/hicolor/32x32/apps/kmplayer.png
-share/kde/icons/hicolor/48x48/apps/kmplayer.png
-share/kde/icons/hicolor/64x64/apps/kmplayer.png
-share/kde/icons/hicolor/scalable/apps/kmplayer.svgz
 share/kde/mimelnk/application/x-kmplayer.desktop
 share/kde/mimelnk/video/x-ms-wmp.desktop
 share/kde/services/kmplayer_part.desktop
@@ -102,16 +102,16 @@ share/locale/zh_CN/LC_MESSAGES/kmplayer.mo
 @comment in kde: @dirrm share/kde/services
 @comment in kde: @dirrm share/kde/mimelnk/video
 @comment in kde: @dirrm share/kde/mimelnk/application
-@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/config
 @dirrm share/kde/apps/kmplayer
 @comment in kde: @dirrm share/kde/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
 @dirrm share/doc/kde/HTML/sv/kmplayer
 @comment in kde: @dirrm share/doc/kde/HTML/sv
 @dirrm share/doc/kde/HTML/ru/kmplayer