Update icons location of KDE apps. Bump PKGREVISION

12 files changed, 117 insertions, 118 deletions

diff --git a/editors/kdissert/Makefile b/editors/kdissert/Makefile
index 968459f05b5..56b9df4bfe9 100644
--- a/editors/kdissert/Makefile
+++ b/editors/kdissert/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2007/01/26 04:03:19 markd Exp $
 #
 
 DISTNAME=		kdissert-1.0.5
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		editors
 MASTER_SITES=		http://freehackers.org/~tnagy/kdissert/
 EXTRACT_SUFX=		.tar.bz2
@@ -26,6 +26,7 @@ do-install:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${PREFIX}/bin/scons install
 
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/qt3-tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/kdissert/PLIST b/editors/kdissert/PLIST
index cc0ef46647c..ae25232a3e1 100644
--- a/editors/kdissert/PLIST
+++ b/editors/kdissert/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2006/04/17 07:07:18 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2007/01/26 04:03:19 markd Exp $
 bin/kdissert
 lib/kde3/libkdissOOOdoc.la
 lib/kde3/libkdissOOOdoc.so
@@ -28,6 +28,22 @@ share/doc/kde/HTML/en/kdissert/screenshot.jpg
 share/doc/kde/HTML/fr/kdissert/common
 share/doc/kde/HTML/fr/kdissert/index.cache.bz2
 share/doc/kde/HTML/fr/kdissert/index.docbook
+share/icons/hicolor/128x128/actions/kdissert_sort.png
+share/icons/hicolor/128x128/apps/kdissert.png
+share/icons/hicolor/16x16/actions/kdissert_link.png
+share/icons/hicolor/16x16/actions/kdissert_point.png
+share/icons/hicolor/16x16/actions/kdissert_sort.png
+share/icons/hicolor/16x16/apps/kdissert.png
+share/icons/hicolor/22x22/actions/kdissert_link.png
+share/icons/hicolor/22x22/actions/kdissert_point.png
+share/icons/hicolor/22x22/actions/kdissert_sort.png
+share/icons/hicolor/22x22/apps/kdissert.png
+share/icons/hicolor/32x32/actions/kdissert_link.png
+share/icons/hicolor/32x32/actions/kdissert_point.png
+share/icons/hicolor/32x32/actions/kdissert_sort.png
+share/icons/hicolor/32x32/apps/kdissert.png
+share/icons/hicolor/64x64/actions/kdissert_sort.png
+share/icons/hicolor/64x64/apps/kdissert.png
 share/kde/applnk/Utilities/kdissert.desktop
 share/kde/apps/kdissert/kdissertui.rc
 share/kde/apps/kdissert/pics/nopix.png
@@ -44,22 +60,6 @@ share/kde/apps/kdissert/templatedata/kdissstx.tar.gz
 share/kde/apps/kdissert/tips
 share/kde/apps/kdissertpart/kdissertpart.rc
 share/kde/config.kcfg/kdissert.kcfg
-share/kde/icons/hicolor/128x128/actions/kdissert_sort.png
-share/kde/icons/hicolor/128x128/apps/kdissert.png
-share/kde/icons/hicolor/16x16/actions/kdissert_link.png
-share/kde/icons/hicolor/16x16/actions/kdissert_point.png
-share/kde/icons/hicolor/16x16/actions/kdissert_sort.png
-share/kde/icons/hicolor/16x16/apps/kdissert.png
-share/kde/icons/hicolor/22x22/actions/kdissert_link.png
-share/kde/icons/hicolor/22x22/actions/kdissert_point.png
-share/kde/icons/hicolor/22x22/actions/kdissert_sort.png
-share/kde/icons/hicolor/22x22/apps/kdissert.png
-share/kde/icons/hicolor/32x32/actions/kdissert_link.png
-share/kde/icons/hicolor/32x32/actions/kdissert_point.png
-share/kde/icons/hicolor/32x32/actions/kdissert_sort.png
-share/kde/icons/hicolor/32x32/apps/kdissert.png
-share/kde/icons/hicolor/64x64/actions/kdissert_sort.png
-share/kde/icons/hicolor/64x64/apps/kdissert.png
 share/kde/mimelnk/application/x-kdissert.desktop
 share/kde/services/kdissertpart.desktop
 share/locale/de/LC_MESSAGES/kdissert.mo
