d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MF22: Important fixes for loading XFree86 distributions I forgot to

Browse Source 
merge after 2.2.7 (I was wondering why that bug looked so familiar!).
Also update some docs accordingly.
This commit is contained in:
Jordan K. Hubbard 1998-09-23 12:13:51 +00:00
parent bc767300f5
commit bf05096f52
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=39595
12 changed files with 1348 additions and 422 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
release/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.109 1998/03/13 11:12:53 jkh Exp $
* $Id: config.c,v 1.110 1998/03/24 09:51:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -542,8 +542,8 @@ configXEnvironment(dialogMenuItem *self)
}
else {
dialog_clear_norefresh();
msgConfirm("XFree86 does not appear to be installed! Please install\n"
"The XFree86 distribution before attempting to configure it.");
msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n"
"Please install this before attempting to configure XFree86.");
return DITEM_FAILURE | DITEM_RESTORE;
}
}

24
release/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.124 1998/06/10 01:15:46 jkh Exp $
* $Id: dist.c,v 1.125 1998/07/21 06:44:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,7 +117,7 @@ static Distribution XF86DistTable[] = {
{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
{ "X332src-1", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
{ "X332contrib", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
{ "X332ctrb", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
{ "X332bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
{ "X332cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
{ "X332doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
@ -197,6 +197,8 @@ distVerifyFlags(void)
XF86Dists |= DIST_XF86_SERVER;
if (XF86FontDists)
XF86Dists |= DIST_XF86_FONTS;
if (XF86Dists || XF86ServerDists || XF86FontDists)
Dists |= DIST_XF86;
if (isDebug())
msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
@ -260,13 +262,12 @@ distSetXDeveloper(dialogMenuItem *self)
{
int i;
distReset(NULL);
Dists = _DIST_DEVELOPER | DIST_XF86;
SrcDists = DIST_SRC_ALL;
i = distSetDeveloper(self);
Dists |= DIST_XF86;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86FontDists = DIST_XF86_FONTS_MISC;
i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
i |= distSetXF86(NULL);
distVerifyFlags();
return i;
}
@ -301,12 +302,12 @@ distSetXUser(dialogMenuItem *self)
{
int i;
distReset(NULL);
Dists = _DIST_USER | DIST_XF86;
i = distSetUser(self);
Dists |= DIST_XF86;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86FontDists = DIST_XF86_FONTS_MISC;
i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
i |= distSetXF86(NULL);
distVerifyFlags();
return i;
}
@ -324,7 +325,7 @@ distSetEverything(dialogMenuItem *self)
{
int i;
Dists = DIST_ALL;
Dists = DIST_ALL | DIST_XF86;
SrcDists = DIST_SRC_ALL;
XF86Dists = DIST_XF86_ALL;
XF86ServerDists = DIST_XF86_SERVER_ALL;
@ -379,7 +380,7 @@ distMaybeSetPorts(dialogMenuItem *self)
"This will give you ready access to over 1000 ported software packages,\n"
"though at a cost of around 35MB of disk space when \"clean\" and possibly\n"
"much more than that if a lot of the distribution tarballs are loaded\n"
"(unless you have the 2nd CD from a FreeBSD CDROM distribution available\n"
"(unless you have the 4th CD from a FreeBSD CDROM distribution available\n"
"and can mount it on /cdrom, in which case this is far less of a problem).\n\n"
"The ports collection is a very valuable resource and, if you have at least\n"
"100MB to spare in your /usr partition, well worth having around.\n\n"
@ -774,6 +775,7 @@ distExtractAll(dialogMenuItem *self)
if (!mediaVerify() || !mediaDevice->init(mediaDevice))
return DITEM_FAILURE;
distVerifyFlags();
dialog_clear_norefresh();
msgNotify("Attempting to install all selected distributions..");
/* Try for 3 times around the loop, then give up. */

2
release/sysinstall/dist.h
View File

@ -85,7 +85,7 @@
#define DIST_XF86_SERVER_9WEP 0x0000800
#define DIST_XF86_SERVER_9WS 0x0001000
#define DIST_XF86_SERVER_9WSN 0x0002000
#define DIST_XF86_SERVER_8514 0x0004001
#define DIST_XF86_SERVER_8514 0x0004000
#define DIST_XF86_SERVER_AGX 0x0008000
#define DIST_XF86_SERVER_I128 0x0010000
#define DIST_XF86_SERVER_MACH8 0x0020000

1688
release/sysinstall/help/XF86.hlp
View File

File diff suppressed because it is too large Load Diff

2
release/sysinstall/help/distributions.hlp
View File

@ -2,7 +2,7 @@ DISTRIBUTION INFORMATION
------------------------
An ``X-'' prefixed before a distribution set means that the XFree86
3.3.2 base distribution, libraries, manual pages, SVGA server and a
3.3.2.3 base distribution, libraries, manual pages, SVGA server and a
set of default fonts will be selected in addition to the set itself.
If you select such a set, you will also be presented with a set of
menus for customizing the selections to your desired X Window System

4
release/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.53 1998/03/23 05:59:13 jkh Exp $
* $Id: index.c,v 1.54 1998/03/24 09:51:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -100,6 +100,7 @@ static char *descrs[] = {
"networking", "Networking utilities.",
"news", "USENET News support software.",
"numeric", "Mathematical computation software.",
"offix", "An office automation suite of sorts.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"pilot", "Software support for the USR Palm Pilot(tm).",
@ -107,6 +108,7 @@ static char *descrs[] = {
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",
"programming", "Software development utilities and libraries.",
"python", "Software related to the python language.",
"russian", "Ported software for the Russian market.",
"security", "System security software.",
"shells", "Various shells (tcsh, bash, etc).",

6
usr.sbin/sade/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.109 1998/03/13 11:12:53 jkh Exp $
* $Id: config.c,v 1.110 1998/03/24 09:51:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -542,8 +542,8 @@ configXEnvironment(dialogMenuItem *self)
}
else {
dialog_clear_norefresh();
msgConfirm("XFree86 does not appear to be installed! Please install\n"
"The XFree86 distribution before attempting to configure it.");
msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n"
"Please install this before attempting to configure XFree86.");
return DITEM_FAILURE | DITEM_RESTORE;
}
}

6
usr.sbin/sysinstall/config.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: config.c,v 1.109 1998/03/13 11:12:53 jkh Exp $
* $Id: config.c,v 1.110 1998/03/24 09:51:54 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -542,8 +542,8 @@ configXEnvironment(dialogMenuItem *self)
}
else {
dialog_clear_norefresh();
msgConfirm("XFree86 does not appear to be installed! Please install\n"
"The XFree86 distribution before attempting to configure it.");
msgConfirm("The XFree86 setup utility you chose does not appear to be installed!\n"
"Please install this before attempting to configure XFree86.");
return DITEM_FAILURE | DITEM_RESTORE;
}
}

24
usr.sbin/sysinstall/dist.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: dist.c,v 1.124 1998/06/10 01:15:46 jkh Exp $
* $Id: dist.c,v 1.125 1998/07/21 06:44:38 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -117,7 +117,7 @@ static Distribution XF86DistTable[] = {
{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
{ "XF86332", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
{ "X332src-1", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
{ "X332contrib", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
{ "X332ctrb", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
{ "X332bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
{ "X332cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
{ "X332doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
@ -197,6 +197,8 @@ distVerifyFlags(void)
XF86Dists |= DIST_XF86_SERVER;
if (XF86FontDists)
XF86Dists |= DIST_XF86_FONTS;
if (XF86Dists || XF86ServerDists || XF86FontDists)
Dists |= DIST_XF86;
if (isDebug())
msgDebug("Dist Masks: Dists: %0x, DES: %0x, Srcs: %0x\nXServer: %0x, XFonts: %0x, XDists: %0x\n",
Dists, DESDists, SrcDists, XF86ServerDists, XF86FontDists, XF86Dists);
@ -260,13 +262,12 @@ distSetXDeveloper(dialogMenuItem *self)
{
int i;
distReset(NULL);
Dists = _DIST_DEVELOPER | DIST_XF86;
SrcDists = DIST_SRC_ALL;
i = distSetDeveloper(self);
Dists |= DIST_XF86;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86FontDists = DIST_XF86_FONTS_MISC;
i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
i |= distSetXF86(NULL);
distVerifyFlags();
return i;
}
@ -301,12 +302,12 @@ distSetXUser(dialogMenuItem *self)
{
int i;
distReset(NULL);
Dists = _DIST_USER | DIST_XF86;
i = distSetUser(self);
Dists |= DIST_XF86;
XF86ServerDists = DIST_XF86_SERVER_SVGA | DIST_XF86_SERVER_VGA16;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_CFG | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86FontDists = DIST_XF86_FONTS_MISC;
i = distSetXF86(NULL) | distMaybeSetDES(self) | distMaybeSetPorts(self);
i |= distSetXF86(NULL);
distVerifyFlags();
return i;
}
@ -324,7 +325,7 @@ distSetEverything(dialogMenuItem *self)
{
int i;
Dists = DIST_ALL;
Dists = DIST_ALL | DIST_XF86;
SrcDists = DIST_SRC_ALL;
XF86Dists = DIST_XF86_ALL;
XF86ServerDists = DIST_XF86_SERVER_ALL;
@ -379,7 +380,7 @@ distMaybeSetPorts(dialogMenuItem *self)
"This will give you ready access to over 1000 ported software packages,\n"
"though at a cost of around 35MB of disk space when \"clean\" and possibly\n"
"much more than that if a lot of the distribution tarballs are loaded\n"
"(unless you have the 2nd CD from a FreeBSD CDROM distribution available\n"
"(unless you have the 4th CD from a FreeBSD CDROM distribution available\n"
"and can mount it on /cdrom, in which case this is far less of a problem).\n\n"
"The ports collection is a very valuable resource and, if you have at least\n"
"100MB to spare in your /usr partition, well worth having around.\n\n"
@ -774,6 +775,7 @@ distExtractAll(dialogMenuItem *self)
if (!mediaVerify() || !mediaDevice->init(mediaDevice))
return DITEM_FAILURE;
distVerifyFlags();
dialog_clear_norefresh();
msgNotify("Attempting to install all selected distributions..");
/* Try for 3 times around the loop, then give up. */

2
usr.sbin/sysinstall/dist.h
View File

@ -85,7 +85,7 @@
#define DIST_XF86_SERVER_9WEP 0x0000800
#define DIST_XF86_SERVER_9WS 0x0001000
#define DIST_XF86_SERVER_9WSN 0x0002000
#define DIST_XF86_SERVER_8514 0x0004001
#define DIST_XF86_SERVER_8514 0x0004000
#define DIST_XF86_SERVER_AGX 0x0008000
#define DIST_XF86_SERVER_I128 0x0010000
#define DIST_XF86_SERVER_MACH8 0x0020000

2
usr.sbin/sysinstall/help/distributions.hlp
View File

@ -2,7 +2,7 @@ DISTRIBUTION INFORMATION
------------------------
An ``X-'' prefixed before a distribution set means that the XFree86
3.3.2 base distribution, libraries, manual pages, SVGA server and a
3.3.2.3 base distribution, libraries, manual pages, SVGA server and a
set of default fonts will be selected in addition to the set itself.
If you select such a set, you will also be presented with a set of
menus for customizing the selections to your desired X Window System

4
usr.sbin/sysinstall/index.c
View File

@ -4,7 +4,7 @@
* This is probably the last program in the `sysinstall' line - the next
* generation being essentially a complete rewrite.
*
* $Id: index.c,v 1.53 1998/03/23 05:59:13 jkh Exp $
* $Id: index.c,v 1.54 1998/03/24 09:51:55 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -100,6 +100,7 @@ static char *descrs[] = {
"networking", "Networking utilities.",
"news", "USENET News support software.",
"numeric", "Mathematical computation software.",
"offix", "An office automation suite of sorts.",
"orphans", "Packages without a home elsewhere.",
"perl5", "Utilities/modules for the PERL5 language..",
"pilot", "Software support for the USR Palm Pilot(tm).",
@ -107,6 +108,7 @@ static char *descrs[] = {
"print", "Utilities for dealing with printing.",
"printing", "Utilities for dealing with printing.",
"programming", "Software development utilities and libraries.",
"python", "Software related to the python language.",
"russian", "Ported software for the Russian market.",
"security", "System security software.",
"shells", "Various shells (tcsh, bash, etc).",