Complete the split of gnome-core into multiple packages.

Bump PKGREVISION.

4 files changed, 53 insertions, 893 deletions

diff --git a/x11/gnome-core/Makefile b/x11/gnome-core/Makefile
index c846bf1b7a1..fb34046d910 100644
--- a/x11/gnome-core/Makefile
+++ b/x11/gnome-core/Makefile
@@ -1,18 +1,16 @@
-# $NetBSD: Makefile,v 1.87 2003/02/18 14:56:03 jmmv Exp $
+# $NetBSD: Makefile,v 1.88 2003/04/20 10:43:51 rh Exp $
 #
 
-DISTNAME=		gnome-core-1.4.2
-PKGREVISION=		3
-CATEGORIES=		x11 gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
-EXTRACT_SUFX=		.tar.bz2
+.include "Makefile.common"
 
-MAINTAINER=		rh@netbsd.org
-HOMEPAGE=		http://www.gnome.org/
-COMMENT=		Base component of GNU Network Object Management Environment
+PKGREVISION=		4
+
+COMMENT=		Core component of GNU Network Object Management Environment
 
 DEPENDS+=		gnome1-dirs>=1.0:../../misc/gnome1-dirs
 DEPENDS+=		xscreensaver-gnome>=3.25nb1:../xscreensaver-gnome
+DEPENDS+=		gnome-session>=1.4.2:../../x11/gnome1-session
+DEPENDS+=		gnome-panel>=1.4.2:../../x11/gnome1-panel
 BUILD_DEPENDS+=		gtk-doc>=0.9:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=	YES
 
@@ -21,19 +19,10 @@ BUILD_USES_MSGFMT=	YES
 BUILDLINK_DEPENDS.gnome-pixmaps=gnome{,2}-pixmaps>=1.4.2
 .endif
 
-USE_BUILDLINK2=		YES
-USE_PKGLOCALEDIR=	YES
-USE_X11BASE=		YES
-USE_GMAKE=		YES
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
-LOCALSTATEDIR=		${X11PREFIX}/var/gnome
-
-GNU_CONFIGURE=		YES
-CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
-
-REPLACE_PERL=		help-browser/gnome-convert help-browser/gnome-download
+pre-install:
+.for dir in gsm smproxy panel applets
+	${ECHO} install: >${WRKSRC}/${dir}/Makefile
+.endfor
 
 post-install:
 .for prg in gnome-feedback gnome-terminal # Handled in gnome-dirs: gpl lgpl fdl
@@ -53,5 +42,7 @@ post-install:
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../www/libghttp/buildlink2.mk"
+.include "../../x11/gnome1-session/buildlink2.mk"
+.include "../../x11/gnome1-panel/buildlink2.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-core/Makefile.common b/x11/gnome-core/Makefile.common
new file mode 100644
index 00000000000..47ce4fe6019
--- /dev/null
+++ b/x11/gnome-core/Makefile.common
@@ -0,0 +1,26 @@
+# $NetBSD: Makefile.common,v 1.1 2003/04/20 10:43:51 rh Exp $
+#
+
+DISTNAME=		gnome-core-1.4.2
+CATEGORIES?=		x11 gnome
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-core/1.4/}
+EXTRACT_SUFX=		.tar.bz2
+
+MAINTAINER?=		rh@netbsd.org
+HOMEPAGE?=		http://www.gnome.org/
+
+BUILD_USES_MSGFMT=	YES
+
+USE_BUILDLINK2=		YES
+USE_PKGLOCALEDIR=	YES
+USE_X11BASE=		YES
+USE_GMAKE=		YES
+USE_LIBTOOL=		YES
+LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+
+LOCALSTATEDIR=		${X11PREFIX}/var/gnome
+
+GNU_CONFIGURE=		YES
+CONFIGURE_ARGS+=	--localstatedir=${LOCALSTATEDIR}
+
+REPLACE_PERL=		help-browser/gnome-convert help-browser/gnome-download
diff --git a/x11/gnome-core/PLIST b/x11/gnome-core/PLIST
index a273f907922..efb9a493f07 100644
--- a/x11/gnome-core/PLIST
+++ b/x11/gnome-core/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2003/02/18 14:56:04 jmmv Exp $
-bin/deskguide_applet
+@comment $NetBSD: PLIST,v 1.13 2003/04/20 10:43:51 rh Exp $
 bin/gmenu
 bin/gnome-about
 bin/gnome-convert
@@ -10,59 +9,10 @@ bin/gnome-help-caller
 bin/gnome-hint
 bin/gnome-hint-properties-capplet
 bin/gnome-info2html
-bin/gnome-libice-check
-bin/gnome-login-check
 bin/gnome-man2html
-bin/gnome-panel-add-launcher
-bin/gnome-panel-properties-capplet
-bin/gnome-panel-screenshot
-bin/gnome-session
-bin/gnome-smproxy
 bin/gnome-terminal
-bin/gnome-wm
-bin/panel
-bin/save-session
-bin/session-properties
-bin/session-properties-capplet
-bin/tasklist_applet
-etc/CORBA/servers/deskguide_applet.gnorba
-etc/CORBA/servers/fish_applet.gnorba
-etc/CORBA/servers/gen_util.gnorba
 etc/CORBA/servers/gnome-terminal.gnorba
 etc/CORBA/servers/help-browser.gnorba
-etc/CORBA/servers/panel.gnorba
-etc/CORBA/servers/tasklist_applet.gnorba
-etc/gnome/panel-config/panel
-etc/gnome/panel-config/panel.d/default/Applet_Config
-etc/gnome/panel-config/panel.d/default/panel
-etc/sound/events/mailcheck.soundlist
-etc/sound/events/panel.soundlist
-include/applet-widget.h
-include/gnome-panel.h
-include/status-docklet.h
-lib/appletsConf.sh
-lib/dockletsConf.sh
-lib/libfish_applet.a
-lib/libfish_applet.la
-lib/libfish_applet.so
-lib/libfish_applet.so.0
-lib/libfish_applet.so.0.0
-lib/libgen_util_applet.a
-lib/libgen_util_applet.la
-lib/libgen_util_applet.so
-lib/libgen_util_applet.so.0
-lib/libgen_util_applet.so.0.0
-lib/libpanel_applet.a
-lib/libpanel_applet.la
-lib/libpanel_applet.so
-lib/libpanel_applet.so.0
-lib/libpanel_applet.so.0.1
-lib/libpanel_status.a
-lib/libpanel_status.la
-lib/libpanel_status.so
-lib/libpanel_status.so.0
-lib/libpanel_status.so.0.0
-man/man1/deskguide_applet.1
 man/man1/gmenu.1
 man/man1/gnome-about.1
 man/man1/gnome-convert.1
@@ -71,36 +21,9 @@ man/man1/gnome-edit.1
 man/man1/gnome-hint-properties-capplet.1
 man/man1/gnome-hint.1
 man/man1/gnome-info2html.1
-man/man1/gnome-libice-check.1
-man/man1/gnome-login-check.1
 man/man1/gnome-man2html.1
-man/man1/gnome-panel-add-launcher.1
-man/man1/gnome-panel-properties-capplet.1
-man/man1/gnome-session.1
-man/man1/gnome-smproxy.1
 man/man1/gnome-terminal.1
-man/man1/gnome-wm.1
-man/man1/panel.1
-man/man1/save-session.1
-man/man1/session-properties-capplet.1
-man/man1/session-properties.1
-man/man1/tasklist_applet.1
-man/man5/default.session.5
-share/applets/Amusements/.directory
-share/applets/Amusements/fish_applet.desktop
-share/applets/Clocks/.directory
-share/applets/Clocks/clock_applet.desktop
-share/applets/Monitors/.directory
-share/applets/Multimedia/.directory
-share/applets/Network/.directory
-share/applets/Network/mailcheck_applet.desktop
-share/applets/Utility/.directory
-share/applets/Utility/deskguide_applet.desktop
-share/applets/Utility/printer.desktop
-share/applets/Utility/tasklist_applet.desktop
-share/control-center/Desktop/gnome-panel-properties.desktop
 share/control-center/Session/gnome-hint-properties.desktop
