Date: Tue, 2 Apr 2002 12:54:51 -0800 (PST) From: Murray Stokely <murray@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8919 for review Message-ID: <200204022054.g32Ksp516197@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8919 Change 8919 by murray@murray_builder on 2002/04/02 12:54:25 IFC: David's X4.2 changes. We can back this out if it is not ready. I will start a release build shortly so we can test installing X4.2 with real boot floppies. Affected files ... ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/dispatch.c#2 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/dist.c#2 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/menus.c#4 integrate ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/sysinstall.8#2 integrate Differences ... ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/dispatch.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/dispatch.c,v 1.39 2001/08/02 03:25:15 rwatson Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/dispatch.c,v 1.40 2002/04/02 20:42:50 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -84,7 +84,9 @@ { "installStandard", installStandard }, { "installUpgrade", installUpgrade }, { "installFixupBin", installFixupBin }, +#ifndef X_AS_PKG { "installFixupXFree", installFixupXFree }, +#endif { "installFixitHoloShell", installFixitHoloShell }, { "installFixitCDROM", installFixitCDROM }, { "installFixitFloppy", installFixitFloppy }, ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/dist.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.203 2002/03/11 13:48:13 murray Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/dist.c,v 1.204 2002/04/02 20:42:50 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -275,7 +275,9 @@ XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_DOC | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16; XF86FontDists = DIST_XF86_FONTS_MISC; +#ifndef X_AS_PKG return distSetXF86(NULL); +#endif return DITEM_SUCCESS; } @@ -863,6 +865,9 @@ int old_dists, retries = 0, status = DITEM_SUCCESS; char buf[512]; WINDOW *w; +#ifdef X_AS_PKG + int want_x_package = 0; +#endif /* paranoia */ if (!Dists) { @@ -880,16 +885,31 @@ w = savescr(); msgNotify("Attempting to install all selected distributions.."); +#ifdef X_AS_PKG + /* Clear any XFree86 dist flags, but remember they were present. */ + if(Dists & DIST_XF86) + want_x_package = 1; + Dists &= ~DIST_XF86; + /*Dists &= ~(DIST_XF86 | XF86Dists | XF86ServerDists | XF86FontDists);*/ +#endif + /* Try for 3 times around the loop, then give up. */ while (Dists && ++retries < 3) distExtract(NULL, DistTable); +#ifdef X_AS_PKG + if (want_x_package) + status |= installX11package(NULL); +#endif + dialog_clear_norefresh(); /* Only do bin fixup if bin dist was successfully extracted */ if ((old_dists & DIST_BIN) && !(Dists & DIST_BIN)) status |= installFixupBin(self); +#ifndef X_AS_PKG if (old_dists & DIST_XF86) status |= installFixupXFree(self); +#endif /* Clear any local dist flags now */ Dists &= ~DIST_LOCAL; ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/menus.c#4 (text+ko) ==== @@ -34,7 +34,7 @@ #ifndef lint static const char rcsid[] = - "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.339 2002/03/29 23:03:17 murray Exp $"; + "$FreeBSD: src/usr.sbin/sysinstall/menus.c,v 1.340 2002/04/02 20:42:52 obrien Exp $"; #endif #include "sysinstall.h" @@ -836,8 +836,12 @@ dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_PORTS }, { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, - { " XFree86", "The XFree86 3.3.6 distribution", + { " XFree86", "The XFree86 distribution", +#ifdef X_AS_PKG + dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 }, +#else x11FlagCheck, distSetXF86 }, +#endif { NULL } }, }; @@ -900,35 +904,19 @@ DMenu MenuXF86Config = { DMENU_NORMAL_TYPE | DMENU_SELECTION_RETURNS, "Please select the XFree86 configuration tool you want to use.", -#ifdef __alpha__ - "Due to problems with the VGA16 server right now, only the\n" - "text-mode configuration tool (xf86config) is currently supported.", -#else - "The first tool, XF86Setup, is fully graphical and requires the\n" - "VGA16 server in order to work (should have been selected by\n" - "default, but if you de-selected it then you won't be able to\n" - "use this fancy setup tool). The second tool, xf86config, is\n" + "The first tool, xf86cfg, is fully graphical\n" + "The second tool, xf86config, is\n" "a more simplistic shell-script based tool and less friendly to\n" "new users, but it may work in situations where the fancier one\n" "does not.", -#endif NULL, NULL, { { "X Exit", "Exit this menu (returning to previous)", NULL, dmenuExit }, -#ifdef __alpha__ - { "2 xf86config", "Shell-script based XFree86 configuration tool.", - NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, -#else - { "2 XF86Setup", "Fully graphical XFree86 configuration tool.", - NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF86Setup" }, + { "2 xf86cfg", "Fully graphical XFree86 configuration tool.", + NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86cfg" }, { "3 xf86config", "Shell-script based XFree86 configuration tool.", NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=xf86config" }, -#ifdef PC98 - { "4 XF98Setup", "Fully graphical XFree86 configuration tool (PC98).", - NULL, dmenuSetVariable, NULL, VAR_XF86_CONFIG "=XF98Setup" }, -#endif -#endif { "D XDesktop", "X already set up, just do desktop configuration.", NULL, dmenuSubmenu, NULL, &MenuXDesktops }, { NULL } }, @@ -965,8 +953,8 @@ DMenu MenuXF86Select = { DMENU_NORMAL_TYPE, - "XFree86 3.3.6 Distribution", - "Please select the components you need from the XFree86 3.3.6\n" + "XFree86 Distribution", + "Please select the components you need from the XFree86\n" "distribution sets.", NULL, NULL, @@ -979,7 +967,7 @@ DMenu MenuXF86SelectCore = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "XFree86 3.3.6 base distribution types", + "XFree86 base distribution types", "Please check off the basic XFree86 components you wish to install.\n" "Bin, lib, and set are recommended for a minimum installaion.", NULL, ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/sysinstall.8#2 (text+ko) ==== @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/usr.sbin/sysinstall/sysinstall.8,v 1.48 2001/08/14 23:19:37 eric Exp $ +.\" $FreeBSD: src/usr.sbin/sysinstall/sysinstall.8,v 1.49 2002/04/02 20:42:54 obrien Exp $ .\" .Dd August 9, 1997 .Dt SYSINSTALL 8 @@ -475,101 +475,101 @@ .It Li XF86-co XFree86 contributed sources. .It Li Xbin -XFree86 3.3.6 binaries. +XFree86 binaries. .It Li Xcfg -XFree86 3.3.6 configuration files. +XFree86 configuration files. .It Li Xdoc -XFree86 3.3.6 documentation. +XFree86 documentation. .It Li Xhtml -XFree86 3.3.6 HTML documentation. +XFree86 HTML documentation. .It Li Xlib -XFree86 3.3.6 libraries. +XFree86 libraries. .It Li Xlk98 -XFree86 3.3.6 server link-kit for PC98 machines. +XFree86 server link-kit for PC98 machines. .It Li Xlkit -XFree86 3.3.6 server link-kit for standard machines. +XFree86 server link-kit for standard machines. .It Li Xman -XFree86 3.3.6 manual pages. +XFree86 manual pages. .It Li Xprog -XFree86 3.3.6 programmer's distribution. +XFree86 programmer's distribution. .It Li Xps -XFree86 3.3.6 postscript documentation. +XFree86 postscript documentation. .It Li Xset -XFree86 3.3.6 graphical setup tool. +XFree86 graphical setup tool. .It Li PC98-Servers/X9480 -XFree86 3.3.6 PC98 8-bit (256 color) PEGC-480 server. +XFree86 PC98 8-bit (256 color) PEGC-480 server. .It Li PC98-Servers/X9EGC -XFree86 3.3.6 PC98 4-bit (16 color) EGC server. +XFree86 PC98 4-bit (16 color) EGC server. .It Li PC98-Servers/X9GA9 -XFree86 3.3.6 PC98 GA-968V4/PCI (S3 968) server. +XFree86 PC98 GA-968V4/PCI (S3 968) server. .It Li PC98-Servers/X9GAN -XFree86 3.3.6 PC98 GANB-WAP (cirrus) server. +XFree86 PC98 GANB-WAP (cirrus) server. .It Li PC98-Servers/X9LPW -XFree86 3.3.6 PC98 PowerWindowLB (S3) server. +XFree86 PC98 PowerWindowLB (S3) server. .It Li PC98-Servers/X9MGA [DESCRIPTION MISSING] .It Li PC98-Servers/X9NKV -XFree86 3.3.6 PC98 NKV-NEC (cirrus) server. +XFree86 PC98 NKV-NEC (cirrus) server. .It Li PC98-Servers/X9NS3 -XFree86 3.3.6 PC98 NEC (S3) server. +XFree86 PC98 NEC (S3) server. .It Li PC98-Servers/X9SPW -XFree86 3.3.6 PC98 SKB-PowerWindow (S3) server. +XFree86 PC98 SKB-PowerWindow (S3) server. .It Li PC98-Servers/X9SVG [DESCRIPTION MISSING] .It Li PC98-Servers/X9TGU -XFree86 3.3.6 PC98 Cyber9320 and TGUI9680 server. +XFree86 PC98 Cyber9320 and TGUI9680 server. .It Li PC98-Servers/X9WEP -XFree86 3.3.6 PC98 WAB-EP (cirrus) server. +XFree86 PC98 WAB-EP (cirrus) server. .It Li PC98-Servers/X9WS -XFree86 3.3.6 PC98 WABS (cirrus) server. +XFree86 PC98 WABS (cirrus) server. .It Li PC98-Servers/X9WSN -XFree86 3.3.6 PC98 WSN-A2F (cirrus) server. +XFree86 PC98 WSN-A2F (cirrus) server. .It Li Servers/X3DL -XFree86 3.3.6 3D Labs server. +XFree86 3D Labs server. .It Li Servers/X8514 -XFree86 3.3.6 8514 server. +XFree86 8514 server. .It Li Servers/XAGX -XFree86 3.3.6 8 bit AGX server. +XFree86 8 bit AGX server. .It Li Servers/XI128 -XFree86 3.3.6 #9 Imagine I128 server. +XFree86 #9 Imagine I128 server. .It Li Servers/XMa8 -XFree86 3.3.6 ATI Mach8 server. +XFree86 ATI Mach8 server. .It Li Servers/XMa32 -XFree86 3.3.6 ATI Mach32 server. +XFree86 ATI Mach32 server. .It Li Servers/XMa64 -XFree86 3.3.6 ATI Mach64 server. +XFree86 ATI Mach64 server. .It Li Servers/XMono -XFree86 3.3.6 monochrome server. +XFree86 monochrome server. .It Li Servers/XP9K -XFree86 3.3.6 P9000 server. +XFree86 P9000 server. .It Li Servers/XS3 -XFree86 3.3.6 S3 server. +XFree86 S3 server. .It Li Servers/XS3V -XFree86 3.3.6 S3 Virge server. +XFree86 S3 Virge server. .It Li Servers/XSVGA -XFree86 3.3.6 SVGA server. +XFree86 SVGA server. .It Li Servers/XVG16 -XFree86 3.3.6 VGA16 server. +XFree86 VGA16 server. .It Li Servers/XW32 -XFree86 3.3.6 ET4000/W32, /W32i and /W32p server. +XFree86 ET4000/W32, /W32i and /W32p server. .It Li Servers/XTGA Server for TGA cards (alpha architecture only). .It Li Servers/Xnest -XFree86 3.3.6 nested X server. +XFree86 nested X server. .It Li Servers/Xvfb -XFree86 3.3.6 virtual frame-buffer X server. +XFree86 virtual frame-buffer X server. .It Li Xfnts -XFree86 3.3.6 base font set. +XFree86 base font set. .It Li Xf100 -XFree86 3.3.6 100DPI font set. +XFree86 100DPI font set. .It Li Xfcyr -XFree86 3.3.6 Cyrillic font set. +XFree86 Cyrillic font set. .It Li Xfscl -XFree86 3.3.6 scalable font set. +XFree86 scalable font set. .It Li Xfnon -XFree86 3.3.6 non-english font set. +XFree86 non-english font set. .It Li Xfsrv -XFree86 3.3.6 font server. +XFree86 font server. .El .El .It distSetDeveloper @@ -618,7 +618,7 @@ .Sy Variables : None .It distSetXF86 -Interactively select XFree86 3.3.6 subcomponents. +Interactively select XFree86 subcomponents. .Pp .Sy Variables : None To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204022054.g32Ksp516197>