Remove some unneeded tools. Stop installing files into a

directory GNOME stopped using. Override two more start-here icons
with the NetBSD logo.
Bump PKGREVISION.

2 files changed, 9 insertions, 12 deletions

diff --git a/graphics/gnome-icon-theme/Makefile b/graphics/gnome-icon-theme/Makefile
index 9627f883c1b..c8cf06e335d 100644
--- a/graphics/gnome-icon-theme/Makefile
+++ b/graphics/gnome-icon-theme/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.66 2010/06/05 10:05:38 wiz Exp $
+# $NetBSD: Makefile,v 1.67 2010/06/05 10:16:37 wiz Exp $
 #
 
 DISTNAME=		gnome-icon-theme-2.30.3
+PKGREVISION=		1
 CATEGORIES=		graphics gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-icon-theme/2.30/}
 EXTRACT_SUFX=		.tar.bz2
@@ -15,28 +16,25 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 NOT_FOR_BULK_PLATFORM=	HPUX-*-*
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake intltool msgfmt perl pkg-config
+USE_TOOLS+=		gmake intltool pkg-config
+# otherwise it creates lots of lib/locale dirs, even though it doesn't
+# need them (!)
 USE_PKGLOCALEDIR=	yes
 
 PKGCONFIG_OVERRIDE=	gnome-icon-theme.pc.in
 
-# https://bugzilla.gnome.org/show_bug.cgi?id=620638
-INSTALLATION_DIRS=	share/icons/gnome/scalable/places
-
 # The list of installed files depends on the version of
 # icon-naming-utils, so be sure that this dependency corresponds to
 # the current pkgsrc version.
 BUILDLINK_API_DEPENDS.icon-naming-utils+=	icon-naming-utils>=0.8.90
 
-# XXX this is used by applications. We "own" the subtree share/icons/gnome,
-# so we control the subdirs not belonging to a single application.
 post-install:
-	${MKDIR} ${DESTDIR}${PREFIX}/share/icons/gnome/48x48/mimetypes
-	${INSTALL_DATA} ${FILESDIR}/distributor-logo.svg ${DESTDIR}${PREFIX}/share/icons/gnome/scalable/places/start-here.svg
 	${PREFIX}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 16 -h 16 -o ${DESTDIR}${PREFIX}/share/icons/gnome/16x16/places/start-here.png
 	${PREFIX}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 22 -h 22 -o ${DESTDIR}${PREFIX}/share/icons/gnome/22x22/places/start-here.png
 	${PREFIX}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 24 -h 24 -o ${DESTDIR}${PREFIX}/share/icons/gnome/24x24/places/start-here.png
 	${PREFIX}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 32 -h 32 -o ${DESTDIR}${PREFIX}/share/icons/gnome/32x32/places/start-here.png
+	${PREFIX}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 48 -h 48 -o ${DESTDIR}${PREFIX}/share/icons/gnome/48x48/places/start-here.png
+	${PREFIX}/bin/rsvg-convert ${FILESDIR}/distributor-logo.svg -w 256 -h 256 -o ${DESTDIR}${PREFIX}/share/icons/gnome/256x256/places/start-here.png
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../graphics/icon-naming-utils/buildlink3.mk"
diff --git a/graphics/gnome-icon-theme/PLIST b/graphics/gnome-icon-theme/PLIST
index a25e6e94ab2..2a65b8d966a 100644
--- a/graphics/gnome-icon-theme/PLIST
+++ b/graphics/gnome-icon-theme/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.35 2010/06/05 10:05:38 wiz Exp $
+@comment $NetBSD: PLIST,v 1.36 2010/06/05 10:16:38 wiz Exp $
 share/icons/gnome/16x16/actions/add.png
 share/icons/gnome/16x16/actions/address-book-new.png
 share/icons/gnome/16x16/actions/application-exit.png
@@ -3471,6 +3471,7 @@ share/icons/gnome/256x256/places/network.png
 share/icons/gnome/256x256/places/network_local.png
 share/icons/gnome/256x256/places/redhat-network-server.png
 share/icons/gnome/256x256/places/server.png
+share/icons/gnome/256x256/places/start-here.png
 share/icons/gnome/256x256/places/stock_folder.png
 share/icons/gnome/256x256/places/trashcan_empty.png
 share/icons/gnome/256x256/places/user-bookmarks.png
@@ -5577,6 +5578,4 @@ share/icons/gnome/8x8/emblems/emblem-readonly.png
 share/icons/gnome/8x8/emblems/emblem-symbolic-link.png
 share/icons/gnome/8x8/emblems/emblem-unreadable.png
 share/icons/gnome/index.theme
-share/icons/gnome/scalable/places/start-here.svg
 share/pkgconfig/gnome-icon-theme.pc
-@pkgdir share/locale/en@shaw/LC_MESSAGES