-share/control-center/Session/session-properties.desktop
 share/gnome-about/contributors.dat
 share/gnome-terminal/glade/gnome-terminal.glade
 share/gnome/apps/.directory
@@ -127,12 +50,8 @@ share/gnome/apps/Internet/lynx.desktop
 share/gnome/apps/Multimedia/.directory
 share/gnome/apps/Settings/.directory
 share/gnome/apps/Settings/.order
-share/gnome/apps/Settings/Desktop/gnome-panel-properties.desktop
 share/gnome/apps/Settings/Imlib_config.desktop
 share/gnome/apps/Settings/Session/gnome-hint-properties.desktop
-share/gnome/apps/Settings/Session/save-session.desktop
-share/gnome/apps/Settings/Session/session-properties.desktop
-share/gnome/apps/Settings/Session/session.desktop
 share/gnome/apps/Settings/gmenu.desktop
 share/gnome/apps/System/.directory
 share/gnome/apps/System/Eterm.desktop
@@ -144,101 +63,6 @@ share/gnome/apps/System/gnome-terminal.desktop
 share/gnome/apps/Utilities/.directory
 share/gnome/apps/Utilities/gnome-hint.desktop
 share/gnome/apps/gnome-help.desktop
-share/gnome/default.session
-share/gnome/default.wm
-share/gnome/help/clock_applet/C/clock.sgml
-share/gnome/help/clock_applet/C/clock_applet.sgml
-share/gnome/help/clock_applet/C/figures/clock_applet.png
-share/gnome/help/clock_applet/C/figures/clock_settings.png
-share/gnome/help/clock_applet/C/index.html
-share/gnome/help/clock_applet/C/ln7.html
-share/gnome/help/clock_applet/C/topic.dat
-share/gnome/help/clock_applet/da/clock.sgml
-share/gnome/help/clock_applet/da/clock_applet.sgml
-share/gnome/help/clock_applet/da/figures/clock_applet.png
-share/gnome/help/clock_applet/da/figures/clock_settings.png
-share/gnome/help/clock_applet/da/index.html
-share/gnome/help/clock_applet/da/ln10.html
-share/gnome/help/clock_applet/da/topic.dat
-share/gnome/help/clock_applet/eu/LEGALNOTICE.html
-share/gnome/help/clock_applet/eu/clock.sgml
-share/gnome/help/clock_applet/eu/clock_applet.sgml
-share/gnome/help/clock_applet/eu/figures/clock_applet.png
-share/gnome/help/clock_applet/eu/figures/clock_settings.png
-share/gnome/help/clock_applet/eu/index.html
-share/gnome/help/clock_applet/eu/topic.dat
-share/gnome/help/clock_applet/it/clock.sgml
-share/gnome/help/clock_applet/it/clock_applet.sgml
-share/gnome/help/clock_applet/it/figures/clock_applet.png
-share/gnome/help/clock_applet/it/figures/clock_settings.png
-share/gnome/help/clock_applet/it/index.html
-share/gnome/help/clock_applet/it/ln10.html
-share/gnome/help/clock_applet/it/topic.dat
-share/gnome/help/clock_applet/no/clock.sgml
-share/gnome/help/clock_applet/no/clock_applet.sgml
-share/gnome/help/clock_applet/no/figures/clock_applet.png
-share/gnome/help/clock_applet/no/figures/clock_settings.png
-share/gnome/help/clock_applet/no/index.html
-share/gnome/help/clock_applet/no/ln10.html
-share/gnome/help/clock_applet/no/topic.dat
-share/gnome/help/desk-guide_applet/C/desk-guide.sgml
-share/gnome/help/desk-guide_applet/C/desk-guide_applet.sgml
-share/gnome/help/desk-guide_applet/C/figures/deskguide-fig.png
-share/gnome/help/desk-guide_applet/C/figures/deskguide-properties-advanced-fig.png
-share/gnome/help/desk-guide_applet/C/figures/deskguide-properties-geometry-fig.png
-share/gnome/help/desk-guide_applet/C/figures/deskguide-properties-tasks-fig.png
-share/gnome/help/desk-guide_applet/C/figures/deskguide-properties.png
-share/gnome/help/desk-guide_applet/C/figures/deskguide-tasklist-fig.png
-share/gnome/help/desk-guide_applet/C/index.html
-share/gnome/help/desk-guide_applet/C/ln7.html
-share/gnome/help/desk-guide_applet/C/topic.dat
-share/gnome/help/desk-guide_applet/de/desk-guide.sgml
-share/gnome/help/desk-guide_applet/de/desk-guide_applet.sgml
-share/gnome/help/desk-guide_applet/de/figures/deskguide-fig.png
-share/gnome/help/desk-guide_applet/de/figures/deskguide-properties-advanced-fig.png
-share/gnome/help/desk-guide_applet/de/figures/deskguide-properties-geometry-fig.png
-share/gnome/help/desk-guide_applet/de/figures/deskguide-properties-tasks-fig.png
-share/gnome/help/desk-guide_applet/de/figures/deskguide-properties.png
-share/gnome/help/desk-guide_applet/de/figures/deskguide-tasklist-fig.png
-share/gnome/help/desk-guide_applet/de/index.html
-share/gnome/help/desk-guide_applet/de/ln11.html
-share/gnome/help/desk-guide_applet/de/topic.dat
-share/gnome/help/desk-guide_applet/es/authors.sgml
-share/gnome/help/desk-guide_applet/es/desk-guide.sgml
-share/gnome/help/desk-guide_applet/es/desk-guide_applet.sgml
-share/gnome/help/desk-guide_applet/es/figures/deskguide-fig.png
-share/gnome/help/desk-guide_applet/es/figures/deskguide-properties-advanced-fig.png
-share/gnome/help/desk-guide_applet/es/figures/deskguide-properties-geometry-fig.png
-share/gnome/help/desk-guide_applet/es/figures/deskguide-properties-tasks-fig.png
-share/gnome/help/desk-guide_applet/es/figures/deskguide-properties.png
-share/gnome/help/desk-guide_applet/es/figures/deskguide-tasklist-fig.png
-share/gnome/help/desk-guide_applet/es/index.html
-share/gnome/help/desk-guide_applet/es/licencia-es.sgml
-share/gnome/help/desk-guide_applet/es/licencia-nota-es.sgml
-share/gnome/help/desk-guide_applet/es/license.sgml
-share/gnome/help/desk-guide_applet/es/ln11.html
-share/gnome/help/desk-guide_applet/eu/LEGALNOTICE.html
-share/gnome/help/desk-guide_applet/eu/desk-guide.sgml
-share/gnome/help/desk-guide_applet/eu/desk-guide_applet.sgml
-share/gnome/help/desk-guide_applet/eu/figures/deskguide-fig.png
-share/gnome/help/desk-guide_applet/eu/figures/deskguide-properties-advanced-fig.png
-share/gnome/help/desk-guide_applet/eu/figures/deskguide-properties-geometry-fig.png
-share/gnome/help/desk-guide_applet/eu/figures/deskguide-properties-tasks-fig.png
-share/gnome/help/desk-guide_applet/eu/figures/deskguide-properties.png
-share/gnome/help/desk-guide_applet/eu/figures/deskguide-tasklist-fig.png
-share/gnome/help/desk-guide_applet/eu/index.html
-share/gnome/help/desk-guide_applet/eu/topic.dat
-share/gnome/help/desk-guide_applet/it/desk-guide.sgml
-share/gnome/help/desk-guide_applet/it/desk-guide_applet.sgml
-share/gnome/help/desk-guide_applet/it/figures/deskguide-fig.png
-share/gnome/help/desk-guide_applet/it/figures/deskguide-properties-advanced-fig.png
-share/gnome/help/desk-guide_applet/it/figures/deskguide-properties-geometry-fig.png
-share/gnome/help/desk-guide_applet/it/figures/deskguide-properties-tasks-fig.png
-share/gnome/help/desk-guide_applet/it/figures/deskguide-properties.png
-share/gnome/help/desk-guide_applet/it/figures/deskguide-tasklist-fig.png
-share/gnome/help/desk-guide_applet/it/index.html
-share/gnome/help/desk-guide_applet/it/ln7.html
-share/gnome/help/desk-guide_applet/it/topic.dat
 share/gnome/help/fdl/C/fdl-section1.html
 share/gnome/help/fdl/C/fdl-section10.html
 share/gnome/help/fdl/C/fdl-section2.html