@@ -69,22 +69,22 @@ share/locale/it/LC_MESSAGES/kdissert.mo
 share/locale/nl/LC_MESSAGES/kdissert.mo
 share/locale/pl/LC_MESSAGES/kdissert.mo
 @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/64x64/actions
-@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/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/icons/hicolor/128x128/actions
 @dirrm share/kde/apps/kdissertpart
 @dirrm share/kde/apps/kdissert/templatedata
 @dirrm share/kde/apps/kdissert/pics
 @dirrm share/kde/apps/kdissert
 @comment in kde: @dirrm share/kde/apps
 @comment in kde: @dirrm share/kde/applnk/Utilities
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/apps
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/actions
+@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/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 hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/actions
 @dirrm share/doc/kde/HTML/fr/kdissert
 @comment in kde: @dirrm share/doc/kde/HTML/fr
 @dirrm share/doc/kde/HTML/en/kdissert
diff --git a/editors/kile/Makefile b/editors/kile/Makefile
index 672536ea20c..78379633c98 100644
--- a/editors/kile/Makefile
+++ b/editors/kile/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.41 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.42 2007/01/26 04:03:19 markd Exp $
 
 DISTNAME=		kile-1.9.3
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		editors kde
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=kile/}
 EXTRACT_SUFX=		.tar.bz2
@@ -10,7 +10,6 @@ MAINTAINER=		markd@NetBSD.org
 HOMEPAGE=		http://kile.sourceforge.net/
 COMMENT=		LaTeX source editor - TeX shell - Gnuplot front end
 
-USE_DIRS+=		xdg-1.1
 USE_TOOLS+=		gmake perl msgfmt
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
@@ -22,6 +21,7 @@ REPLACE_PERL=		src/kile1.6_upd.pl \
 			src/kile1.9-1_upd.pl
 
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/kdegraphics3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/kile/PLIST b/editors/kile/PLIST
index f5c7c96623c..08a19a9f412 100644
--- a/editors/kile/PLIST
+++ b/editors/kile/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2006/08/30 00:15:29 markd Exp $
+@comment $NetBSD: PLIST,v 1.17 2007/01/26 04:03:20 markd Exp $
 bin/kile
 share/applications/kde/kile.desktop
 share/doc/kde/HTML/da/kile/common
@@ -152,6 +152,13 @@ share/doc/kde/HTML/sv/kile/snap_sidebarmenu.png
 share/doc/kde/HTML/sv/kile/snap_structview_label.png
 share/doc/kde/HTML/sv/kile/snap_usertag.png
 share/doc/kde/HTML/sv/kile/texgroup.png
+share/icons/hicolor/128x128/apps/kile.png
+share/icons/hicolor/16x16/apps/kile.png
+share/icons/hicolor/22x22/apps/kile.png
+share/icons/hicolor/32x32/apps/kile.png
+share/icons/hicolor/48x48/apps/kile.png
+share/icons/hicolor/64x64/apps/kile.png
+share/icons/hicolor/scalable/apps/kile.svgz
 share/kde/apps/kconf_update/kile.upd
 share/kde/apps/kconf_update/kile1.6_upd.pl
 share/kde/apps/kconf_update/kile1.7_upd.pl
@@ -992,13 +999,6 @@ share/kde/apps/kile/test/test_index.tex
 share/kde/apps/kile/test/test_plain.tex
 share/kde/apps/kile/tips
 share/kde/config.kcfg/kile.kcfg
-share/kde/icons/hicolor/128x128/apps/kile.png
-share/kde/icons/hicolor/16x16/apps/kile.png
-share/kde/icons/hicolor/22x22/apps/kile.png
-share/kde/icons/hicolor/32x32/apps/kile.png
-share/kde/icons/hicolor/48x48/apps/kile.png
-share/kde/icons/hicolor/64x64/apps/kile.png
-share/kde/icons/hicolor/scalable/apps/kile.svgz
 share/kde/mimelnk/text/x-kilepr.desktop
 share/locale/br/LC_MESSAGES/kile.mo
 share/locale/ca/LC_MESSAGES/kile.mo
