From f266bbb14145e1ad62c832513a76a485035a0e13 Mon Sep 17 00:00:00 2001 From: obrien Date: Tue, 19 Aug 2003 23:23:27 +0000 Subject: Remove the vestiges of the old pre-"X_AS_PKG" way we used to handled the installing XFree86 (version 3.3.6 and before). Reviewed by: jhb --- usr.sbin/sade/Makefile | 2 +- usr.sbin/sade/dispatch.c | 6 -- usr.sbin/sade/install.c | 23 ------ usr.sbin/sade/menus.c | 171 --------------------------------------- usr.sbin/sade/sade.h | 6 -- usr.sbin/sysinstall/Makefile | 2 +- usr.sbin/sysinstall/dispatch.c | 6 -- usr.sbin/sysinstall/dist.c | 101 ----------------------- usr.sbin/sysinstall/dist.h | 65 --------------- usr.sbin/sysinstall/install.c | 23 ------ usr.sbin/sysinstall/menus.c | 171 --------------------------------------- usr.sbin/sysinstall/sysinstall.h | 6 -- 12 files changed, 2 insertions(+), 580 deletions(-) diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index 31c4281..e0b7f6a 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -14,7 +14,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \ SRCS+= pccard.c .endif -CFLAGS+= -DX_AS_PKG -DUSE_GZIP=1 +CFLAGS+= -DUSE_GZIP=1 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif diff --git a/usr.sbin/sade/dispatch.c b/usr.sbin/sade/dispatch.c index 17b5e9a..ee9fea4 100644 --- a/usr.sbin/sade/dispatch.c +++ b/usr.sbin/sade/dispatch.c @@ -78,9 +78,6 @@ static struct _word { { "distSetMinimum", distSetMinimum }, { "distSetEverything", distSetEverything }, { "distSetSrc", distSetSrc }, -#ifndef X_AS_PKG - { "distSetXF86", distSetXF86 }, -#endif { "distExtractAll", distExtractAll }, { "docBrowser", docBrowser }, { "docShowDocument", docShowDocument }, @@ -89,9 +86,6 @@ static struct _word { { "installStandard", installStandard }, { "installUpgrade", installUpgrade }, { "installFixupBase", installFixupBase }, -#ifndef X_AS_PKG - { "installFixupXFree", installFixupXFree }, -#endif { "installFixitHoloShell", installFixitHoloShell }, { "installFixitCDROM", installFixitCDROM }, { "installFixitFloppy", installFixitFloppy }, diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 036d8c5..6d28171 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -853,29 +853,6 @@ installFixupBase(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_RESTORE; } -#ifndef X_AS_PKG -/* Fix side-effects from the the XFree86 installation */ -int -installFixupXFree(dialogMenuItem *self) -{ - /* BOGON #1: XFree86 requires various specialized fixups */ - if (directory_exists("/usr/X11R6")) { - dialog_clear_norefresh(); - msgNotify("Fixing permissions in XFree86 tree.."); - vsystem("chmod -R a+r /usr/X11R6"); - vsystem("find /usr/X11R6 -type d | xargs chmod a+x"); - - /* Also do bogus minimal package registration so ports don't whine */ - if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) { - dialog_clear_norefresh(); - msgNotify("Installing package metainfo.."); - vsystem("tar xpzf /usr/X11R6/lib/X11/pkgreg.tar.gz -C / && rm /usr/X11R6/lib/X11/pkgreg.tar.gz"); - } - } - return DITEM_SUCCESS | DITEM_RESTORE; -} -#endif - #define QUEUE_YES 1 #define QUEUE_NO 0 static int diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index e9b7429..102df79 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -290,9 +290,6 @@ DMenu MenuIndex = { { " User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, { " XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, { " XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, -#if !defined(X_AS_PKG) && defined(__i386__) && defined(PC98) - { " XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, -#endif { NULL } }, }; @@ -1114,7 +1111,6 @@ DMenu MenuXF86Select = { { NULL } }, }; -#ifdef X_AS_PKG DMenu MenuXF86SelectCore = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "XFree86 base distribution types", @@ -1194,173 +1190,6 @@ DMenu MenuXF86SelectServer = { { NULL } }, }; -#else -DMenu MenuXF86SelectCore = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "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, - NULL, - { { "X Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "Select all below", - NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Reset", "Reset all below", - NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { " bin", "Client applications and shared libs", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN }, - { " lib", "Data files needed at runtime", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, - { " cfg", "Configuration files", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG }, - { " set", "XFree86 Setup Utility", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, - { " man", "Manual pages", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, - { " doc", "READMEs and release notes", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC }, - { " html", "HTML documentation files", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, - { " lkit", "Server link kit for all other machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, - { " prog", "Programmer's header and library files", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, -#if defined(__i386__) && defined(PC98) - { " 9set", "XFree86 Setup Utility for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, - { " lk98", "Server link kit for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, -#endif - { NULL } }, -}; - -DMenu MenuXF86SelectFonts = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "Font distribution selection.", - "Please check off the individual font distributions you wish to\n\ -install. At the minimum, you should install the standard\n\ -75 DPI and misc fonts if you're also installing a server\n\ -(these are selected by default).", - NULL, - NULL, - { { "X Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "All fonts", - NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Reset", "Reset font selections", - NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { " fnts", "Standard 75 DPI and miscellaneous fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC }, - { " f100", "100 DPI fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 }, - { " fcyr", "Cyrillic Fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR }, - { " fscl", "Speedo and Type scalable fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE }, - { " non", "Japanese, Chinese and other non-english fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON }, - { " server", "Font server", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER }, - { NULL } }, -}; - -DMenu MenuXF86SelectServer = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "X Server selection.", - "Please check off the types of X servers you wish to install.\n" - "If you are unsure as to which server will work for your graphics card,\n" - "it is recommended that try the SVGA or VGA16 servers or, for PC98\n" - "machines, the 9EGC or 9840 servers.", - NULL, - NULL, - { { "X Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "Select all of the above", - NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Reset", "Reset all of the above", - NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { " SVGA", "Standard VGA or Super VGA card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA }, - { " VGA16", "Standard 16 color VGA card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 }, - { " Mono", "Standard Monochrome card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO }, - { " 3DL", "8, 16 and 24 bit color 3D Labs boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_3DL }, - { " 8514", "8-bit (256 color) IBM 8514 or compatible card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 }, - { " AGX", "8-bit AGX card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX }, - { " I128", "8, 16 and 24-bit #9 Imagine I128 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 }, - { " Ma8", "8-bit ATI Mach8 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 }, - { " Ma32", "8 and 16-bit (65K color) ATI Mach32 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 }, - { " Ma64", "8 and 16-bit (65K color) ATI Mach64 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 }, - { " P9K", "8, 16, and 24-bit color Weitek P9000 based boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 }, - { " S3", "8, 16 and 24-bit color S3 based boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 }, - { " S3V", "8, 16 and 24-bit color S3 Virge based boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V }, - { " W32", "8-bit ET4000/W32, /W32i and /W32p cards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 }, -#if defined(__i386__) && defined(PC98) - { " PC98", "Select an X server for a NEC PC98 [Submenu]", - NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 }, -#elif defined(__alpha__) - { " TGA", "TGA cards (alpha architecture only)", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA }, -#endif - { NULL } }, -}; - -#if defined(__i386__) && defined(PC98) -DMenu MenuXF86SelectPC98Server = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "PC98 X Server selection.", - "Please check off the types of NEC PC98 X servers you wish to install.\n\ -If you are unsure as to which server will work for your graphics card,\n\ -it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\ -Mono servers are particularly well-suited to most LCD displays).", - NULL, - NULL, - { { " 9480", "PC98 8-bit (256 color) PEGC-480 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 }, - { " 9EGC", "PC98 4-bit (16 color) EGC card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC }, - { " 9GA9", "PC98 GA-968V4/PCI (S3 968) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 }, - { " 9GAN", "PC98 GANB-WAP (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN }, - { " 9LPW", "PC98 PowerWindowLB (S3) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW }, - { " 9MGA", "PC98 MGA (Matrox) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA }, - { " 9NKV", "PC98 NKV-NEC (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV }, - { " 9NS3", "PC98 NEC (S3) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 }, - { " 9SPW", "PC98 SKB-PowerWindow (S3) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW }, - { " 9SVG", "PC98 generic SVGA card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG }, - { " 9TGU", "PC98 Cyber9320 and TGUI9680 cards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU }, - { " 9WEP", "PC98 WAB-EP (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP }, - { " 9WS", "PC98 WABS (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS }, - { " 9WSN", "PC98 WSN-A2F (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN }, - { NULL } } -}; -#endif -#endif /* !X_AS_PKG */ - DMenu MenuDiskDevices = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Select Drive(s)", diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 439f9d1..9f50e3ce 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -470,9 +470,6 @@ extern DMenu MenuXF86; /* XFree86 main menu */ extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */ extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */ extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */ -#if !defined(X_AS_PKG) && defined(__i386__) && defined(PC98) -extern DMenu MenuXF86SelectPC98Server; /* XFree86 server distribution menu */ -#endif extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */ extern DMenu MenuXDesktops; /* Disk devices menu */ extern DMenu MenuHTMLDoc; /* HTML Documentation menu */ @@ -665,9 +662,6 @@ extern int installFixitHoloShell(dialogMenuItem *self); extern int installFixitCDROM(dialogMenuItem *self); extern int installFixitFloppy(dialogMenuItem *self); extern int installFixupBase(dialogMenuItem *self); -#ifndef X_AS_PKG -extern int installFixupXFree(dialogMenuItem *self); -#endif extern int installUpgrade(dialogMenuItem *self); extern int installFilesystems(dialogMenuItem *self); extern int installVarDefaults(dialogMenuItem *self); diff --git a/usr.sbin/sysinstall/Makefile b/usr.sbin/sysinstall/Makefile index 31c4281..e0b7f6a 100644 --- a/usr.sbin/sysinstall/Makefile +++ b/usr.sbin/sysinstall/Makefile @@ -14,7 +14,7 @@ SRCS= anonFTP.c cdrom.c command.c config.c devices.c dhcp.c \ SRCS+= pccard.c .endif -CFLAGS+= -DX_AS_PKG -DUSE_GZIP=1 +CFLAGS+= -DUSE_GZIP=1 .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif diff --git a/usr.sbin/sysinstall/dispatch.c b/usr.sbin/sysinstall/dispatch.c index 17b5e9a..ee9fea4 100644 --- a/usr.sbin/sysinstall/dispatch.c +++ b/usr.sbin/sysinstall/dispatch.c @@ -78,9 +78,6 @@ static struct _word { { "distSetMinimum", distSetMinimum }, { "distSetEverything", distSetEverything }, { "distSetSrc", distSetSrc }, -#ifndef X_AS_PKG - { "distSetXF86", distSetXF86 }, -#endif { "distExtractAll", distExtractAll }, { "docBrowser", docBrowser }, { "docShowDocument", docShowDocument }, @@ -89,9 +86,6 @@ static struct _word { { "installStandard", installStandard }, { "installUpgrade", installUpgrade }, { "installFixupBase", installFixupBase }, -#ifndef X_AS_PKG - { "installFixupXFree", installFixupXFree }, -#endif { "installFixitHoloShell", installFixitHoloShell }, { "installFixitCDROM", installFixitCDROM }, { "installFixitFloppy", installFixitFloppy }, diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 87dc0b2..9030cb0 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -137,7 +137,6 @@ static Distribution SrcDistTable[] = { { NULL }, }; -#ifdef X_AS_PKG /* The XFree86 distribution */ static Distribution XF86DistTable[] = { DTE_SUBDIST("XFree86", &XF86Dists, XF86_FONTS, XF86FontDistTable), @@ -170,91 +169,6 @@ static Distribution XF86FontDistTable[] = { { NULL }, }; -#else /* !X_AS_PKG */ - -/* The XFree86 distribution */ -static Distribution XF86DistTable[] = { - DTE_SUBDIST("XF86336", &XF86Dists, XF86_FONTS, XF86FontDistTable), -#if defined(__i386__) && defined(PC98) - DTE_SUBDIST("XF86336/PC98-Servers", &XF86Dists, XF86_SERVER, XF86ServerDistTable), -#else - DTE_SUBDIST("XF86336/Servers", &XF86Dists, XF86_SERVER, XF86ServerDistTable), -#endif - DTE_TARBALL("Xbin", &XF86Dists, XF86_BIN, "/usr/X11R6"), - DTE_TARBALL("Xcfg", &XF86Dists, XF86_CFG, "/usr/X11R6"), - DTE_TARBALL("Xdoc", &XF86Dists, XF86_DOC, "/usr/X11R6"), - DTE_TARBALL("Xhtml", &XF86Dists, XF86_HTML, "/usr/X11R6"), - DTE_TARBALL("Xlib", &XF86Dists, XF86_LIB, "/usr/X11R6"), -#if defined(__i386__) && defined(PC98) - DTE_TARBALL("Xlk98", &XF86Dists, XF86_LKIT98, "/usr/X11R6"), -#endif - DTE_TARBALL("Xlkit", &XF86Dists, XF86_LKIT, "/usr/X11R6"), - DTE_TARBALL("Xman", &XF86Dists, XF86_MAN, "/usr/X11R6"), - DTE_TARBALL("Xprog", &XF86Dists, XF86_PROG, "/usr/X11R6"), - DTE_TARBALL("Xps", &XF86Dists, XF86_PS, "/usr/X11R6"), - DTE_TARBALL("Xset", &XF86Dists, XF86_SET, "/usr/X11R6"), -#if defined(__i386__) && defined(PC98) - DTE_TARBALL("X9set", &XF86Dists, XF86_9SET, "/usr/X11R6"), -#endif - { NULL }, -}; - -/* The XFree86 server distribution */ -static Distribution XF86ServerDistTable[] = { -#if defined(__i386__) && defined(PC98) - DTE_TARBALL("X9480", &XF86ServerDists, XF86_SERVER_9480, "/usr/X11R6"), - DTE_TARBALL("X9EGC", &XF86ServerDists, XF86_SERVER_9EGC, "/usr/X11R6"), - DTE_TARBALL("X9GA9", &XF86ServerDists, XF86_SERVER_9GA9, "/usr/X11R6"), - DTE_TARBALL("X9GAN", &XF86ServerDists, XF86_SERVER_9GAN, "/usr/X11R6"), - DTE_TARBALL("X9LPW", &XF86ServerDists, XF86_SERVER_9LPW, "/usr/X11R6"), - DTE_TARBALL("X9MGA", &XF86ServerDists, XF86_SERVER_9MGA, "/usr/X11R6"), - DTE_TARBALL("X9NKV", &XF86ServerDists, XF86_SERVER_9NKV, "/usr/X11R6"), - DTE_TARBALL("X9NS3", &XF86ServerDists, XF86_SERVER_9NS3, "/usr/X11R6"), - DTE_TARBALL("X9SPW", &XF86ServerDists, XF86_SERVER_9SPW, "/usr/X11R6"), - DTE_TARBALL("X9SVG", &XF86ServerDists, XF86_SERVER_9SVG, "/usr/X11R6"), - DTE_TARBALL("X9TGU", &XF86ServerDists, XF86_SERVER_9TGU, "/usr/X11R6"), - DTE_TARBALL("X9WEP", &XF86ServerDists, XF86_SERVER_9WEP, "/usr/X11R6"), - DTE_TARBALL("X9WS", &XF86ServerDists, XF86_SERVER_9WS, "/usr/X11R6"), - DTE_TARBALL("X9WSN", &XF86ServerDists, XF86_SERVER_9WSN, "/usr/X11R6"), -#endif - DTE_TARBALL("X3DL", &XF86ServerDists, XF86_SERVER_3DL, "/usr/X11R6"), -#ifdef __i386__ - DTE_TARBALL("X8514", &XF86ServerDists, XF86_SERVER_8514, "/usr/X11R6"), - DTE_TARBALL("XAGX", &XF86ServerDists, XF86_SERVER_AGX, "/usr/X11R6"), -#endif - DTE_TARBALL("XI128", &XF86ServerDists, XF86_SERVER_I128, "/usr/X11R6"), -#if defined(__i386__) || defined(__amd64__) - DTE_TARBALL("XMa8", &XF86ServerDists, XF86_SERVER_MACH8, "/usr/X11R6"), - DTE_TARBALL("XMa32", &XF86ServerDists, XF86_SERVER_MACH32, "/usr/X11R6"), -#endif - DTE_TARBALL("XMa64", &XF86ServerDists, XF86_SERVER_MACH64, "/usr/X11R6"), - DTE_TARBALL("XMono", &XF86ServerDists, XF86_SERVER_MONO, "/usr/X11R6"), - DTE_TARBALL("XP9K", &XF86ServerDists, XF86_SERVER_P9000, "/usr/X11R6"), - DTE_TARBALL("XS3", &XF86ServerDists, XF86_SERVER_S3, "/usr/X11R6"), - DTE_TARBALL("XS3V", &XF86ServerDists, XF86_SERVER_S3V, "/usr/X11R6"), - DTE_TARBALL("XSVGA", &XF86ServerDists, XF86_SERVER_SVGA, "/usr/X11R6"), -#if defined(__i386__) || defined(__amd64__) - DTE_TARBALL("XVG16", &XF86ServerDists, XF86_SERVER_VGA16, "/usr/X11R6"), - DTE_TARBALL("XW32", &XF86ServerDists, XF86_SERVER_W32, "/usr/X11R6"), -#endif -#ifdef __alpha__ - DTE_TARBALL("XTGA", &XF86ServerDists, XF86_SERVER_TGA, "/usr/X11R6"), -#endif - { NULL }, -}; - -/* The XFree86 font distribution */ -static Distribution XF86FontDistTable[] = { - DTE_TARBALL("Xfnts", &XF86FontDists, XF86_FONTS_MISC, "/usr/X11R6"), - DTE_TARBALL("Xf100", &XF86FontDists, XF86_FONTS_100, "/usr/X11R6"), - DTE_TARBALL("Xfcyr", &XF86FontDists, XF86_FONTS_CYR, "/usr/X11R6"), - DTE_TARBALL("Xfscl", &XF86FontDists, XF86_FONTS_SCALE, "/usr/X11R6"), - DTE_TARBALL("Xfnon", &XF86FontDists, XF86_FONTS_NON, "/usr/X11R6"), - DTE_TARBALL("Xfsrv", &XF86FontDists, XF86_FONTS_SERVER, "/usr/X11R6"), - { NULL }, -}; -#endif /* !X_AS_PKG */ - static int distMaybeSetPorts(dialogMenuItem *self); static void @@ -266,11 +180,6 @@ distVerifyFlags(void) Dists |= DIST_CRYPTO; else if ((Dists & DIST_CRYPTO) && !CRYPTODists) CRYPTODists |= DIST_CRYPTO_ALL; -#ifndef X_AS_PKG - /* XXX : realy only for X 3.3.6 */ - if (XF86Dists & DIST_XF86_SET) - XF86ServerDists |= DIST_XF86_SERVER_VGA16; -#endif if (XF86ServerDists) XF86Dists |= DIST_XF86_SERVER; if (XF86FontDists) @@ -329,15 +238,9 @@ static int distSetX(void) { Dists |= DIST_XF86; -#ifdef X_AS_PKG XF86Dists = DIST_XF86_CLIENTS | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_DOC | DIST_XF86_SERVER | DIST_XF86_FONTS; XF86ServerDists = DIST_XF86_SERVER_FB; XF86FontDists = DIST_XF86_FONTS_BITMAPS | DIST_XF86_FONTS_75; -#else - 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; -#endif return distSetXF86(NULL); } @@ -971,10 +874,6 @@ distExtractAll(dialogMenuItem *self) /* Only do base fixup if base dist was successfully extracted */ if ((old_dists & DIST_BASE) && !(Dists & DIST_BASE)) status |= installFixupBase(self); -#ifndef X_AS_PKG - if (old_dists & DIST_XF86) - status |= installFixupXFree(self); -#endif /* Clear any local dist flags now */ Dists &= ~DIST_LOCAL; diff --git a/usr.sbin/sysinstall/dist.h b/usr.sbin/sysinstall/dist.h index c71ee53..e41e938 100644 --- a/usr.sbin/sysinstall/dist.h +++ b/usr.sbin/sysinstall/dist.h @@ -56,7 +56,6 @@ #define DIST_SRC_BIN 0x08000 #define DIST_SRC_ALL 0x0FFFF -#ifdef X_AS_PKG /* Subtypes for XFree86 packages */ #define DIST_XF86_CLIENTS 0x0001 #define DIST_XF86_DOC 0x0002 @@ -79,65 +78,6 @@ #define DIST_XF86_FONTS_SERVER 0x0020 #define DIST_XF86_FONTS_ALL 0x003F #define DIST_XF86_ALL 0x007F -#else -/* Subtypes for XFree86 distribution */ -#define DIST_XF86_BIN 0x0001 -#define DIST_XF86_CFG 0x0002 -#define DIST_XF86_DOC 0x0004 -#define DIST_XF86_HTML 0x0008 -#define DIST_XF86_LIB 0x0010 -#define DIST_XF86_LKIT98 0x0020 -#define DIST_XF86_LKIT 0x0040 -#define DIST_XF86_MAN 0x0080 -#define DIST_XF86_PROG 0x0100 -#define DIST_XF86_PS 0x0200 -#define DIST_XF86_SET 0x0400 -#define DIST_XF86_9SET 0x0800 -#define DIST_XF86_MISC_ALL 0x0FFF -#define DIST_XF86_SERVER 0x8000 -#ifdef __i386__ -#define DIST_XF86_SERVER_9MGA 0x0000001 -#define DIST_XF86_SERVER_9480 0x0000002 -#define DIST_XF86_SERVER_9EGC 0x0000004 -#define DIST_XF86_SERVER_9GA9 0x0000008 -#define DIST_XF86_SERVER_9GAN 0x0000010 -#define DIST_XF86_SERVER_9LPW 0x0000020 -#define DIST_XF86_SERVER_9NKV 0x0000040 -#define DIST_XF86_SERVER_9NS3 0x0000080 -#define DIST_XF86_SERVER_9SVG 0x0000100 -#define DIST_XF86_SERVER_9SPW 0x0000200 -#define DIST_XF86_SERVER_9TGU 0x0000400 -#define DIST_XF86_SERVER_9WEP 0x0000800 -#define DIST_XF86_SERVER_9WS 0x0001000 -#define DIST_XF86_SERVER_9WSN 0x0002000 -#elif __alpha__ -#define DIST_XF86_SERVER_TGA 0x0000001 -#endif -#define DIST_XF86_SERVER_8514 0x0004000 -#define DIST_XF86_SERVER_AGX 0x0008000 -#define DIST_XF86_SERVER_I128 0x0010000 -#define DIST_XF86_SERVER_MACH8 0x0020000 -#define DIST_XF86_SERVER_MACH32 0x0040000 -#define DIST_XF86_SERVER_MACH64 0x0080000 -#define DIST_XF86_SERVER_MONO 0x0100000 -#define DIST_XF86_SERVER_P9000 0x0200000 -#define DIST_XF86_SERVER_S3 0x0400000 -#define DIST_XF86_SERVER_S3V 0x0800000 -#define DIST_XF86_SERVER_SVGA 0x1000000 -#define DIST_XF86_SERVER_VGA16 0x2000000 -#define DIST_XF86_SERVER_W32 0x4000000 -#define DIST_XF86_SERVER_3DL 0x8000000 -#define DIST_XF86_SERVER_ALL 0xFFFFFFF -#define DIST_XF86_FONTS 0x10000 -#define DIST_XF86_FONTS_MISC 0x0001 -#define DIST_XF86_FONTS_100 0x0002 -#define DIST_XF86_FONTS_CYR 0x0004 -#define DIST_XF86_FONTS_SCALE 0x0008 -#define DIST_XF86_FONTS_NON 0x0010 -#define DIST_XF86_FONTS_SERVER 0x0020 -#define DIST_XF86_FONTS_ALL 0x003F -#define DIST_XF86_ALL 0x1FFFF -#endif /* Canned distribution sets */ #define _DIST_USER \ @@ -147,8 +87,3 @@ ( _DIST_USER | DIST_PROFLIBS | DIST_INFO | DIST_SRC ) #endif /* _DIST_H_INCLUDE */ - - - - - diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 036d8c5..6d28171 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -853,29 +853,6 @@ installFixupBase(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_RESTORE; } -#ifndef X_AS_PKG -/* Fix side-effects from the the XFree86 installation */ -int -installFixupXFree(dialogMenuItem *self) -{ - /* BOGON #1: XFree86 requires various specialized fixups */ - if (directory_exists("/usr/X11R6")) { - dialog_clear_norefresh(); - msgNotify("Fixing permissions in XFree86 tree.."); - vsystem("chmod -R a+r /usr/X11R6"); - vsystem("find /usr/X11R6 -type d | xargs chmod a+x"); - - /* Also do bogus minimal package registration so ports don't whine */ - if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) { - dialog_clear_norefresh(); - msgNotify("Installing package metainfo.."); - vsystem("tar xpzf /usr/X11R6/lib/X11/pkgreg.tar.gz -C / && rm /usr/X11R6/lib/X11/pkgreg.tar.gz"); - } - } - return DITEM_SUCCESS | DITEM_RESTORE; -} -#endif - #define QUEUE_YES 1 #define QUEUE_NO 0 static int diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index e9b7429..102df79 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -290,9 +290,6 @@ DMenu MenuIndex = { { " User Management", "Add user and group information.", NULL, dmenuSubmenu, NULL, &MenuUsermgmt }, { " XFree86, Fonts", "XFree86 Font selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectFonts }, { " XFree86, Server", "XFree86 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectServer }, -#if !defined(X_AS_PKG) && defined(__i386__) && defined(PC98) - { " XFree86, PC98 Server", "XFree86 PC98 Server selection menu.", NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server }, -#endif { NULL } }, }; @@ -1114,7 +1111,6 @@ DMenu MenuXF86Select = { { NULL } }, }; -#ifdef X_AS_PKG DMenu MenuXF86SelectCore = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "XFree86 base distribution types", @@ -1194,173 +1190,6 @@ DMenu MenuXF86SelectServer = { { NULL } }, }; -#else -DMenu MenuXF86SelectCore = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "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, - NULL, - { { "X Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "Select all below", - NULL, setX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { "Reset", "Reset all below", - NULL, clearX11Misc, NULL, NULL, ' ', ' ', ' ' }, - { " bin", "Client applications and shared libs", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_BIN }, - { " lib", "Data files needed at runtime", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LIB }, - { " cfg", "Configuration files", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_CFG }, - { " set", "XFree86 Setup Utility", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_SET }, - { " man", "Manual pages", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_MAN }, - { " doc", "READMEs and release notes", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_DOC }, - { " html", "HTML documentation files", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_HTML }, - { " lkit", "Server link kit for all other machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT }, - { " prog", "Programmer's header and library files", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_PROG }, -#if defined(__i386__) && defined(PC98) - { " 9set", "XFree86 Setup Utility for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_9SET }, - { " lk98", "Server link kit for PC98 machines", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86Dists, '[', 'X', ']', DIST_XF86_LKIT98 }, -#endif - { NULL } }, -}; - -DMenu MenuXF86SelectFonts = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "Font distribution selection.", - "Please check off the individual font distributions you wish to\n\ -install. At the minimum, you should install the standard\n\ -75 DPI and misc fonts if you're also installing a server\n\ -(these are selected by default).", - NULL, - NULL, - { { "X Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "All fonts", - NULL, setX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { "Reset", "Reset font selections", - NULL, clearX11Fonts, NULL, NULL, ' ', ' ', ' ' }, - { " fnts", "Standard 75 DPI and miscellaneous fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_MISC }, - { " f100", "100 DPI fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_100 }, - { " fcyr", "Cyrillic Fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_CYR }, - { " fscl", "Speedo and Type scalable fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SCALE }, - { " non", "Japanese, Chinese and other non-english fonts", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_NON }, - { " server", "Font server", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86FontDists, '[', 'X', ']', DIST_XF86_FONTS_SERVER }, - { NULL } }, -}; - -DMenu MenuXF86SelectServer = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "X Server selection.", - "Please check off the types of X servers you wish to install.\n" - "If you are unsure as to which server will work for your graphics card,\n" - "it is recommended that try the SVGA or VGA16 servers or, for PC98\n" - "machines, the 9EGC or 9840 servers.", - NULL, - NULL, - { { "X Exit", "Exit this menu (returning to previous)", - checkTrue, dmenuExit, NULL, NULL, '<', '<', '<' }, - { "All", "Select all of the above", - NULL, setX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { "Reset", "Reset all of the above", - NULL, clearX11Servers, NULL, NULL, ' ', ' ', ' ' }, - { " SVGA", "Standard VGA or Super VGA card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_SVGA }, - { " VGA16", "Standard 16 color VGA card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_VGA16 }, - { " Mono", "Standard Monochrome card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MONO }, - { " 3DL", "8, 16 and 24 bit color 3D Labs boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_3DL }, - { " 8514", "8-bit (256 color) IBM 8514 or compatible card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_8514 }, - { " AGX", "8-bit AGX card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_AGX }, - { " I128", "8, 16 and 24-bit #9 Imagine I128 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_I128 }, - { " Ma8", "8-bit ATI Mach8 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH8 }, - { " Ma32", "8 and 16-bit (65K color) ATI Mach32 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH32 }, - { " Ma64", "8 and 16-bit (65K color) ATI Mach64 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_MACH64 }, - { " P9K", "8, 16, and 24-bit color Weitek P9000 based boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_P9000 }, - { " S3", "8, 16 and 24-bit color S3 based boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3 }, - { " S3V", "8, 16 and 24-bit color S3 Virge based boards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_S3V }, - { " W32", "8-bit ET4000/W32, /W32i and /W32p cards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_W32 }, -#if defined(__i386__) && defined(PC98) - { " PC98", "Select an X server for a NEC PC98 [Submenu]", - NULL, dmenuSubmenu, NULL, &MenuXF86SelectPC98Server, '>', ' ', '>', 0 }, -#elif defined(__alpha__) - { " TGA", "TGA cards (alpha architecture only)", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_TGA }, -#endif - { NULL } }, -}; - -#if defined(__i386__) && defined(PC98) -DMenu MenuXF86SelectPC98Server = { - DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, - "PC98 X Server selection.", - "Please check off the types of NEC PC98 X servers you wish to install.\n\ -If you are unsure as to which server will work for your graphics card,\n\ -it is recommended that try the SVGA or VGA16 servers (the VGA16 and\n\ -Mono servers are particularly well-suited to most LCD displays).", - NULL, - NULL, - { { " 9480", "PC98 8-bit (256 color) PEGC-480 card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9480 }, - { " 9EGC", "PC98 4-bit (16 color) EGC card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9EGC }, - { " 9GA9", "PC98 GA-968V4/PCI (S3 968) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GA9 }, - { " 9GAN", "PC98 GANB-WAP (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9GAN }, - { " 9LPW", "PC98 PowerWindowLB (S3) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9LPW }, - { " 9MGA", "PC98 MGA (Matrox) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9MGA }, - { " 9NKV", "PC98 NKV-NEC (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NKV }, - { " 9NS3", "PC98 NEC (S3) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9NS3 }, - { " 9SPW", "PC98 SKB-PowerWindow (S3) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SPW }, - { " 9SVG", "PC98 generic SVGA card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9SVG }, - { " 9TGU", "PC98 Cyber9320 and TGUI9680 cards", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9TGU }, - { " 9WEP", "PC98 WAB-EP (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WEP }, - { " 9WS", "PC98 WABS (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WS }, - { " 9WSN", "PC98 WSN-A2F (cirrus) card", - dmenuFlagCheck, dmenuSetFlag, NULL, &XF86ServerDists, '[', 'X', ']', DIST_XF86_SERVER_9WSN }, - { NULL } } -}; -#endif -#endif /* !X_AS_PKG */ - DMenu MenuDiskDevices = { DMENU_CHECKLIST_TYPE | DMENU_SELECTION_RETURNS, "Select Drive(s)", diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 439f9d1..9f50e3ce 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -470,9 +470,6 @@ extern DMenu MenuXF86; /* XFree86 main menu */ extern DMenu MenuXF86Select; /* XFree86 distribution selection menu */ extern DMenu MenuXF86SelectCore; /* XFree86 core distribution menu */ extern DMenu MenuXF86SelectServer; /* XFree86 server distribution menu */ -#if !defined(X_AS_PKG) && defined(__i386__) && defined(PC98) -extern DMenu MenuXF86SelectPC98Server; /* XFree86 server distribution menu */ -#endif extern DMenu MenuXF86SelectFonts; /* XFree86 font selection menu */ extern DMenu MenuXDesktops; /* Disk devices menu */ extern DMenu MenuHTMLDoc; /* HTML Documentation menu */ @@ -665,9 +662,6 @@ extern int installFixitHoloShell(dialogMenuItem *self); extern int installFixitCDROM(dialogMenuItem *self); extern int installFixitFloppy(dialogMenuItem *self); extern int installFixupBase(dialogMenuItem *self); -#ifndef X_AS_PKG -extern int installFixupXFree(dialogMenuItem *self); -#endif extern int installUpgrade(dialogMenuItem *self); extern int installFilesystems(dialogMenuItem *self); extern int installVarDefaults(dialogMenuItem *self); -- cgit v1.1