@@ -253,47 +77,6 @@ share/gnome/help/fdl/C/fdl-using.html
 share/gnome/help/fdl/C/fdl.sgml
 share/gnome/help/fdl/C/index.html
 share/gnome/help/fdl/C/ln8.html
-share/gnome/help/fish_applet/C/figures/fish_applet.png
-share/gnome/help/fish_applet/C/figures/fish_settings.png
-share/gnome/help/fish_applet/C/fish.sgml
-share/gnome/help/fish_applet/C/fish_applet.sgml
-share/gnome/help/fish_applet/C/index.html
-share/gnome/help/fish_applet/C/ln7.html
-share/gnome/help/fish_applet/C/topic.dat
-share/gnome/help/fish_applet/da/figures/fish_applet.png
-share/gnome/help/fish_applet/da/figures/fish_settings.png
-share/gnome/help/fish_applet/da/fish.sgml
-share/gnome/help/fish_applet/da/fish_applet.sgml
-share/gnome/help/fish_applet/da/index.html
-share/gnome/help/fish_applet/da/ln10.html
-share/gnome/help/fish_applet/da/topic.dat
-share/gnome/help/fish_applet/eu/LEGALNOTICE.html
-share/gnome/help/fish_applet/eu/figures/fish_applet.png
-share/gnome/help/fish_applet/eu/figures/fish_settings.png
-share/gnome/help/fish_applet/eu/fish.sgml
-share/gnome/help/fish_applet/eu/fish_applet.sgml
-share/gnome/help/fish_applet/eu/index.html
-share/gnome/help/fish_applet/eu/topic.dat
-share/gnome/help/fish_applet/it/figures/fish_applet.png
-share/gnome/help/fish_applet/it/figures/fish_settings.png
-share/gnome/help/fish_applet/it/fish.sgml
-share/gnome/help/fish_applet/it/fish_applet.sgml
-share/gnome/help/fish_applet/it/index.html
-share/gnome/help/fish_applet/it/ln10.html
-share/gnome/help/fish_applet/it/topic.dat
-share/gnome/help/fish_applet/no/figures/fish_applet.png
-share/gnome/help/fish_applet/no/figures/fish_settings.png
-share/gnome/help/fish_applet/no/fish.sgml
-share/gnome/help/fish_applet/no/fish_applet.sgml
-share/gnome/help/fish_applet/no/index.html
-share/gnome/help/fish_applet/no/ln10.html
-share/gnome/help/fish_applet/no/topic.dat
-share/gnome/help/gen_util_applet/de/clock.sgml
-share/gnome/help/gen_util_applet/de/gen_util_applet.sgml
-share/gnome/help/gen_util_applet/de/index.html
-share/gnome/help/gen_util_applet/de/ln7.html
-share/gnome/help/gen_util_applet/de/mailcheck.sgml
-share/gnome/help/gen_util_applet/de/topic.dat
 share/gnome/help/gnome-feedback/C/gnome-feedback.sgml
 share/gnome/help/gnome-feedback/C/index.html
 share/gnome/help/gnome-feedback/C/ln7.html
@@ -461,444 +244,6 @@ share/gnome/help/lgpl/C/ln7.html
 share/gnome/help/lgpl/C/t1.html
 share/gnome/help/lgpl/C/terms.html
 share/gnome/help/lgpl/C/x35.html