@@ -1041,13 +1041,6 @@ share/locale/tr/LC_MESSAGES/kile.mo
 share/locale/uk/LC_MESSAGES/kile.mo
 share/locale/zh_CN/LC_MESSAGES/kile.mo
 @comment in kde: @dirrm share/kde/mimelnk/text
-@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.kcfg
 @dirrm share/kde/apps/kile/test
 @dirrm share/kde/apps/kile/templates
@@ -1072,6 +1065,13 @@ share/locale/zh_CN/LC_MESSAGES/kile.mo
 @dirrm share/kde/apps/kile
 @comment in kde: @dirrm share/kde/apps/kconf_update
 @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/kile
 @comment in kde: @dirrm share/doc/kde/HTML/sv
 @dirrm share/doc/kde/HTML/pt/kile
diff --git a/editors/vim-kde/Makefile b/editors/vim-kde/Makefile
index 3a67139e5d3..e78e35ee810 100644
--- a/editors/vim-kde/Makefile
+++ b/editors/vim-kde/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2007/01/26 04:03:20 markd Exp $
 
 DISTNAME=	kvim-${KVIM_VERSION}
 PKGNAME=	vim-kde-${KVIM_VERSION}
-PKGREVISION=	9
+PKGREVISION=	10
 CATEGORIES=	editors kde
 MASTER_SITES=	ftp://ftp.rutgers.edu/pub/kde/stable/apps/KDE3.x/utils/ \
 		ftp://ftp.kde.org/pub/kde/stable/apps/KDE3.x/utils/ \
@@ -21,7 +21,6 @@ CONFLICTS+=	vim-share-[0-9]* vim-[0-9]* vim-xaw-[0-9]*
 CONFLICTS+=	pkg_alternatives-[0-9]*
 
 WRKSRC=		${WRKDIR}/kvim-${KVIM_VERSION}/src
-USE_DIRS+=	xdg-1.1
 USE_TOOLS+=	awk:run perl:run msgfmt
 MAKE_ENV+=	AWK=${AWK:Q}
 MAKE_ENV+=	PERL5=${PERL5:Q}
@@ -35,8 +34,10 @@ CONFIGURE_ARGS+=	--with-tlib=ncurses
 post-configure:
 	${TOUCH} ${WRKSRC:Q}/auto/configure ${WRKSRC:Q}/auto/config.mk
 
-.include "../../devel/ncurses/buildlink3.mk"
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../devel/ncurses/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
+.include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/editors/vim-kde/PLIST b/editors/vim-kde/PLIST
index e19609b2ec8..3f5f79d2bfb 100644
--- a/editors/vim-kde/PLIST
+++ b/editors/vim-kde/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/03/28 22:29:53 joerg Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/26 04:03:20 markd Exp $
 bin/eview
 bin/evim
 bin/ex
@@ -23,15 +23,15 @@ man/man1/vim.1
 man/man1/vimdiff.1
 man/man1/vimtutor.1
 man/man1/xxd.1
+share/icons/hicolor/16x16/actions/hi16-action-make.png
+share/icons/hicolor/22x22/actions/hi22-action-make.png
+share/icons/hicolor/32x32/apps/kvim.png
+share/icons/hicolor/48x48/apps/gvim.png
+share/icons/hicolor/48x48/apps/kvim.png
+share/icons/locolor/16x16/apps/gvim.png
+share/icons/locolor/32x32/apps/gvim.png
 share/kde/applnk/Editors/KVim.desktop
 share/kde/apps/kvim/tips
-share/kde/icons/hicolor/16x16/actions/hi16-action-make.png
-share/kde/icons/hicolor/22x22/actions/hi22-action-make.png
-share/kde/icons/hicolor/32x32/apps/kvim.png
-share/kde/icons/hicolor/48x48/apps/gvim.png
-share/kde/icons/hicolor/48x48/apps/kvim.png
-share/kde/icons/locolor/16x16/apps/gvim.png
-share/kde/icons/locolor/32x32/apps/gvim.png
 share/kde/vim/vim62/bugreport.vim
 share/kde/vim/vim62/colors/README.txt
 share/kde/vim/vim62/colors/blue.vim
