From owner-freebsd-gnome Tue Nov 26 13:21:54 2002 Delivered-To: freebsd-gnome@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id C31A437B401; Tue, 26 Nov 2002 13:21:50 -0800 (PST) Received: from rwcrmhc53.attbi.com (rwcrmhc53.attbi.com [204.127.198.39]) by mx1.FreeBSD.org (Postfix) with ESMTP id 224D743EB2; Tue, 26 Nov 2002 13:21:50 -0800 (PST) (envelope-from bmah@employees.org) Received: from bmah.dyndns.org (12-240-204-110.client.attbi.com[12.240.204.110]) by rwcrmhc53.attbi.com (rwcrmhc53) with ESMTP id <2002112621214905300altlre>; Tue, 26 Nov 2002 21:21:49 +0000 Received: from intruder.bmah.org (localhost [IPv6:::1]) by bmah.dyndns.org (8.12.6/8.12.6) with ESMTP id gAQLM2sx074213; Tue, 26 Nov 2002 13:22:02 -0800 (PST) (envelope-from bmah@intruder.bmah.org) Received: (from bmah@localhost) by intruder.bmah.org (8.12.6/8.12.6/Submit) id gAQLM2DK074212; Tue, 26 Nov 2002 13:22:02 -0800 (PST) Message-Id: <200211262122.gAQLM2DK074212@intruder.bmah.org> X-Mailer: exmh version 2.5+ 20021120 with nmh-1.0.4 To: Joe Marcus Clarke Cc: bmah@FreeBSD.org, re@FreeBSD.org, FreeBSD GNOME Users Subject: Re: Making GNOME 2 the default for 5.0-RELEASE In-Reply-To: <1038334589.323.21.camel@gyros> References: <1037907947.309.49.camel@gyros> <200211221637.gAMGb2hE024266@intruder.bmah.org> <1037985350.326.12.camel@gyros> <200211261731.gAQHVMPe071314@intruder.bmah.org> <1038334589.323.21.camel@gyros> Comments: In-reply-to Joe Marcus Clarke message dated "26 Nov 2002 13:16:29 -0500." From: "Bruce A. Mah" Reply-To: bmah@FreeBSD.org X-Face: g~c`.{#4q0"(V*b#g[i~rXgm*w;:nMfz%_RZLma)UgGN&=j`5vXoU^@n5v4:OO)c["!w)nD/!!~e4Sj7LiT'6*wZ83454H""lb{CC%T37O!!'S$S&D}sem7I[A 2V%N&+ X-Image-Url: http://www.employees.org/~bmah/Images/bmah-cisco-small.gif X-Url: http://www.employees.org/~bmah/ Mime-Version: 1.0 Content-Type: multipart/signed; boundary="==_Exmh_781580860P"; micalg=pgp-sha1; protocol="application/pgp-signature" Content-Transfer-Encoding: 7bit Date: Tue, 26 Nov 2002 13:22:02 -0800 Sender: owner-freebsd-gnome@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG --==_Exmh_781580860P Content-Type: text/plain; charset=us-ascii If memory serves me right, Joe Marcus Clarke wrote: > On Tue, 2002-11-26 at 12:31, Bruce A. Mah wrote: > > sysinstall is harder. On, say, a 4.7 system, sysinstall has two=20 > > relevant items in the desktop config menu: > >=20 > > GNOME + Sawfish > > (Installs gnome and sawfish-gnome) > > GNOME + Enlightenment > > (Installs gnomecore and enlightenment) > > This should probably be changed to GNOME and GNOME + Enlightenment.=20 > Both would install GNOME (x11/gnome), but the latter would also install > x11-wm/enlightenment. OK, we'll fix this up later. :-) > Yes, one entry for GNOME 2 that installs x11/gnome2. This will give the > user the choice of either sawfish2 or metacity. I would call this entry > simply GNOME 2. Does this look OK to you? If so, I'll commit this, and we can test it once we get the 5.0-RC1 package set put together. Bruce. Index: config.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/config.c,v retrieving revision 1.204 diff -c -r1.204 config.c *** config.c 13 Nov 2002 05:39:57 -0000 1.204 --- config.c 26 Nov 2002 18:27:01 -0000 *************** *** 603,623 **** if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde")) write_root_xprofile("exec startkde\n"); } ! else if (!strcmp(desk, "gnome")) { ! ret = package_add("gnomecore"); ! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { ! ret = package_add("sawfish-gnome"); ! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("sawfish")) ! write_root_xprofile("exec gnome-session\n"); ! } ! } ! else if (!strcmp(desk, "enlightenment")) { ! ret = package_add("gnomecore"); ! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) { ! ret = package_add("enlightenment"); ! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("enlightenment")) ! write_root_xprofile("exec gnome-session\n"); ! } } else if (!strcmp(desk, "afterstep")) { ret = package_add("afterstep"); --- 603,612 ---- if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("startkde")) write_root_xprofile("exec startkde\n"); } ! else if (!strcmp(desk, "gnome2")) { ! ret = package_add("gnome2"); ! if (DITEM_STATUS(ret) != DITEM_FAILURE && gotit("gnome-session")) ! write_root_xprofile("exec gnome-session\n"); } else if (!strcmp(desk, "afterstep")) { ret = package_add("afterstep"); Index: menus.c =================================================================== RCS file: /home/ncvs/src/usr.sbin/sysinstall/menus.c,v retrieving revision 1.353 diff -c -r1.353 menus.c *** menus.c 4 Nov 2002 15:06:09 -0000 1.353 --- menus.c 26 Nov 2002 18:27:02 -0000 *************** *** 1090,1104 **** NULL, dmenuExit }, { "2 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, ! { "3 GNOME + Sawfish", "GNOME + Sawfish window manager.", ! NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome" }, ! { "4 GNOME + Enlightenment","GNOME + The E window manager", ! NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=enlightenment" }, ! { "5 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, ! { "6 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, ! { "7 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" }, { NULL } }, }; --- 1090,1102 ---- NULL, dmenuExit }, { "2 KDE", "The K Desktop Environment.", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=kde" }, ! { "3 GNOME 2", "The GNOME 2 Desktop Environment.", ! NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=gnome2" }, ! { "4 Afterstep", "The Afterstep window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=afterstep" }, ! { "5 Windowmaker", "The Windowmaker window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=windowmaker" }, ! { "6 fvwm", "The fvwm window manager", NULL, dmenuSetVariable, NULL, VAR_DESKSTYLE "=fvwm2" }, { NULL } }, }; --==_Exmh_781580860P Content-Type: application/pgp-signature -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.2.0 (FreeBSD) Comment: Exmh version 2.5+ 20020506 iD8DBQE94+X62MoxcVugUsMRAqr+AJ41qRxZiXV7inxwVBI19Pw9WvCp/ACfX8p3 jsY5lO20ta2xEGQE8/KFrow= =FNTv -----END PGP SIGNATURE----- --==_Exmh_781580860P-- To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-gnome" in the body of the message