-share/gnome/help/mailcheck_applet/C/figures/mailcheck-applet.png
-share/gnome/help/mailcheck_applet/C/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/C/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck_applet/C/index.html
-share/gnome/help/mailcheck_applet/C/ln7.html
-share/gnome/help/mailcheck_applet/C/mailcheck.sgml
-share/gnome/help/mailcheck_applet/C/mailcheck_applet.sgml
-share/gnome/help/mailcheck_applet/C/topic.dat
-share/gnome/help/mailcheck_applet/da/figures/mailcheck-applet.png
-share/gnome/help/mailcheck_applet/da/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/da/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck_applet/da/index.html
-share/gnome/help/mailcheck_applet/da/ln8.html
-share/gnome/help/mailcheck_applet/da/mailcheck.sgml
-share/gnome/help/mailcheck_applet/da/mailcheck_applet.sgml
-share/gnome/help/mailcheck_applet/da/topic.dat
-share/gnome/help/mailcheck_applet/es/authors.sgml
-share/gnome/help/mailcheck_applet/es/figures/mailcheck-applet.png
-share/gnome/help/mailcheck_applet/es/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/es/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck_applet/es/index.html
-share/gnome/help/mailcheck_applet/es/licencia-es.sgml
-share/gnome/help/mailcheck_applet/es/licencia-nota-es.sgml
-share/gnome/help/mailcheck_applet/es/license.sgml
-share/gnome/help/mailcheck_applet/es/ln10.html
-share/gnome/help/mailcheck_applet/es/mailcheck.sgml
-share/gnome/help/mailcheck_applet/es/mailcheck_applet.sgml
-share/gnome/help/mailcheck_applet/es/topic.dat
-share/gnome/help/mailcheck_applet/es/x127.html
-share/gnome/help/mailcheck_applet/eu/LEGALNOTICE.html
-share/gnome/help/mailcheck_applet/eu/figures/mailcheck-applet.png
-share/gnome/help/mailcheck_applet/eu/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/eu/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck_applet/eu/index.html
-share/gnome/help/mailcheck_applet/eu/mailcheck.sgml
-share/gnome/help/mailcheck_applet/eu/mailcheck_applet.sgml
-share/gnome/help/mailcheck_applet/eu/topic.dat
-share/gnome/help/mailcheck_applet/it/figures/mailcheck-applet.png
-share/gnome/help/mailcheck_applet/it/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/it/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck_applet/it/index.html
-share/gnome/help/mailcheck_applet/it/ln10.html
-share/gnome/help/mailcheck_applet/it/mailcheck.sgml
-share/gnome/help/mailcheck_applet/it/mailcheck_applet.sgml
-share/gnome/help/mailcheck_applet/it/topic.dat
-share/gnome/help/mailcheck_applet/no/figures/mailcheck-applet.png
-share/gnome/help/mailcheck_applet/no/figures/mailcheck-properties-mailbox.png
-share/gnome/help/mailcheck_applet/no/figures/mailcheck-properties-mailcheck.png
-share/gnome/help/mailcheck_applet/no/index.html
-share/gnome/help/mailcheck_applet/no/ln10.html
-share/gnome/help/mailcheck_applet/no/mailcheck.sgml
-share/gnome/help/mailcheck_applet/no/mailcheck_applet.sgml
-share/gnome/help/mailcheck_applet/no/topic.dat
-share/gnome/help/panel/C/LEGALNOTICE.html
-share/gnome/help/panel/C/appletadd.html
-share/gnome/help/panel/C/applets.html
-share/gnome/help/panel/C/authors.html
-share/gnome/help/panel/C/drawers.html
-share/gnome/help/panel/C/figures/create_launcher.png
-share/gnome/help/panel/C/figures/drawer_open.png
-share/gnome/help/panel/C/figures/drawer_properties.png
-share/gnome/help/panel/C/figures/example_menu.png
-share/gnome/help/panel/C/figures/example_panel.png
-share/gnome/help/panel/C/figures/glob_pref_anim.png
-share/gnome/help/panel/C/figures/hide-button.png
-share/gnome/help/panel/C/figures/launcher_advprops.png
-share/gnome/help/panel/C/figures/launcher_props.png
-share/gnome/help/panel/C/figures/logout-screen.png
-share/gnome/help/panel/C/figures/menu_properties.png
-share/gnome/help/panel/C/figures/mm-button.png
-share/gnome/help/panel/C/figures/panel_applets.png
-share/gnome/help/panel/C/figures/panel_lockbut.png
-share/gnome/help/panel/C/figures/panel_logoutbut.png
-share/gnome/help/panel/C/figures/panel_props_back.png
-share/gnome/help/panel/C/figures/panel_props_edge.png
-share/gnome/help/panel/C/figures/panel_swallow.png
-share/gnome/help/panel/C/figures/status_dock.png
-share/gnome/help/panel/C/globalpanelprefs.html
-share/gnome/help/panel/C/index.html
-share/gnome/help/panel/C/launchers.html
-share/gnome/help/panel/C/license.html
-share/gnome/help/panel/C/ln9.html
-share/gnome/help/panel/C/mainmenu.html
-share/gnome/help/panel/C/menus.html
-share/gnome/help/panel/C/panel.sgml
-share/gnome/help/panel/C/panelbasics.html
-share/gnome/help/panel/C/panelbugs.html
-share/gnome/help/panel/C/panelmove.html
-share/gnome/help/panel/C/panelproperties.html
-share/gnome/help/panel/C/specialobjects.html
-share/gnome/help/panel/C/topic.dat
-share/gnome/help/panel/de/LEGALNOTICE.html
-share/gnome/help/panel/de/appletadd.html
-share/gnome/help/panel/de/applets.html
-share/gnome/help/panel/de/authors.html
-share/gnome/help/panel/de/drawers.html
-share/gnome/help/panel/de/figures/create_launcher.png
-share/gnome/help/panel/de/figures/drawer_open.png
-share/gnome/help/panel/de/figures/drawer_properties.png
-share/gnome/help/panel/de/figures/example_menu.png
-share/gnome/help/panel/de/figures/example_panel.png
-share/gnome/help/panel/de/figures/glob_pref_anim.png
-share/gnome/help/panel/de/figures/hide-button.png
-share/gnome/help/panel/de/figures/launcher_advprops.png
-share/gnome/help/panel/de/figures/launcher_props.png
-share/gnome/help/panel/de/figures/logout-screen.png
-share/gnome/help/panel/de/figures/menu_properties.png
-share/gnome/help/panel/de/figures/mm-button.png
-share/gnome/help/panel/de/figures/panel_applets.png
-share/gnome/help/panel/de/figures/panel_lockbut.png
-share/gnome/help/panel/de/figures/panel_logoutbut.png
-share/gnome/help/panel/de/figures/panel_props_back.png
-share/gnome/help/panel/de/figures/panel_props_edge.png
-share/gnome/help/panel/de/figures/panel_swallow.png
-share/gnome/help/panel/de/figures/status_dock.png
-share/gnome/help/panel/de/globalpanelprefs.html
-share/gnome/help/panel/de/index.html
-share/gnome/help/panel/de/launchers.html
-share/gnome/help/panel/de/ln7.html
-share/gnome/help/panel/de/mainmenu.html
-share/gnome/help/panel/de/menus.html
-share/gnome/help/panel/de/panel.sgml
-share/gnome/help/panel/de/panelbasics.html
-share/gnome/help/panel/de/panelbugs.html
-share/gnome/help/panel/de/panelmove.html
-share/gnome/help/panel/de/panelproperties.html
-share/gnome/help/panel/de/specialobjects.html
-share/gnome/help/panel/de/topic.dat
-share/gnome/help/panel/es/appletadd.html
-share/gnome/help/panel/es/applets.html
-share/gnome/help/panel/es/authors.sgml
-share/gnome/help/panel/es/drawers.html
-share/gnome/help/panel/es/figures/create_launcher.png
-share/gnome/help/panel/es/figures/drawer_open.png
-share/gnome/help/panel/es/figures/drawer_properties.png
-share/gnome/help/panel/es/figures/example_menu.png
-share/gnome/help/panel/es/figures/example_panel.png
-share/gnome/help/panel/es/figures/glob_pref_anim.png
-share/gnome/help/panel/es/figures/hide-button.png
-share/gnome/help/panel/es/figures/launcher_advprops.png
-share/gnome/help/panel/es/figures/launcher_props.png
-share/gnome/help/panel/es/figures/logout-screen.png
-share/gnome/help/panel/es/figures/menu_properties.png
-share/gnome/help/panel/es/figures/mm-button.png
-share/gnome/help/panel/es/figures/panel_applets.png
-share/gnome/help/panel/es/figures/panel_lockbut.png
-share/gnome/help/panel/es/figures/panel_logoutbut.png
-share/gnome/help/panel/es/figures/panel_props_back.png
-share/gnome/help/panel/es/figures/panel_props_edge.png
-share/gnome/help/panel/es/figures/panel_swallow.png
-share/gnome/help/panel/es/figures/status_dock.png
-share/gnome/help/panel/es/globalpanelprefs.html
-share/gnome/help/panel/es/index.html
-share/gnome/help/panel/es/launchers.html
-share/gnome/help/panel/es/licencia-es.sgml
-share/gnome/help/panel/es/licencia-nota-es.sgml
-share/gnome/help/panel/es/license.sgml
-share/gnome/help/panel/es/ln12.html
-share/gnome/help/panel/es/mainmenu.html
-share/gnome/help/panel/es/menus.html
-share/gnome/help/panel/es/panel.sgml
-share/gnome/help/panel/es/panelbasics.html
-share/gnome/help/panel/es/panelbugs.html
-share/gnome/help/panel/es/panelmove.html
-share/gnome/help/panel/es/panelproperties.html
-share/gnome/help/panel/es/specialobjects.html
-share/gnome/help/panel/es/topic.dat
-share/gnome/help/panel/es/x1234.html
-share/gnome/help/panel/eu/LEGALNOTICE.html
-share/gnome/help/panel/eu/appletadd.html
-share/gnome/help/panel/eu/applets.html
-share/gnome/help/panel/eu/authors.html
-share/gnome/help/panel/eu/drawers.html
-share/gnome/help/panel/eu/figures/create_launcher.png
-share/gnome/help/panel/eu/figures/drawer_open.png
-share/gnome/help/panel/eu/figures/drawer_properties.png
-share/gnome/help/panel/eu/figures/example_menu.png
-share/gnome/help/panel/eu/figures/example_panel.png
-share/gnome/help/panel/eu/figures/glob_pref_anim.png
-share/gnome/help/panel/eu/figures/hide-button.png
-share/gnome/help/panel/eu/figures/launcher_advprops.png
-share/gnome/help/panel/eu/figures/launcher_props.png
-share/gnome/help/panel/eu/figures/logout-screen.png
-share/gnome/help/panel/eu/figures/menu_properties.png
-share/gnome/help/panel/eu/figures/mm-button.png
-share/gnome/help/panel/eu/figures/panel_applets.png
-share/gnome/help/panel/eu/figures/panel_lockbut.png
-share/gnome/help/panel/eu/figures/panel_logoutbut.png
-share/gnome/help/panel/eu/figures/panel_props_back.png
-share/gnome/help/panel/eu/figures/panel_props_edge.png
-share/gnome/help/panel/eu/figures/panel_swallow.png
-share/gnome/help/panel/eu/figures/status_dock.png
-share/gnome/help/panel/eu/globalpanelprefs.html
-share/gnome/help/panel/eu/index.html
-share/gnome/help/panel/eu/launchers.html
-share/gnome/help/panel/eu/license.html
-share/gnome/help/panel/eu/mainmenu.html
-share/gnome/help/panel/eu/menus.html
-share/gnome/help/panel/eu/panel.sgml
-share/gnome/help/panel/eu/panelbasics.html
-share/gnome/help/panel/eu/panelbugs.html
-share/gnome/help/panel/eu/panelmove.html
-share/gnome/help/panel/eu/panelproperties.html
-share/gnome/help/panel/eu/specialobjects.html
-share/gnome/help/panel/eu/topic.dat
-share/gnome/help/panel/it/figures/create_launcher.png
-share/gnome/help/panel/it/figures/drawer_open.png
-share/gnome/help/panel/it/figures/drawer_properties.png
-share/gnome/help/panel/it/figures/example_menu.png
-share/gnome/help/panel/it/figures/example_panel.png
-share/gnome/help/panel/it/figures/glob_pref_anim.png
-share/gnome/help/panel/it/figures/hide-button.png
-share/gnome/help/panel/it/figures/launcher_advprops.png
-share/gnome/help/panel/it/figures/launcher_properties_advanced.png
-share/gnome/help/panel/it/figures/launcher_properties_basic.png
-share/gnome/help/panel/it/figures/launcher_props.png
-share/gnome/help/panel/it/figures/mainmenu_properties.png
-share/gnome/help/panel/it/figures/menu_properties.png
-share/gnome/help/panel/it/figures/mm-button.png
-share/gnome/help/panel/it/figures/panel_applets.png
-share/gnome/help/panel/it/figures/panel_lockbut.png
-share/gnome/help/panel/it/figures/panel_logoutbut.png
-share/gnome/help/panel/it/figures/panel_props_back.png
-share/gnome/help/panel/it/figures/panel_props_edge.png
-share/gnome/help/panel/it/figures/panel_runbutton.png
-share/gnome/help/panel/it/figures/panel_runprogram.png
-share/gnome/help/panel/it/figures/panel_swallow.png
-share/gnome/help/panel/it/figures/status_dock.png
-share/gnome/help/panel/it/index.html
-share/gnome/help/panel/it/ln9.html
-share/gnome/help/panel/it/panel.sgml
-share/gnome/help/panel/it/panelbasics.html
-share/gnome/help/panel/it/topic.dat
-share/gnome/help/panel/ja/appletadd.html
-share/gnome/help/panel/ja/applets.html
-share/gnome/help/panel/ja/authors.html
-share/gnome/help/panel/ja/drawers.html
-share/gnome/help/panel/ja/figures/create_launcher.png
-share/gnome/help/panel/ja/figures/drawer_open.png
-share/gnome/help/panel/ja/figures/drawer_properties.png
-share/gnome/help/panel/ja/figures/example_menu.png
-share/gnome/help/panel/ja/figures/example_panel.png
-share/gnome/help/panel/ja/figures/glob_pref_anim.png
-share/gnome/help/panel/ja/figures/hide-button.png
-share/gnome/help/panel/ja/figures/launcher_advprops.png
-share/gnome/help/panel/ja/figures/launcher_props.png
-share/gnome/help/panel/ja/figures/logout-screen.png
-share/gnome/help/panel/ja/figures/menu_properties.png
-share/gnome/help/panel/ja/figures/mm-button.png
-share/gnome/help/panel/ja/figures/panel_applets.png
-share/gnome/help/panel/ja/figures/panel_lockbut.png
-share/gnome/help/panel/ja/figures/panel_logoutbut.png
-share/gnome/help/panel/ja/figures/panel_props_back.png
-share/gnome/help/panel/ja/figures/panel_props_edge.png
-share/gnome/help/panel/ja/figures/panel_swallow.png
-share/gnome/help/panel/ja/figures/status_dock.png
-share/gnome/help/panel/ja/globalpanelprefs.html
-share/gnome/help/panel/ja/index.html
-share/gnome/help/panel/ja/launchers.html
-share/gnome/help/panel/ja/license.html
-share/gnome/help/panel/ja/ln10.html
-share/gnome/help/panel/ja/mainmenu.html
-share/gnome/help/panel/ja/menus.html
-share/gnome/help/panel/ja/panel.sgml
-share/gnome/help/panel/ja/panelbasics.html
-share/gnome/help/panel/ja/panelbugs.html
-share/gnome/help/panel/ja/panelmove.html
-share/gnome/help/panel/ja/panelproperties.html
-share/gnome/help/panel/ja/specialobjects.html
-share/gnome/help/panel/ja/topic.dat
-share/gnome/help/panel/no/appletadd.html
-share/gnome/help/panel/no/applets.html
-share/gnome/help/panel/no/authors.html
-share/gnome/help/panel/no/drawers.html
-share/gnome/help/panel/no/figures/create_launcher.png
-share/gnome/help/panel/no/figures/drawer_open.png
-share/gnome/help/panel/no/figures/drawer_properties.png
-share/gnome/help/panel/no/figures/example_menu.png
-share/gnome/help/panel/no/figures/example_panel.png
-share/gnome/help/panel/no/figures/glob_pref_anim.png
-share/gnome/help/panel/no/figures/hide-button.png
-share/gnome/help/panel/no/figures/launcher_advprops.png
-share/gnome/help/panel/no/figures/launcher_props.png
-share/gnome/help/panel/no/figures/logout-screen.png
-share/gnome/help/panel/no/figures/menu_properties.png
-share/gnome/help/panel/no/figures/mm-button.png
-share/gnome/help/panel/no/figures/panel_applets.png
-share/gnome/help/panel/no/figures/panel_lockbut.png
-share/gnome/help/panel/no/figures/panel_logoutbut.png
-share/gnome/help/panel/no/figures/panel_props_back.png
-share/gnome/help/panel/no/figures/panel_props_edge.png
-share/gnome/help/panel/no/figures/panel_swallow.png
-share/gnome/help/panel/no/figures/status_dock.png
-share/gnome/help/panel/no/globalpanelprefs.html
-share/gnome/help/panel/no/index.html
-share/gnome/help/panel/no/launchers.html
-share/gnome/help/panel/no/ln9.html
-share/gnome/help/panel/no/mainmenu.html
-share/gnome/help/panel/no/menus.html
-share/gnome/help/panel/no/panel.sgml
-share/gnome/help/panel/no/panelbasics.html
-share/gnome/help/panel/no/panelbugs.html
-share/gnome/help/panel/no/panelmove.html
-share/gnome/help/panel/no/panelproperties.html
-share/gnome/help/panel/no/specialobjects.html
-share/gnome/help/panel/no/topic.dat
-share/gnome/help/printer_applet/C/figures/printer-fig.png
-share/gnome/help/printer_applet/C/figures/printer-properties.png
-share/gnome/help/printer_applet/C/index.html
-share/gnome/help/printer_applet/C/ln7.html
-share/gnome/help/printer_applet/C/printer.sgml
-share/gnome/help/printer_applet/C/printer_applet.sgml
-share/gnome/help/printer_applet/C/topic.dat
-share/gnome/help/printer_applet/da/figures/printer-fig.png
-share/gnome/help/printer_applet/da/figures/printer-properties.png
-share/gnome/help/printer_applet/da/index.html
-share/gnome/help/printer_applet/da/ln10.html
-share/gnome/help/printer_applet/da/printer.sgml
-share/gnome/help/printer_applet/da/printer_applet.sgml
-share/gnome/help/printer_applet/da/topic.dat
-share/gnome/help/printer_applet/es/authors.sgml
-share/gnome/help/printer_applet/es/figures/printer-fig.png
-share/gnome/help/printer_applet/es/figures/printer-properties.png
-share/gnome/help/printer_applet/es/index.html
-share/gnome/help/printer_applet/es/licencia-es.sgml
-share/gnome/help/printer_applet/es/licencia-nota-es.sgml
-share/gnome/help/printer_applet/es/license.sgml
-share/gnome/help/printer_applet/es/ln10.html
-share/gnome/help/printer_applet/es/printer.sgml
-share/gnome/help/printer_applet/es/printer_applet.sgml
-share/gnome/help/printer_applet/es/topic.dat
-share/gnome/help/printer_applet/eu/LEGALNOTICE.html
-share/gnome/help/printer_applet/eu/figures/printer-fig.png
-share/gnome/help/printer_applet/eu/figures/printer-properties.png
-share/gnome/help/printer_applet/eu/index.html
-share/gnome/help/printer_applet/eu/printer.sgml
-share/gnome/help/printer_applet/eu/printer_applet.sgml
-share/gnome/help/printer_applet/eu/topic.dat
-share/gnome/help/printer_applet/it/figures/printer-fig.png
-share/gnome/help/printer_applet/it/figures/printer-properties.png
-share/gnome/help/printer_applet/it/index.html
-share/gnome/help/printer_applet/it/ln10.html
-share/gnome/help/printer_applet/it/printer.sgml
-share/gnome/help/printer_applet/it/printer_applet.sgml
-share/gnome/help/printer_applet/it/topic.dat
-share/gnome/help/printer_applet/no/figures/printer-fig.png
-share/gnome/help/printer_applet/no/figures/printer-properties.png
-share/gnome/help/printer_applet/no/index.html
-share/gnome/help/printer_applet/no/ln7.html
-share/gnome/help/printer_applet/no/printer.sgml
-share/gnome/help/printer_applet/no/printer_applet.sgml
-share/gnome/help/printer_applet/no/topic.dat
-share/gnome/help/session/C/LEGALNOTICE.html
-share/gnome/help/session/C/authors.html
-share/gnome/help/session/C/bugs.html
-share/gnome/help/session/C/figures/button_remove.png
-share/gnome/help/session/C/figures/session-properties.png
-share/gnome/help/session/C/figures/stock_exec.png
-share/gnome/help/session/C/figures/stock_help.png
-share/gnome/help/session/C/figures/stock_preferences.png
-share/gnome/help/session/C/figures/stock_refresh.png
-share/gnome/help/session/C/figures/stock_save.png
-share/gnome/help/session/C/figures/stock_timer.png
-share/gnome/help/session/C/figures/stock_trash.png
-share/gnome/help/session/C/index.html
-share/gnome/help/session/C/license.html
-share/gnome/help/session/C/session.sgml
-share/gnome/help/session/ja/authors.html
-share/gnome/help/session/ja/bugs.html
-share/gnome/help/session/ja/figures/button_remove.png
-share/gnome/help/session/ja/figures/session-properties.png
-share/gnome/help/session/ja/figures/stock_exec.png
-share/gnome/help/session/ja/figures/stock_help.png
-share/gnome/help/session/ja/figures/stock_preferences.png
-share/gnome/help/session/ja/figures/stock_refresh.png
-share/gnome/help/session/ja/figures/stock_save.png
-share/gnome/help/session/ja/figures/stock_timer.png
-share/gnome/help/session/ja/figures/stock_trash.png
-share/gnome/help/session/ja/index.html
-share/gnome/help/session/ja/ln10.html
-share/gnome/help/session/ja/session.sgml
-share/gnome/help/tasklist_applet/C/figures/tasklist-fig.png
-share/gnome/help/tasklist_applet/C/figures/tasklist-properties-size.png
-share/gnome/help/tasklist_applet/C/figures/tasklist-properties.png
-share/gnome/help/tasklist_applet/C/figures/tasklist-rightclick-fig.png
-share/gnome/help/tasklist_applet/C/index.html
-share/gnome/help/tasklist_applet/C/ln7.html
-share/gnome/help/tasklist_applet/C/tasklist.sgml
-share/gnome/help/tasklist_applet/C/tasklist_applet.sgml
-share/gnome/help/tasklist_applet/C/topic.dat
-share/gnome/help/tasklist_applet/es/figures/tasklist-fig.png
-share/gnome/help/tasklist_applet/es/figures/tasklist-properties-size.png
-share/gnome/help/tasklist_applet/es/figures/tasklist-properties.png
-share/gnome/help/tasklist_applet/es/figures/tasklist-rightclick-fig.png
-share/gnome/help/tasklist_applet/es/index.html
-share/gnome/help/tasklist_applet/es/ln10.html
-share/gnome/help/tasklist_applet/es/tasklist.sgml
-share/gnome/help/tasklist_applet/es/tasklist_applet.sgml
-share/gnome/help/tasklist_applet/es/topic.dat
-share/gnome/help/tasklist_applet/es/x210.html
-share/gnome/help/tasklist_applet/eu/LEGALNOTICE.html
-share/gnome/help/tasklist_applet/eu/figures/tasklist-fig.png
-share/gnome/help/tasklist_applet/eu/figures/tasklist-properties-size.png
-share/gnome/help/tasklist_applet/eu/figures/tasklist-properties.png
-share/gnome/help/tasklist_applet/eu/figures/tasklist-rightclick-fig.png
-share/gnome/help/tasklist_applet/eu/index.html
-share/gnome/help/tasklist_applet/eu/tasklist.sgml
-share/gnome/help/tasklist_applet/eu/tasklist_applet.sgml
-share/gnome/help/tasklist_applet/eu/topic.dat
-share/gnome/hints/panel.hints
-share/gnome/html/panel-decl.txt
-share/gnome/html/panel-sections.txt
-share/gnome/html/panel.hierarchy
-share/gnome/html/panel.html
-share/gnome/html/panel.sgml
-share/gnome/html/panel.signals
-share/gnome/html/panel.types
-share/gnome/html/panel/appletwidget.html
-share/gnome/html/panel/index.html
-share/gnome/html/panel/panel-context-menu.html
-share/gnome/html/panel/panel-miscellaneous.html
-share/gnome/html/panel/panel-panel-interaction.html
-share/gnome/html/panel/r1373.html
-share/gnome/html/panel/r160.html
-share/gnome/html/panel/statusdocklet.html
-share/gnome/html/panel/unnamed1.html
-share/gnome/html/panel/unnamed10.html
-share/gnome/html/panel/unnamed11.html
-share/gnome/html/panel/unnamed12.html
-share/gnome/html/panel/unnamed13.html
-share/gnome/html/panel/unnamed14.html
-share/gnome/html/panel/unnamed15.html
-share/gnome/html/panel/unnamed16.html
-share/gnome/html/panel/unnamed3.html
-share/gnome/html/panel/unnamed4.html
-share/gnome/html/panel/unnamed5.html
-share/gnome/html/panel/unnamed6.html
-share/gnome/panel/gnome-panel-screenshot.glade
 share/idl/Terminal.idl
 share/idl/gnome-panel.idl
 share/idl/help-browser.idl