@@ -983,6 +983,3 @@ share/kde/vim/vim62/vimrc_example.vim
 @dirrm share/kde/vim
 @dirrm share/kde/apps/kvim
 @unexec ${RMDIR} %D/share/kde/applnk/Editors 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/16x16/actions 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/48x48/apps 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/kde/icons/hicolor/22x22/actions 2>/dev/null || ${TRUE}
diff --git a/finance/kmymoney2/Makefile b/finance/kmymoney2/Makefile
index f73e9226a0c..93574675224 100644
--- a/finance/kmymoney2/Makefile
+++ b/finance/kmymoney2/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2007/01/26 04:03:20 markd Exp $
 
 DISTNAME=	kmymoney2-0.8.5
-PKGREVISION=	1
+PKGREVISION=	2
 CATEGORIES=	finance kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=kmymoney2/}
 EXTRACT_SUFX=	.tar.bz2
@@ -32,6 +32,7 @@ SUBST_FILTER_CMD.hints=	${GREP} -v includehint
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
diff --git a/finance/kmymoney2/PLIST b/finance/kmymoney2/PLIST
index 7cf7c1ecbb6..e82eba16979 100644
--- a/finance/kmymoney2/PLIST
+++ b/finance/kmymoney2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2006/10/07 12:14:18 markd Exp $
+@comment $NetBSD: PLIST,v 1.8 2007/01/26 04:03:20 markd Exp $
 bin/kmymoney
 bin/kmymoney2
 include/kmymoney/export.h
@@ -164,6 +164,18 @@ share/doc/kde/HTML/en/kmymoney2/views-payees.docbook
 share/doc/kde/HTML/en/kmymoney2/views-reports.docbook
 share/doc/kde/HTML/en/kmymoney2/views-schedules.docbook
 share/doc/kde/HTML/en/kmymoney2/whatsnew.docbook
+share/icons/hicolor/128x128/apps/kmymoney2.png
+share/icons/hicolor/128x128/mimetypes/kmy.png
+share/icons/hicolor/16x16/apps/kmymoney2.png
+share/icons/hicolor/16x16/mimetypes/kmy.png
+share/icons/hicolor/32x32/apps/kmymoney2.png
+share/icons/hicolor/32x32/mimetypes/kmy.png
+share/icons/hicolor/48x48/apps/kmymoney2.png
+share/icons/hicolor/48x48/mimetypes/kmy.png
+share/icons/hicolor/64x64/apps/kmymoney2.png
+share/icons/hicolor/64x64/mimetypes/kmy.png
+share/icons/locolor/16x16/apps/kmymoney2.png
+share/icons/locolor/32x32/apps/kmymoney2.png
 share/kde/apps/kmymoney2/html/home.html
 share/kde/apps/kmymoney2/html/home_br.pt_BR.html
 share/kde/apps/kmymoney2/html/home_de.de.html
@@ -317,18 +329,6 @@ share/kde/apps/kmymoney2/templates/gl_ES/default_accounts.kmt
 share/kde/apps/kmymoney2/templates/pt_BR/default_accounts.kmt
 share/kde/apps/kmymoney2/templates/ru_SU/default_accounts.kmt
 share/kde/apps/kmymoney2/tips
-share/kde/icons/hicolor/128x128/apps/kmymoney2.png
-share/kde/icons/hicolor/128x128/mimetypes/kmy.png
-share/kde/icons/hicolor/16x16/apps/kmymoney2.png
-share/kde/icons/hicolor/16x16/mimetypes/kmy.png
-share/kde/icons/hicolor/32x32/apps/kmymoney2.png
-share/kde/icons/hicolor/32x32/mimetypes/kmy.png
-share/kde/icons/hicolor/48x48/apps/kmymoney2.png
-share/kde/icons/hicolor/48x48/mimetypes/kmy.png
-share/kde/icons/hicolor/64x64/apps/kmymoney2.png
-share/kde/icons/hicolor/64x64/mimetypes/kmy.png
-share/kde/icons/locolor/16x16/apps/kmymoney2.png
-share/kde/icons/locolor/32x32/apps/kmymoney2.png
 share/kde/mimelnk/application/x-kmymoney2.desktop
 ${HAS_LIBOFX}share/kde/services/kmm_ofximport.desktop
 share/kde/servicetypes/kmymoneyimporterplugin.desktop
