[pkgsrc/trunk]: pkgsrc/x11/gnome-panel Don't rename gnome-panel-screenshot to...

[xtraeme <xtraeme%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/71254769c9f8
branches:  trunk
changeset: 465385:71254769c9f8
user:      xtraeme <xtraeme%pkgsrc.org@localhost>
date:      Mon Dec 29 02:09:11 2003 +0000

description:
Don't rename gnome-panel-screenshot to gnome2-, because it breaks the
function of this program. Now this works perfectly.

There's no need to bump PKGREVISION this time, jmmv@ bumped it some hours
ago.

diffstat:

 x11/gnome-panel/PLIST            |  14 +++++-----
 x11/gnome-panel/distinfo         |   3 +-
 x11/gnome-panel/patches/patch-ae |  48 ----------------------------------------
 3 files changed, 8 insertions(+), 57 deletions(-)

diffs (100 lines):

diff -r 426ad9eb901c -r 71254769c9f8 x11/gnome-panel/PLIST
--- a/x11/gnome-panel/PLIST     Mon Dec 29 02:02:38 2003 +0000
+++ b/x11/gnome-panel/PLIST     Mon Dec 29 02:09:11 2003 +0000
@@ -1,8 +1,8 @@
-@comment $NetBSD: PLIST,v 1.8 2003/12/14 23:34:16 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.9 2003/12/29 02:09:11 xtraeme Exp $
 bin/gnome-desktop-item-edit
 bin/gnome-panel
 bin/gnome-panel-preferences
-bin/gnome2-panel-screenshot
+bin/gnome-panel-screenshot
 bin/panel-test-applets
 include/panel-2.0/GNOME_Panel.h
 include/panel-2.0/panel-applet-gconf.h
@@ -217,10 +217,10 @@
 share/gnome/help/workspace-switcher/zh_TW/figures/workspacelist_applet.png
 share/gnome/help/workspace-switcher/zh_TW/legal.xml
 share/gnome/help/workspace-switcher/zh_TW/workspace-switcher.xml
-share/gnome/panel2/gnome-panel-preferences.glade
-share/gnome/panel2/gnome-panel-screenshot.glade
-share/gnome/panel2/panel-properties-dialog.glade
-share/gnome/panel2/panel-run-dialog.glade
+share/gnome/panel/gnome-panel-preferences.glade
+share/gnome/panel/gnome-panel-screenshot.glade
+share/gnome/panel/panel-properties-dialog.glade
+share/gnome/panel/panel-run-dialog.glade
 share/idl/gnome-panel-2.0/GNOME_Panel.idl
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/gnome-panel-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-panel-2.0.mo
@@ -347,7 +347,7 @@
 @dirrm share/omf/gnome-panel
 @comment in scrollkeeper: @dirrm share/omf
 @dirrm share/idl/gnome-panel-2.0
-@dirrm share/gnome/panel2
+@dirrm share/gnome/panel
 @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
diff -r 426ad9eb901c -r 71254769c9f8 x11/gnome-panel/distinfo
--- a/x11/gnome-panel/distinfo  Mon Dec 29 02:02:38 2003 +0000
+++ b/x11/gnome-panel/distinfo  Mon Dec 29 02:09:11 2003 +0000
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.9 2003/12/15 01:47:55 xtraeme Exp $
+$NetBSD: distinfo,v 1.10 2003/12/29 02:09:11 xtraeme Exp $
 
 SHA1 (gnome-panel-2.4.1.tar.bz2) = 60aff60ff4240ec67db6e112bba6fcc05245f4c3
 Size (gnome-panel-2.4.1.tar.bz2) = 2642713 bytes
-SHA1 (patch-ae) = 76f57ac9edee09e60f0ea1153e288f5ecc9d5d58
diff -r 426ad9eb901c -r 71254769c9f8 x11/gnome-panel/patches/patch-ae
--- a/x11/gnome-panel/patches/patch-ae  Mon Dec 29 02:02:38 2003 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-$NetBSD: patch-ae,v 1.3 2003/12/14 23:34:16 xtraeme Exp $
---- gnome-panel/Makefile.in.orig       2003-10-26 18:55:13.000000000 +0000
-+++ gnome-panel/Makefile.in    2003-10-26 18:58:09.000000000 +0000
-@@ -179,7 +179,7 @@
-       -I$(top_builddir)/gnome-panel                           \
-       -DPANEL_DEBUG                                           \
-       -DGNOMELOCALEDIR=\""$(prefix)/$(DATADIRNAME)/locale"\"  \
--      -DGLADEDIR=\""$(datadir)/gnome/panel"\"                 \
-+      -DGLADEDIR=\""$(datadir)/gnome/panel2"\"                        \
-       $(DISABLE_DEPRECATED_CFLAGS)                            \
-       $(STANDARD_PROPERTIES_CFLAGS)                           \
-       $(ALLOW_CRACKPOT_MENU_CODE)                             \
-@@ -216,7 +216,7 @@
- bin_PROGRAMS = \
-       gnome-panel                     \
-       gnome-panel-preferences         \
--      gnome-panel-screenshot          \
-+      gnome2-panel-screenshot         \
-       gnome-desktop-item-edit
- 
- 
-@@ -433,7 +433,7 @@
-       $(PNG_LIBS)
- 
- 
--gladedir = $(datadir)/gnome/panel
-+gladedir = $(datadir)/gnome/panel2
- glade_DATA = \
-       gnome-panel-preferences.glade           \
-       gnome-panel-screenshot.glade            \
-@@ -499,7 +499,7 @@
- CONFIG_HEADER = ../config.h
- CONFIG_CLEAN_FILES = 
- bin_PROGRAMS =  gnome-panel$(EXEEXT) gnome-panel-preferences$(EXEEXT) \
--gnome-panel-screenshot$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
-+gnome2-panel-screenshot$(EXEEXT) gnome-desktop-item-edit$(EXEEXT)
- PROGRAMS =  $(bin_PROGRAMS)
- 
- 
-@@ -648,7 +648,7 @@
-       @rm -f gnome-panel-preferences$(EXEEXT)
-       $(LINK) $(gnome_panel_preferences_LDFLAGS) $(gnome_panel_preferences_OBJECTS) $(gnome_panel_preferences_LDADD) $(LIBS)
- 
--gnome-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES)
-+gnome2-panel-screenshot$(EXEEXT): $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_DEPENDENCIES)
-       @rm -f gnome-panel-screenshot$(EXEEXT)
-       $(LINK) $(gnome_panel_screenshot_LDFLAGS) $(gnome_panel_screenshot_OBJECTS) $(gnome_panel_screenshot_LDADD) $(LIBS)
-