@@ -1020,134 +365,11 @@ share/omf/gnome-core/session-ja.omf
 share/omf/gnome-core/tasklist_applet-C.omf
 share/omf/gnome-core/tasklist_applet-es.omf
 share/omf/gnome-core/tasklist_applet-eu.omf
-share/pixmaps/fish/fishanim.png
-share/pixmaps/fish/footguy.png
-share/pixmaps/fish/monkey.png
-share/pixmaps/fish/oldwanda.png
-share/pixmaps/gnome-deskguide-splash.png
-share/pixmaps/gnome-deskguide.png
-share/pixmaps/gnome-fish.png
 share/pixmaps/gnome-hint.png
-share/pixmaps/gnome-tasklist.png
-share/pixmaps/mailcheck/eclouds.png
-share/pixmaps/mailcheck/email-e.png
-share/pixmaps/mailcheck/email-eclouds.png
-share/pixmaps/mailcheck/email-tiny.png
-share/pixmaps/mailcheck/email.png
-share/pixmaps/mailcheck/tux-anim.png
-share/pixmaps/splash/gnome-splash-1.4.0.png
-share/pixmaps/splash/gnome-splash.png
-@dirrm share/pixmaps/splash
-@dirrm share/pixmaps/mailcheck
-@dirrm share/pixmaps/fish
 @dirrm share/omf/gnome-core
 @comment in scrollkeeper: @dirrm share/omf
 @unexec ${RMDIR} %D/share/mc/templates 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/mc 2>/dev/null || ${TRUE}