@@ -347,17 +347,6 @@ share/locale/pt_PT/LC_MESSAGES/kmymoney2.mo
 share/locale/ru/LC_MESSAGES/kmymoney2.mo
 @comment in kde: @dirrm share/kde/servicetypes
 @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/64x64/mimetypes
-@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/32x32/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/32x32/apps
-@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/128x128/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/128x128/apps
 @dirrm share/kde/apps/kmymoney2/templates/ru_SU
 @dirrm share/kde/apps/kmymoney2/templates/pt_BR
 @dirrm share/kde/apps/kmymoney2/templates/gl_ES
@@ -384,6 +373,17 @@ share/locale/ru/LC_MESSAGES/kmymoney2.mo
 @dirrm share/kde/apps/kmymoney2/html
 @dirrm share/kde/apps/kmymoney2
 @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/64x64/mimetypes
+@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/32x32/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
+@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/128x128/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/128x128/apps
 @dirrm share/doc/kde/HTML/en/kmymoney2
 @comment in kde: @dirrm share/doc/kde/HTML/en
 @comment in kde: @dirrm share/applications/kde
diff --git a/games/boson/Makefile b/games/boson/Makefile
index 9c3af4da3fe..4d88b84a318 100644
--- a/games/boson/Makefile
+++ b/games/boson/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2007/01/26 04:03:20 markd Exp $
 #
 
 DISTNAME=		boson-all-0.8
 PKGNAME=		${DISTNAME:S/-all//}
-PKGREVISION=		13
+PKGREVISION=		14
 CATEGORIES=		games
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=boson/}
 EXTRACT_SUFX=		.tar.bz2
@@ -12,7 +12,6 @@ MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://boson.eu.org/
 COMMENT=		OpenGL real-time strategy game for KDE 3
 
-USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_TOOLS+=		gmake msgfmt
 USE_LANGUAGES=		c c++
@@ -20,10 +19,11 @@ USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-debug
 
+.include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../audio/libvorbis/buildlink3.mk"
 .include "../../devel/SDL/buildlink3.mk"
 .include "../../games/kdegames3/buildlink3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../graphics/jpeg/buildlink3.mk"
 .include "../../graphics/lib3ds/buildlink3.mk"
-.include "../../meta-pkgs/kde3/kde3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/games/boson/PLIST b/games/boson/PLIST
index 5331c1f8a3f..27229c56b7a 100644
--- a/games/boson/PLIST
+++ b/games/boson/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/05/26 22:47:19 wiz Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/26 04:03:20 markd Exp $
 bin/bocursor
 bin/bodebugdialog
 bin/boinfo
@@ -64,6 +64,10 @@ share/doc/kde/HTML/en/boson/units/tornado.jpg
 share/doc/kde/HTML/en/boson/units/tornado_small.jpg
 share/doc/kde/HTML/en/boson/units/transall.jpg
 share/doc/kde/HTML/en/boson/units/transall_small.jpg
+share/icons/hicolor/32x32/apps/boson.png
+share/icons/hicolor/48x48/apps/boson.png
+share/icons/locolor/16x16/apps/boson.png
+share/icons/locolor/32x32/apps/boson.png
 share/kde/applnk/Games/TacticStrategy/boson/boinfo.desktop
 share/kde/applnk/Games/TacticStrategy/boson/boson.desktop
 share/kde/applnk/Games/TacticStrategy/boson/bounit.desktop
@@ -1046,12 +1050,6 @@ share/kde/apps/boson/themes/ui/standard/stop.png
 share/kde/apps/boson/topui.rc
 share/kde/config/bodebug.areas
 share/kde/config/bodebugrc
-share/kde/icons/hicolor/32x32/apps/boson.png
-share/kde/icons/hicolor/48x48/apps/boson.png
-share/kde/icons/locolor/16x16/apps/boson.png
-share/kde/icons/locolor/32x32/apps/boson.png
-@dirrm share/kde/icons/locolor/32x32/apps
-@dirrm share/kde/icons/locolor/16x16/apps
 @dirrm share/kde/apps/boson/themes/ui/standard
 @dirrm share/kde/apps/boson/themes/ui
 @dirrm share/kde/apps/boson/themes/textures
