From ef9cff0bec2e0d4f9e5b340f022d370bf75c25f2 Mon Sep 17 00:00:00 2001 From: Maxim Sobolev Date: Wed, 9 Jan 2002 20:10:02 +0000 Subject: [PATCH] Safwish package built on bento is called `sawfish-gnome', so adjust sysinstall and print-cdrom-packages.sh accordingly. Revealed by: re MFC after: 1 day --- release/scripts/print-cdrom-packages.sh | 2 +- usr.sbin/sade/config.c | 2 +- usr.sbin/sysinstall/config.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/release/scripts/print-cdrom-packages.sh b/release/scripts/print-cdrom-packages.sh index 81d0a22bdbc..681be2e0f37 100755 --- a/release/scripts/print-cdrom-packages.sh +++ b/release/scripts/print-cdrom-packages.sh @@ -79,7 +79,7 @@ CDROM_SET_1="${CDROM_SET_1} x11-servers/XFree86-4-VirtualFramebufferServer" CDROM_SET_1="${CDROM_SET_1} x11-wm/afterstep" CDROM_SET_1="${CDROM_SET_1} x11-wm/enlightenment" CDROM_SET_1="${CDROM_SET_1} x11-wm/fvwm2" -CDROM_SET_1="${CDROM_SET_1} x11-wm/sawfish" +CDROM_SET_1="${CDROM_SET_1} x11-wm/sawfish-gnome" CDROM_SET_1="${CDROM_SET_1} x11-wm/windowmaker" CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4" CDROM_SET_1="${CDROM_SET_1} x11/XFree86-4-clients" diff --git a/usr.sbin/sade/config.c b/usr.sbin/sade/config.c index fcf0d03246f..11be0683b31 100644 --- a/usr.sbin/sade/config.c +++ b/usr.sbin/sade/config.c @@ -607,7 +607,7 @@ configXDesktop(dialogMenuItem *self) else if (!strcmp(desk, "gnome")) { ret = package_add("gnomecore"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { - ret = package_add("sawfish"); + ret = package_add("sawfish-gnome"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish")) write_root_xprofile("exec gnome-session\n"); } diff --git a/usr.sbin/sysinstall/config.c b/usr.sbin/sysinstall/config.c index fcf0d03246f..11be0683b31 100644 --- a/usr.sbin/sysinstall/config.c +++ b/usr.sbin/sysinstall/config.c @@ -607,7 +607,7 @@ configXDesktop(dialogMenuItem *self) else if (!strcmp(desk, "gnome")) { ret = package_add("gnomecore"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { - ret = package_add("sawfish"); + ret = package_add("sawfish-gnome"); if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish")) write_root_xprofile("exec gnome-session\n"); }