-@dirrm share/gnome/panel
-@dirrm share/gnome/html/panel
-@dirrm share/gnome/hints
-@exec ${MKDIR} %D/share/gnome/help/tasklist_applet/eu/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/eu/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/eu/figures
-@dirrm share/gnome/help/tasklist_applet/eu
-@exec ${MKDIR} %D/share/gnome/help/tasklist_applet/es/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/es/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/es/figures
-@dirrm share/gnome/help/tasklist_applet/es
-@exec ${MKDIR} %D/share/gnome/help/tasklist_applet/C/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/C/stylesheet-images
-@dirrm share/gnome/help/tasklist_applet/C/figures
-@dirrm share/gnome/help/tasklist_applet/C
-@dirrm share/gnome/help/tasklist_applet
-@exec ${MKDIR} %D/share/gnome/help/session/ja/stylesheet-images
-@dirrm share/gnome/help/session/ja/stylesheet-images
-@dirrm share/gnome/help/session/ja/figures
-@dirrm share/gnome/help/session/ja
-@exec ${MKDIR} %D/share/gnome/help/session/C/stylesheet-images
-@dirrm share/gnome/help/session/C/stylesheet-images
-@dirrm share/gnome/help/session/C/figures
-@dirrm share/gnome/help/session/C
-@dirrm share/gnome/help/session
-@exec ${MKDIR} %D/share/gnome/help/printer_applet/no/stylesheet-images
-@dirrm share/gnome/help/printer_applet/no/stylesheet-images
-@dirrm share/gnome/help/printer_applet/no/figures
-@dirrm share/gnome/help/printer_applet/no
-@exec ${MKDIR} %D/share/gnome/help/printer_applet/it/stylesheet-images
-@dirrm share/gnome/help/printer_applet/it/stylesheet-images
-@dirrm share/gnome/help/printer_applet/it/figures
-@dirrm share/gnome/help/printer_applet/it
-@exec ${MKDIR} %D/share/gnome/help/printer_applet/eu/stylesheet-images
-@dirrm share/gnome/help/printer_applet/eu/stylesheet-images
-@dirrm share/gnome/help/printer_applet/eu/figures
-@dirrm share/gnome/help/printer_applet/eu
-@exec ${MKDIR} %D/share/gnome/help/printer_applet/es/stylesheet-images
-@dirrm share/gnome/help/printer_applet/es/stylesheet-images
-@dirrm share/gnome/help/printer_applet/es/figures
-@dirrm share/gnome/help/printer_applet/es
-@exec ${MKDIR} %D/share/gnome/help/printer_applet/da/stylesheet-images
-@dirrm share/gnome/help/printer_applet/da/stylesheet-images
-@dirrm share/gnome/help/printer_applet/da/figures
-@dirrm share/gnome/help/printer_applet/da
-@exec ${MKDIR} %D/share/gnome/help/printer_applet/C/stylesheet-images
-@dirrm share/gnome/help/printer_applet/C/stylesheet-images
-@dirrm share/gnome/help/printer_applet/C/figures
-@dirrm share/gnome/help/printer_applet/C
-@dirrm share/gnome/help/printer_applet
-@exec ${MKDIR} %D/share/gnome/help/panel/no/stylesheet-images
-@dirrm share/gnome/help/panel/no/stylesheet-images
-@dirrm share/gnome/help/panel/no/figures
-@dirrm share/gnome/help/panel/no
-@exec ${MKDIR} %D/share/gnome/help/panel/ja/stylesheet-images
-@dirrm share/gnome/help/panel/ja/stylesheet-images
-@dirrm share/gnome/help/panel/ja/figures
-@dirrm share/gnome/help/panel/ja
-@exec ${MKDIR} %D/share/gnome/help/panel/it/stylesheet-images
-@dirrm share/gnome/help/panel/it/stylesheet-images
-@dirrm share/gnome/help/panel/it/figures
-@dirrm share/gnome/help/panel/it
-@exec ${MKDIR} %D/share/gnome/help/panel/eu/stylesheet-images
-@dirrm share/gnome/help/panel/eu/stylesheet-images
-@dirrm share/gnome/help/panel/eu/figures
-@dirrm share/gnome/help/panel/eu
-@exec ${MKDIR} %D/share/gnome/help/panel/es/stylesheet-images
-@dirrm share/gnome/help/panel/es/stylesheet-images
-@dirrm share/gnome/help/panel/es/figures
-@dirrm share/gnome/help/panel/es
-@exec ${MKDIR} %D/share/gnome/help/panel/de/stylesheet-images
-@dirrm share/gnome/help/panel/de/stylesheet-images
-@dirrm share/gnome/help/panel/de/figures
-@dirrm share/gnome/help/panel/de
-@exec ${MKDIR} %D/share/gnome/help/panel/C/stylesheet-images
-@dirrm share/gnome/help/panel/C/stylesheet-images
-@dirrm share/gnome/help/panel/C/figures
-@dirrm share/gnome/help/panel/C
-@dirrm share/gnome/help/panel
-@exec ${MKDIR} %D/share/gnome/help/mailcheck_applet/no/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/no/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/no/figures
-@dirrm share/gnome/help/mailcheck_applet/no
-@exec ${MKDIR} %D/share/gnome/help/mailcheck_applet/it/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/it/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/it/figures
-@dirrm share/gnome/help/mailcheck_applet/it
-@exec ${MKDIR} %D/share/gnome/help/mailcheck_applet/eu/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/eu/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/eu/figures
-@dirrm share/gnome/help/mailcheck_applet/eu
-@exec ${MKDIR} %D/share/gnome/help/mailcheck_applet/es/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/es/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/es/figures
-@dirrm share/gnome/help/mailcheck_applet/es
-@exec ${MKDIR} %D/share/gnome/help/mailcheck_applet/da/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/da/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/da/figures
-@dirrm share/gnome/help/mailcheck_applet/da
-@exec ${MKDIR} %D/share/gnome/help/mailcheck_applet/C/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/C/stylesheet-images
-@dirrm share/gnome/help/mailcheck_applet/C/figures
-@dirrm share/gnome/help/mailcheck_applet/C
-@dirrm share/gnome/help/mailcheck_applet
 @exec ${MKDIR} %D/share/gnome/help/lgpl/C/stylesheet-images
 @dirrm share/gnome/help/lgpl/C/stylesheet-images
 @comment in gnome1-dirs: @dirrm share/gnome/help/lgpl/C