diff --git a/games/knights/Makefile b/games/knights/Makefile
index 6952fcc4138..523ebbcf359 100644
--- a/games/knights/Makefile
+++ b/games/knights/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.28 2007/01/17 23:47:19 wiz Exp $
+# $NetBSD: Makefile,v 1.29 2007/01/26 04:03:20 markd Exp $
 
 DISTNAME=	knights-0.6
-PKGREVISION=	5
+PKGREVISION=	6
 CATEGORIES=	games kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=knights/}
 
@@ -17,6 +17,7 @@ USE_LIBTOOL=            YES
 BUILDLINK_DEPMETHOD.libXt?=	build
 
 .include "../../meta-pkgs/kde3/kde3.mk"
+.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../x11/kdebase3/buildlink3.mk"
 .include "../../x11/kdelibs3/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
diff --git a/games/knights/PLIST b/games/knights/PLIST
index 0d08a2a9863..bb06a341659 100644
--- a/games/knights/PLIST
+++ b/games/knights/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2006/04/17 07:07:19 jlam Exp $
+@comment $NetBSD: PLIST,v 1.4 2007/01/26 04:03:20 markd Exp $
 bin/knights
 share/doc/kde/HTML/de/knights/common
 share/doc/kde/HTML/en/knights/common
@@ -10,6 +10,14 @@ share/doc/kde/HTML/fr/knights/common
 share/doc/kde/HTML/fr/knights/index.docbook
 share/doc/kde/HTML/it/knights/common
 share/doc/kde/HTML/ru/knights/common
+share/icons/hicolor/16x16/apps/knights.png
+share/icons/hicolor/16x16/mimetypes/pgn.png
+share/icons/hicolor/32x32/apps/knights.png
+share/icons/hicolor/32x32/mimetypes/pgn.png
+share/icons/hicolor/48x48/apps/knights.png
+share/icons/hicolor/48x48/mimetypes/pgn.png
+share/icons/hicolor/64x64/apps/knights.png
+share/icons/hicolor/64x64/mimetypes/pgn.png
 share/kde/applnk/Games/Board/knights.desktop
 share/kde/apps/knights/default-engine-portrait.jpg
 share/kde/apps/knights/default-portrait.jpg
@@ -21,14 +29,6 @@ share/kde/apps/knights/themes/KBDefault.tar.gz
 share/kde/apps/knights/themes/KCDefault.tar.gz
 share/kde/apps/knights/themes/KSDefault.tar.gz
 share/kde/apps/knights/wizard.png
-share/kde/icons/hicolor/16x16/apps/knights.png
-share/kde/icons/hicolor/16x16/mimetypes/pgn.png
-share/kde/icons/hicolor/32x32/apps/knights.png
-share/kde/icons/hicolor/32x32/mimetypes/pgn.png
-share/kde/icons/hicolor/48x48/apps/knights.png
-share/kde/icons/hicolor/48x48/mimetypes/pgn.png
-share/kde/icons/hicolor/64x64/apps/knights.png
-share/kde/icons/hicolor/64x64/mimetypes/pgn.png
 share/kde/mimelnk/application/pgn.desktop
 share/locale/de/LC_MESSAGES/knights.mo
 share/locale/es/LC_MESSAGES/knights.mo
@@ -37,18 +37,18 @@ share/locale/fi/LC_MESSAGES/knights.mo
 share/locale/fr/LC_MESSAGES/knights.mo
 share/locale/it/LC_MESSAGES/knights.mo
 @comment in kde: @dirrm share/kde/mimelnk/application
-@comment in kde: @dirrm share/kde/icons/hicolor/64x64/mimetypes
-@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/16x16/mimetypes
-@comment in kde: @dirrm share/kde/icons/hicolor/16x16/apps
 @dirrm share/kde/apps/knights/themes
 @dirrm share/kde/apps/knights
 @comment in kde: @dirrm share/kde/apps
 @dirrm share/kde/applnk/Games/Board
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/64x64/mimetypes
+@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/16x16/mimetypes
+@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @dirrm share/doc/kde/HTML/ru/knights
 @comment in kde: @dirrm share/doc/kde/HTML/ru
 @dirrm share/doc/kde/HTML/it/knights