Install the stock icons into pixmaps not icons so gnome-desktop can find

them.


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

3 files changed, 30 insertions, 18 deletions

diff --git a/x11/gnomepanel/Makefile b/x11/gnomepanel/Makefile
index fb5cd6726..2799ce71c 100644
--- a/x11/gnomepanel/Makefile
+++ b/x11/gnomepanel/Makefile
@@ -7,6 +7,8 @@
 
 PORTNAME=	gnomepanel
 PORTVERSION=	2.3.2
+PORTREVISION=	1
+#PORTREVISION=	0
 CATEGORIES=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/gnome-panel/2.3
diff --git a/x11/gnomepanel/files/patch-icons_Makefile.in b/x11/gnomepanel/files/patch-icons_Makefile.in
new file mode 100644
index 000000000..4d07eb03d
--- /dev/null
+++ b/x11/gnomepanel/files/patch-icons_Makefile.in
@@ -0,0 +1,11 @@
+--- icons/Makefile.in.orig	Wed May 21 19:00:47 2003
++++ icons/Makefile.in	Wed May 21 19:01:10 2003
+@@ -169,7 +169,7 @@
+ 
+ NULL = 
+ 
+-icondir = $(datadir)/icons
++icondir = $(datadir)/pixmaps
+ icon_DATA = \
+ 	panel-force-quit.png		\
+ 	cdeappmenu.png			\
diff --git a/x11/gnomepanel/pkg-plist b/x11/gnomepanel/pkg-plist
index 6dc760ded..7e82c14c0 100644
--- a/x11/gnomepanel/pkg-plist
+++ b/x11/gnomepanel/pkg-plist
@@ -324,23 +324,23 @@ share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_CN.omf 2>/dev/null || /usr/bin/true
 share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/gnome-panel/workspace-switcher-zh_TW.omf 2>/dev/null || /usr/bin/true
-share/gnome/icons/cdeappmenu.png
-share/gnome/icons/gnome-amusements.png
-share/gnome/icons/gnome-clock.png
-share/gnome/icons/gnome-gegl.png
-share/gnome/icons/gnome-gegl2-2.png
-share/gnome/icons/gnome-gegl2.png
-share/gnome/icons/gnome-lockscreen.png
-share/gnome/icons/gnome-panel-type-corner.png
-share/gnome/icons/gnome-panel-type-edge.png
-share/gnome/icons/gnome-panel-type-floating.png
-share/gnome/icons/gnome-panel-type-menu.png
-share/gnome/icons/gnome-panel-type-sliding.png
-share/gnome/icons/gnome-panel.png
-share/gnome/icons/gnome-run.png
-share/gnome/icons/gnome-screenshot.png
-share/gnome/icons/panel-drawer.png
-share/gnome/icons/panel-force-quit.png
+share/gnome/pixmaps/cdeappmenu.png
+share/gnome/pixmaps/gnome-amusements.png
+share/gnome/pixmaps/gnome-clock.png
+share/gnome/pixmaps/gnome-gegl.png
+share/gnome/pixmaps/gnome-gegl2-2.png
+share/gnome/pixmaps/gnome-gegl2.png
+share/gnome/pixmaps/gnome-lockscreen.png
+share/gnome/pixmaps/gnome-panel-type-corner.png
+share/gnome/pixmaps/gnome-panel-type-edge.png
+share/gnome/pixmaps/gnome-panel-type-floating.png
+share/gnome/pixmaps/gnome-panel-type-menu.png
+share/gnome/pixmaps/gnome-panel-type-sliding.png
+share/gnome/pixmaps/gnome-panel.png
+share/gnome/pixmaps/gnome-run.png
+share/gnome/pixmaps/gnome-screenshot.png
+share/gnome/pixmaps/panel-drawer.png
+share/gnome/pixmaps/panel-force-quit.png
 share/gnome/panel/gnome-panel-preferences.glade
 share/gnome/panel/gnome-panel-screenshot.glade
 share/gnome/panel/panel-properties-dialog.glade
@@ -408,7 +408,6 @@ share/locale/zh_CN/LC_MESSAGES/gnome-panel-2.0.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-panel-2.0.mo
 @dirrm share/gnome/omf/gnome-panel
 @dirrm share/gnome/idl/gnome-panel-2.0
-@dirrm share/gnome/icons
 @dirrm share/gnome/help/workspace-switcher/zh_TW/figures
 @dirrm share/gnome/help/workspace-switcher/zh_TW
 @dirrm share/gnome/help/workspace-switcher/zh_CN/figures