@@ -1205,79 +427,10 @@ share/pixmaps/splash/gnome-splash.png
 @dirrm share/gnome/help/gnome-feedback/C/stylesheet-images
 @dirrm share/gnome/help/gnome-feedback/C
 @dirrm share/gnome/help/gnome-feedback
-@exec ${MKDIR} %D/share/gnome/help/gen_util_applet/de/stylesheet-images
-@dirrm share/gnome/help/gen_util_applet/de/stylesheet-images
-@exec ${MKDIR} %D/share/gnome/help/gen_util_applet/de/figures
-@dirrm share/gnome/help/gen_util_applet/de/figures
-@dirrm share/gnome/help/gen_util_applet/de
-@dirrm share/gnome/help/gen_util_applet
-@exec ${MKDIR} %D/share/gnome/help/fish_applet/no/stylesheet-images
-@dirrm share/gnome/help/fish_applet/no/stylesheet-images
-@dirrm share/gnome/help/fish_applet/no/figures
-@dirrm share/gnome/help/fish_applet/no
-@exec ${MKDIR} %D/share/gnome/help/fish_applet/it/stylesheet-images
-@dirrm share/gnome/help/fish_applet/it/stylesheet-images
-@dirrm share/gnome/help/fish_applet/it/figures
-@dirrm share/gnome/help/fish_applet/it
-@exec ${MKDIR} %D/share/gnome/help/fish_applet/eu/stylesheet-images
-@dirrm share/gnome/help/fish_applet/eu/stylesheet-images
-@dirrm share/gnome/help/fish_applet/eu/figures
-@dirrm share/gnome/help/fish_applet/eu
-@exec ${MKDIR} %D/share/gnome/help/fish_applet/da/stylesheet-images
-@dirrm share/gnome/help/fish_applet/da/stylesheet-images
-@dirrm share/gnome/help/fish_applet/da/figures
-@dirrm share/gnome/help/fish_applet/da
-@exec ${MKDIR} %D/share/gnome/help/fish_applet/C/stylesheet-images
-@dirrm share/gnome/help/fish_applet/C/stylesheet-images
-@dirrm share/gnome/help/fish_applet/C/figures
-@dirrm share/gnome/help/fish_applet/C
-@dirrm share/gnome/help/fish_applet
 @exec ${MKDIR} %D/share/gnome/help/fdl/C/stylesheet-images
 @dirrm share/gnome/help/fdl/C/stylesheet-images
 @comment in gnome1-dirs: @dirrm share/gnome/help/fdl/C
 @comment in gnome1-dirs: @dirrm share/gnome/help/fdl
