Update to 2.12.1, add a patch to get pkgconfig install in the correctplace..

Insteresting, they changed to get pkgconfig install in $(datadir)/pkgconfig in
this version.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@4898 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 111 insertions, 103 deletions

diff --git a/misc/gnome-icon-theme/Makefile b/misc/gnome-icon-theme/Makefile
index 0841dd876..5885e576a 100644
--- a/misc/gnome-icon-theme/Makefile
+++ b/misc/gnome-icon-theme/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.53 2005/08/22 18:17:53 kwm Exp $
+#   $MCom: ports/misc/gnome-icon-theme/Makefile,v 1.54 2005/09/04 20:25:55 marcus Exp $
 #
 
 PORTNAME=	gnome-icon-theme
-PORTVERSION=	2.12.0
+PORTVERSION=	2.12.1
 CATEGORIES=	misc gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:R}
@@ -29,8 +29,9 @@ CONFIGURE_ARGS=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
-		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g ; \
+		s|[(]datadir[)]/pkgconfig|(prefix)/libdata/pkgconfig|g' \
+			${WRKSRC}/Makefile.in
 	@${REINPLACE_CMD} -e 's|@mkdir_p@|mkdir -p|g' \
 		${WRKSRC}/po/Makefile.in.in
 
diff --git a/misc/gnome-icon-theme/distinfo b/misc/gnome-icon-theme/distinfo
index 12ffc298d..aca18983b 100644
--- a/misc/gnome-icon-theme/distinfo
+++ b/misc/gnome-icon-theme/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/gnome-icon-theme-2.12.0.tar.bz2) = 14d1ce7cdb1f23278bb9967900287183
-SIZE (gnome2/gnome-icon-theme-2.12.0.tar.bz2) = 3039259
+MD5 (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = a5401d6f085979fe6601f2241743af86
+SIZE (gnome2/gnome-icon-theme-2.12.1.tar.bz2) = 3113824
diff --git a/misc/gnome-icon-theme/pkg-plist b/misc/gnome-icon-theme/pkg-plist
index eacdaa09f..6730fa9b7 100644
--- a/misc/gnome-icon-theme/pkg-plist
+++ b/misc/gnome-icon-theme/pkg-plist
@@ -3,27 +3,22 @@ share/icons/gnome/12x12/emblems/emblem-symbolic-link.png
 share/icons/gnome/12x12/filesystems/gnome-fs-directory-accept.png
 share/icons/gnome/12x12/filesystems/gnome-fs-directory-visiting.png
 share/icons/gnome/12x12/filesystems/gnome-fs-directory.png
-share/icons/gnome/16x16/filesystems/gnome-fs-directory.png
-share/icons/gnome/16x16/filesystems/gnome-fs-home.png
-share/icons/gnome/16x16/filesystems/gnome-fs-share.png
-share/icons/gnome/16x16/filesystems/gnome-fs-trash-empty.png
-share/icons/gnome/16x16/filesystems/gnome-fs-trash-full.png
 share/icons/gnome/16x16/devices/gnome-dev-cdrom-audio.png
 share/icons/gnome/16x16/devices/gnome-dev-cdrom.png
 share/icons/gnome/16x16/devices/gnome-dev-dvd.png
 share/icons/gnome/16x16/devices/gnome-dev-ethernet.png
 share/icons/gnome/16x16/devices/gnome-dev-floppy.png
-share/icons/gnome/16x16/devices/gnome-dev-harddisk.png
 share/icons/gnome/16x16/devices/gnome-dev-harddisk-1394.png
 share/icons/gnome/16x16/devices/gnome-dev-harddisk-usb.png
+share/icons/gnome/16x16/devices/gnome-dev-harddisk.png
 share/icons/gnome/16x16/devices/gnome-dev-ipod.png
 share/icons/gnome/16x16/devices/gnome-dev-memory.png
 share/icons/gnome/16x16/devices/gnome-dev-mouse-ball.png
 share/icons/gnome/16x16/devices/gnome-dev-pci.png
 share/icons/gnome/16x16/devices/gnome-dev-printer.png
-share/icons/gnome/16x16/devices/gnome-dev-removable.png
 share/icons/gnome/16x16/devices/gnome-dev-removable-1394.png
 share/icons/gnome/16x16/devices/gnome-dev-removable-usb.png
+share/icons/gnome/16x16/devices/gnome-dev-removable.png
 share/icons/gnome/16x16/devices/gnome-dev-wavelan-encrypted.png
 share/icons/gnome/16x16/devices/gnome-dev-wavelan.png
 share/icons/gnome/16x16/filesystems/gnome-fs-bookmark-missing.png
@@ -31,12 +26,17 @@ share/icons/gnome/16x16/filesystems/gnome-fs-bookmark.png
 share/icons/gnome/16x16/filesystems/gnome-fs-client.png
 share/icons/gnome/16x16/filesystems/gnome-fs-desktop.png
 share/icons/gnome/16x16/filesystems/gnome-fs-directory-accept.png
+share/icons/gnome/16x16/filesystems/gnome-fs-directory.png
 share/icons/gnome/16x16/filesystems/gnome-fs-ftp.png
+share/icons/gnome/16x16/filesystems/gnome-fs-home.png
 share/icons/gnome/16x16/filesystems/gnome-fs-network.png
 share/icons/gnome/16x16/filesystems/gnome-fs-nfs.png
 share/icons/gnome/16x16/filesystems/gnome-fs-server.png
+share/icons/gnome/16x16/filesystems/gnome-fs-share.png
 share/icons/gnome/16x16/filesystems/gnome-fs-smb.png
 share/icons/gnome/16x16/filesystems/gnome-fs-ssh.png
+share/icons/gnome/16x16/filesystems/gnome-fs-trash-empty.png
+share/icons/gnome/16x16/filesystems/gnome-fs-trash-full.png
 share/icons/gnome/16x16/mimetypes/gnome-library.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-application-magicpoint.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-application-msword.png
@@ -160,8 +160,8 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-image-bmp.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-gif.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-jpeg.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-png.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg+xml.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-image-svg.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-tiff.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-wmf.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-image-x-3ds.png
@@ -208,12 +208,64 @@ share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-ms-asf.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-ms-wmv.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-video-x-msvideo.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-video.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-nfs-server.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-server.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-share.png
+share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-workgroup.png
 share/icons/gnome/16x16/mimetypes/gnome-mime-x-font-afm.png
 share/icons/gnome/16x16/mimetypes/gnome-package.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-nfs-server.png
-share/icons/gnome/16x16/mimetypes/gnome-mime-x-directory-smb-workgroup.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-1.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-10.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-11.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-12.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-13.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-14.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-15.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-16.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-17.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-18.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-19.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-2.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-20.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-21.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-22.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-23.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-24.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-25.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-26.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-3.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-4.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-5.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-6.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-7.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-8.png
+share/icons/gnome/16x16/stock/emoticons/stock_smiley-9.png
+share/icons/gnome/16x16/stock/media/stock_3dsound.png
+share/icons/gnome/16x16/stock/media/stock_effects-sound.png
+share/icons/gnome/16x16/stock/media/stock_headphones.png
+share/icons/gnome/16x16/stock/media/stock_insert-video-plugin.png
+share/icons/gnome/16x16/stock/media/stock_line_in.png
+share/icons/gnome/16x16/stock/media/stock_media-fwd.png
+share/icons/gnome/16x16/stock/media/stock_media-next.png
+share/icons/gnome/16x16/stock/media/stock_media-pause.png
+share/icons/gnome/16x16/stock/media/stock_media-play.png
+share/icons/gnome/16x16/stock/media/stock_media-prev.png
+share/icons/gnome/16x16/stock/media/stock_media-rec.png
+share/icons/gnome/16x16/stock/media/stock_media-rew.png
+share/icons/gnome/16x16/stock/media/stock_media-stop.png
+share/icons/gnome/16x16/stock/media/stock_mic.png
+share/icons/gnome/16x16/stock/media/stock_midi.png
+share/icons/gnome/16x16/stock/media/stock_music-library.png
+share/icons/gnome/16x16/stock/media/stock_playlist.png
+share/icons/gnome/16x16/stock/media/stock_repeat.png
+share/icons/gnome/16x16/stock/media/stock_shuffle.png
+share/icons/gnome/16x16/stock/media/stock_smart-playlist.png
+share/icons/gnome/16x16/stock/media/stock_volume-0.png
+share/icons/gnome/16x16/stock/media/stock_volume-max.png
+share/icons/gnome/16x16/stock/media/stock_volume-med.png
+share/icons/gnome/16x16/stock/media/stock_volume-min.png
+share/icons/gnome/16x16/stock/media/stock_volume-mute.png
+share/icons/gnome/16x16/stock/media/stock_volume.png
 share/icons/gnome/192x192/filesystems/gnome-fs-regular.icon
 share/icons/gnome/192x192/filesystems/gnome-fs-regular.png
 share/icons/gnome/24x24/devices/gnome-dev-battery.png
@@ -264,15 +316,41 @@ share/icons/gnome/24x24/filesystems/gnome-fs-share.png
 share/icons/gnome/24x24/filesystems/gnome-fs-trash-empty.png
 share/icons/gnome/24x24/filesystems/gnome-fs-trash-full.png
 share/icons/gnome/24x24/mimetypes/gnome-mime-x-directory-nfs-server.png
+share/icons/gnome/24x24/stock/media/stock_3dsound.png
+share/icons/gnome/24x24/stock/media/stock_effects-sound.png
+share/icons/gnome/24x24/stock/media/stock_headphones.png
+share/icons/gnome/24x24/stock/media/stock_insert-video-plugin.png
+share/icons/gnome/24x24/stock/media/stock_line_in.png
+share/icons/gnome/24x24/stock/media/stock_media-fwd.png
+share/icons/gnome/24x24/stock/media/stock_media-next.png
+share/icons/gnome/24x24/stock/media/stock_media-pause.png
+share/icons/gnome/24x24/stock/media/stock_media-play.png
+share/icons/gnome/24x24/stock/media/stock_media-prev.png
+share/icons/gnome/24x24/stock/media/stock_media-rec.png
+share/icons/gnome/24x24/stock/media/stock_media-rew.png
+share/icons/gnome/24x24/stock/media/stock_media-shuffle.png
+share/icons/gnome/24x24/stock/media/stock_media-stop.png
+share/icons/gnome/24x24/stock/media/stock_mic.png
+share/icons/gnome/24x24/stock/media/stock_midi.png
+share/icons/gnome/24x24/stock/media/stock_music-library.png
+share/icons/gnome/24x24/stock/media/stock_playlist.png
+share/icons/gnome/24x24/stock/media/stock_repeat.png
+share/icons/gnome/24x24/stock/media/stock_smart-playlist.png
+share/icons/gnome/24x24/stock/media/stock_volume-0.png
+share/icons/gnome/24x24/stock/media/stock_volume-max.png
+share/icons/gnome/24x24/stock/media/stock_volume-med.png
+share/icons/gnome/24x24/stock/media/stock_volume-min.png
+share/icons/gnome/24x24/stock/media/stock_volume-mute.png
+share/icons/gnome/24x24/stock/media/stock_volume.png
 share/icons/gnome/32x32/devices/gnome-dev-ipod.png
 share/icons/gnome/32x32/filesystems/gnome-fs-bookmark-missing.png
 share/icons/gnome/32x32/filesystems/gnome-fs-bookmark.png
 share/icons/gnome/32x32/filesystems/gnome-fs-client.png
 share/icons/gnome/32x32/filesystems/gnome-fs-desktop.png
-share/icons/gnome/32x32/filesystems/gnome-fs-trash-empty.png
-share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png
 share/icons/gnome/32x32/filesystems/gnome-fs-network.png
 share/icons/gnome/32x32/filesystems/gnome-fs-server.png
+share/icons/gnome/32x32/filesystems/gnome-fs-trash-empty.png
+share/icons/gnome/32x32/filesystems/gnome-fs-trash-full.png
 share/icons/gnome/32x32/mimetypes/gnome-mime-application-msword.png
 share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-excel.png
 share/icons/gnome/32x32/mimetypes/gnome-mime-application-vnd.ms-powerpoint.png
@@ -283,6 +361,13 @@ share/icons/gnome/32x32/mimetypes/gnome-mime-image-png.png
 share/icons/gnome/32x32/mimetypes/gnome-mime-image-svg.png
 share/icons/gnome/32x32/mimetypes/gnome-mime-image-tiff.png
 share/icons/gnome/32x32/mimetypes/gnome-mime-image-wmf.png
+share/icons/gnome/32x32/stock/media/stock_sound.png
+share/icons/gnome/32x32/stock/media/stock_volume-0.png
+share/icons/gnome/32x32/stock/media/stock_volume-max.png
+share/icons/gnome/32x32/stock/media/stock_volume-med.png
+share/icons/gnome/32x32/stock/media/stock_volume-min.png
+share/icons/gnome/32x32/stock/media/stock_volume-mute.png
+share/icons/gnome/32x32/stock/media/stock_volume.png
 share/icons/gnome/36x36/emblems/emblem-symbolic-link.png
 share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.icon
 share/icons/gnome/36x36/filesystems/gnome-fs-directory-accept.png
@@ -290,7 +375,6 @@ share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.icon
 share/icons/gnome/36x36/filesystems/gnome-fs-directory-visiting.png
 share/icons/gnome/36x36/filesystems/gnome-fs-directory.icon
 share/icons/gnome/36x36/filesystems/gnome-fs-directory.png
-@exec mkdir -p %D/share/icons/gnome/48x48/apps
 share/icons/gnome/48x48/devices/gnome-dev-battery.png
 share/icons/gnome/48x48/devices/gnome-dev-cdrom-audio.png
 share/icons/gnome/48x48/devices/gnome-dev-cdrom.png
@@ -680,6 +764,7 @@ share/icons/hicolor/16x16/apps/panel-notification-area.png
 share/icons/hicolor/16x16/apps/panel-window-list.png
 share/icons/hicolor/16x16/apps/panel-window-menu.png
 share/icons/hicolor/16x16/apps/text-editor.png
+share/icons/hicolor/16x16/apps/volume-knob.png
 share/icons/hicolor/16x16/filesystems/gnome-fs-locally-shared.png
 share/icons/hicolor/16x16/filesystems/gnome-fs-share-private.png
 share/icons/hicolor/16x16/stock/chart/stock_chart-autoformat.png
@@ -813,32 +898,6 @@ share/icons/hicolor/16x16/stock/document/stock_task-recurring.png
 share/icons/hicolor/16x16/stock/document/stock_task.png
 share/icons/hicolor/16x16/stock/document/stock_todo.png
 share/icons/hicolor/16x16/stock/document/stock_view-html-source.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-1.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-10.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-11.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-12.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-13.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-14.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-15.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-16.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-17.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-18.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-19.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-2.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-20.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-21.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-22.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-23.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-24.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-25.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-26.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-3.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-4.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-5.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-6.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-7.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-8.png
-share/icons/hicolor/16x16/stock/emoticons/stock_smiley-9.png
 share/icons/hicolor/16x16/stock/form/stock_form-activation-order.png
 share/icons/hicolor/16x16/stock/form/stock_form-add-field.png
 share/icons/hicolor/16x16/stock/form/stock_form-automatic-control-focus.png
@@ -1154,32 +1213,6 @@ share/icons/hicolor/16x16/stock/io/stock_save-template.png
 share/icons/hicolor/16x16/stock/io/stock_save.png
 share/icons/hicolor/16x16/stock/io/stock_save_as.png
 share/icons/hicolor/16x16/stock/io/stock_up-one-dir.png
-share/icons/hicolor/16x16/stock/media/stock_3dsound.png
-share/icons/hicolor/16x16/stock/media/stock_effects-sound.png
-share/icons/hicolor/16x16/stock/media/stock_headphones.png
-share/icons/hicolor/16x16/stock/media/stock_insert-video-plugin.png
-share/icons/hicolor/16x16/stock/media/stock_line_in.png
-share/icons/hicolor/16x16/stock/media/stock_media-fwd.png
-share/icons/hicolor/16x16/stock/media/stock_media-next.png
-share/icons/hicolor/16x16/stock/media/stock_media-pause.png
-share/icons/hicolor/16x16/stock/media/stock_media-play.png
-share/icons/hicolor/16x16/stock/media/stock_media-prev.png
-share/icons/hicolor/16x16/stock/media/stock_media-rec.png
-share/icons/hicolor/16x16/stock/media/stock_media-rew.png
-share/icons/hicolor/16x16/stock/media/stock_media-stop.png
-share/icons/hicolor/16x16/stock/media/stock_mic.png
-share/icons/hicolor/16x16/stock/media/stock_midi.png
-share/icons/hicolor/16x16/stock/media/stock_music-library.png
-share/icons/hicolor/16x16/stock/media/stock_playlist.png
-share/icons/hicolor/16x16/stock/media/stock_repeat.png
-share/icons/hicolor/16x16/stock/media/stock_shuffle.png
-share/icons/hicolor/16x16/stock/media/stock_smart-playlist.png
-share/icons/hicolor/16x16/stock/media/stock_volume.png
-share/icons/hicolor/16x16/stock/media/stock_volume-0.png
-share/icons/hicolor/16x16/stock/media/stock_volume-max.png
-share/icons/hicolor/16x16/stock/media/stock_volume-med.png
-share/icons/hicolor/16x16/stock/media/stock_volume-min.png
-share/icons/hicolor/16x16/stock/media/stock_volume-mute.png
 share/icons/hicolor/16x16/stock/navigation/stock_bottom.png
 share/icons/hicolor/16x16/stock/navigation/stock_down-with-subpoints.png
 share/icons/hicolor/16x16/stock/navigation/stock_down.png
@@ -1644,6 +1677,7 @@ share/icons/hicolor/24x24/apps/shares.png
 share/icons/hicolor/24x24/apps/stock-ticker.png
 share/icons/hicolor/24x24/apps/text-editor.png
 share/icons/hicolor/24x24/apps/tsclient.png
+share/icons/hicolor/24x24/apps/volume-knob.png
 share/icons/hicolor/24x24/filesystems/gnome-fs-locally-shared.png
 share/icons/hicolor/24x24/filesystems/gnome-fs-share-private.png
 share/icons/hicolor/24x24/stock/chart/stock_chart-autoformat.png
@@ -2031,32 +2065,6 @@ share/icons/hicolor/24x24/stock/io/stock_save-pdf.png
 share/icons/hicolor/24x24/stock/io/stock_save-template.png
 share/icons/hicolor/24x24/stock/io/stock_save.png
 share/icons/hicolor/24x24/stock/io/stock_save_as.png
-share/icons/hicolor/24x24/stock/media/stock_3dsound.png
-share/icons/hicolor/24x24/stock/media/stock_effects-sound.png
-share/icons/hicolor/24x24/stock/media/stock_headphones.png
-share/icons/hicolor/24x24/stock/media/stock_insert-video-plugin.png
-share/icons/hicolor/24x24/stock/media/stock_line_in.png
-share/icons/hicolor/24x24/stock/media/stock_media-fwd.png
-share/icons/hicolor/24x24/stock/media/stock_media-next.png
-share/icons/hicolor/24x24/stock/media/stock_media-pause.png
-share/icons/hicolor/24x24/stock/media/stock_media-play.png
-share/icons/hicolor/24x24/stock/media/stock_media-prev.png
-share/icons/hicolor/24x24/stock/media/stock_media-rec.png
-share/icons/hicolor/24x24/stock/media/stock_media-rew.png
-share/icons/hicolor/24x24/stock/media/stock_media-shuffle.png
-share/icons/hicolor/24x24/stock/media/stock_media-stop.png
-share/icons/hicolor/24x24/stock/media/stock_mic.png
-share/icons/hicolor/24x24/stock/media/stock_midi.png
-share/icons/hicolor/24x24/stock/media/stock_music-library.png
-share/icons/hicolor/24x24/stock/media/stock_playlist.png
-share/icons/hicolor/24x24/stock/media/stock_repeat.png
-share/icons/hicolor/24x24/stock/media/stock_smart-playlist.png
-share/icons/hicolor/24x24/stock/media/stock_volume.png
-share/icons/hicolor/24x24/stock/media/stock_volume-0.png
-share/icons/hicolor/24x24/stock/media/stock_volume-max.png
-share/icons/hicolor/24x24/stock/media/stock_volume-med.png
-share/icons/hicolor/24x24/stock/media/stock_volume-min.png
-share/icons/hicolor/24x24/stock/media/stock_volume-mute.png
 share/icons/hicolor/24x24/stock/navigation/stock_bottom.png
 share/icons/hicolor/24x24/stock/navigation/stock_down-with-subpoints.png
 share/icons/hicolor/24x24/stock/navigation/stock_down.png
@@ -2449,7 +2457,6 @@ share/icons/hicolor/32x32/stock/io/stock_print-preview.png
 share/icons/hicolor/32x32/stock/io/stock_print-setup.png
 share/icons/hicolor/32x32/stock/io/stock_print.png
 share/icons/hicolor/32x32/stock/io/stock_printers.png
-share/icons/hicolor/32x32/stock/media/stock_sound.png
 share/icons/hicolor/32x32/stock/net/stock_addressbook.png
 share/icons/hicolor/32x32/stock/net/stock_appointment-reminder-excl.png
 share/icons/hicolor/32x32/stock/net/stock_appointment-reminder.png
@@ -2593,7 +2600,6 @@ share/icons/hicolor/48x48/apps/text-editor.png
 share/icons/hicolor/48x48/apps/tsclient.png
 share/icons/hicolor/48x48/apps/user-info.png
 share/icons/hicolor/48x48/apps/visor.png
-share/icons/hicolor/48x48/apps/volume-knob.png
 share/icons/hicolor/48x48/apps/wallpaper.png
 share/icons/hicolor/48x48/apps/web-browser.png
 share/icons/hicolor/48x48/apps/wine.png
@@ -2700,6 +2706,11 @@ share/icons/hicolor/72x72/apps/gnome-globe.png
 share/icons/hicolor/96x96/apps/gnome-globe.png
 share/icons/hicolor/96x96/apps/gnome-starthere.png
 share/icons/hicolor/scalable/apps/evolution.svg
+share/icons/hicolor/scalable/apps/volume-knob.svg
+@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/xh 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
+@unexec rmdir %D/share/locale/rw 2> /dev/null || true
 @unexec /bin/rmdir %D/share/icons/hicolor/96x96 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/icons/hicolor/72x72 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/icons/hicolor/48x48/stock/generic 2>/dev/null || /usr/bin/true
@@ -2789,7 +2800,3 @@ share/icons/hicolor/scalable/apps/evolution.svg
 @unexec /bin/rmdir %D/share/icons/gnome/12x12 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/icons/gnome 2>/dev/null || /usr/bin/true
 @unexec /bin/rmdir %D/share/icons 2>/dev/null || /usr/bin/true
-@unexec rmdir %D/share/locale/xh/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/xh 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw/LC_MESSAGES 2> /dev/null || true
-@unexec rmdir %D/share/locale/rw 2> /dev/null || true