-@exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/it/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/it/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/it/figures
-@dirrm share/gnome/help/desk-guide_applet/it
-@exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/eu/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/eu/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/eu/figures
-@dirrm share/gnome/help/desk-guide_applet/eu
-@exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/es/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/es/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/es/figures
-@dirrm share/gnome/help/desk-guide_applet/es
-@exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/de/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/de/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/de/figures
-@dirrm share/gnome/help/desk-guide_applet/de
-@exec ${MKDIR} %D/share/gnome/help/desk-guide_applet/C/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/C/stylesheet-images
-@dirrm share/gnome/help/desk-guide_applet/C/figures
-@dirrm share/gnome/help/desk-guide_applet/C
-@dirrm share/gnome/help/desk-guide_applet
-@exec ${MKDIR} %D/share/gnome/help/clock_applet/no/stylesheet-images
-@dirrm share/gnome/help/clock_applet/no/stylesheet-images
-@dirrm share/gnome/help/clock_applet/no/figures
-@dirrm share/gnome/help/clock_applet/no
-@exec ${MKDIR} %D/share/gnome/help/clock_applet/it/stylesheet-images
-@dirrm share/gnome/help/clock_applet/it/stylesheet-images
-@dirrm share/gnome/help/clock_applet/it/figures
-@dirrm share/gnome/help/clock_applet/it
-@exec ${MKDIR} %D/share/gnome/help/clock_applet/eu/stylesheet-images
-@dirrm share/gnome/help/clock_applet/eu/stylesheet-images
-@dirrm share/gnome/help/clock_applet/eu/figures
-@dirrm share/gnome/help/clock_applet/eu
-@exec ${MKDIR} %D/share/gnome/help/clock_applet/da/stylesheet-images
-@dirrm share/gnome/help/clock_applet/da/stylesheet-images
-@dirrm share/gnome/help/clock_applet/da/figures
-@dirrm share/gnome/help/clock_applet/da
-@exec ${MKDIR} %D/share/gnome/help/clock_applet/C/stylesheet-images
-@dirrm share/gnome/help/clock_applet/C/stylesheet-images
-@dirrm share/gnome/help/clock_applet/C/figures
-@dirrm share/gnome/help/clock_applet/C
-@dirrm share/gnome/help/clock_applet
 @comment in gnome1-dirs: @dirrm share/gnome/help
 @comment in gnome1-dirs: @dirrm share/gnome/apps/Utilities
 @comment in gnome1-dirs: @dirrm share/gnome/apps/System
@@ -1294,15 +447,4 @@ share/pixmaps/splash/gnome-splash.png
 @unexec ${RMDIR} %D/share/gnome-terminal/glade 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gnome-terminal 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/share/gnome-about 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets/Utility 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets/Network 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets/Multimedia 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets/Monitors 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets/Clocks 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets/Amusements 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/applets 2>/dev/null || ${TRUE}
-@exec ${MKDIR} %D/etc/gnome/panel-config/panel.d/default
-@unexec ${RMDIR} %D/etc/gnome/panel-config/panel.d/default 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gnome/panel-config/panel.d 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gnome/panel-config 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/etc/gnome 2>/dev/null || ${TRUE}
diff --git a/x11/gnome-core/buildlink2.mk b/x11/gnome-core/buildlink2.mk
index 30b5b6070e2..c1398b6fa9b 100644
--- a/x11/gnome-core/buildlink2.mk
+++ b/x11/gnome-core/buildlink2.mk
@@ -1,31 +1,32 @@
-# $NetBSD: buildlink2.mk,v 1.5 2002/12/24 06:10:30 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.6 2003/04/20 10:43:51 rh Exp $
+#
+# This Makefile fragment is included by packages that use gnome-core.
+#
+# This file was created automatically using createbuildlink 2.4.
+#
 
 .if !defined(GNOME_CORE_BUILDLINK2_MK)
 GNOME_CORE_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			gnome-core
-BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.2nb1
-BUILDLINK_PKGSRCDIR.gnome-core?=	../../x11/gnome-core
+BUILDLINK_DEPENDS.gnome-core?=		gnome-core>=1.4.2nb4
+BUILDLINK_PKGSRCDIR.gnome-core?=		../../x11/gnome-core
 
-EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-core=gnome-core
+EVAL_PREFIX+=	BUILDLINK_PREFIX.gnome-core=gnome-core
 BUILDLINK_PREFIX.gnome-core_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gnome-core=	include/applet-widget.h
-BUILDLINK_FILES.gnome-core+=	include/gnome-panel.h
-BUILDLINK_FILES.gnome-core+=	include/status-docklet.h
 BUILDLINK_FILES.gnome-core+=	lib/libfish_applet.*
 BUILDLINK_FILES.gnome-core+=	lib/libgen_util_applet.*
-BUILDLINK_FILES.gnome-core+=	lib/libpanel_applet.*
-BUILDLINK_FILES.gnome-core+=	lib/libpanel_status.*
-BUILDLINK_FILES.gnome-core+=	share/idl/Terminal.idl
-BUILDLINK_FILES.gnome-core+=	share/idl/gnome-panel.idl
-BUILDLINK_FILES.gnome-core+=	share/idl/help-browser.idl
 
+.include "../../archivers/bzip2/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/libglade/buildlink2.mk"
 .include "../../graphics/gdk-pixbuf-gnome/buildlink2.mk"
+.include "../../graphics/gnome-pixmaps/buildlink2.mk"
+.include "../../lang/perl5/buildlink2.mk"
 .include "../../textproc/libxml/buildlink2.mk"
 .include "../../www/gtkhtml/buildlink2.mk"
 .include "../../www/libghttp/buildlink2.mk"
+.include "../../x11/gnome1-panel/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gnome-core-buildlink