mirror/freebsd
1
0
Fork 0
mirror of https://git.FreeBSD.org/src.git synced 2025-01-31 16:57:10 +00:00
Code Issues Releases Activity

Complete switch-over to XF86 3.2.

Browse Source
This commit is contained in:
Jordan K. Hubbard 1996-11-07 15:35:48 +00:00
parent 5b5a53eba9
commit 4cb0381943
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=19509
7 changed files with 17 additions and 17 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.53 1996/11/04 17:42:04 jkh Exp $
* $Id: config.c,v 1.54 1996/11/07 08:03:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -357,9 +357,9 @@ configNTP(dialogMenuItem *self)
int
configXFree86(dialogMenuItem *self)
{
if (file_executable("/usr/X11R6/bin/xf86config")) {
if (file_executable("/usr/X11R6/bin/XF86Setup")) {
dialog_clear();
systemExecute("/usr/X11R6/bin/xf86config");
systemExecute("/usr/X11R6/bin/XF86Setup");
return DITEM_SUCCESS | DITEM_RESTORE;
}
else {

6
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.74 1996/11/02 19:50:28 jkh Exp $
* $Id: dist.c,v 1.75 1996/11/06 19:15:22 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -75,7 +75,7 @@ static Distribution DistTable[] = {
{ "compat21", "/", &Dists, DIST_COMPAT21, NULL },
{ "commerce", "/usr/local", &Dists, DIST_COMMERCIAL, NULL },
{ "xperimnt", "/usr/local", &Dists, DIST_EXPERIMENTAL, NULL },
{ "XF86312", "/usr", &Dists, DIST_XF86, XF86DistTable },
{ "XF8632", "/usr", &Dists, DIST_XF86, XF86DistTable },
{ NULL },
};
@ -230,7 +230,7 @@ distSetXUser(dialogMenuItem *self)
{
distReset(NULL);
Dists = _DIST_USER;
XF86Dists = DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA;
XF86FontDists = DIST_XF86_FONTS_MISC;
return distSetXF86(NULL) | distMaybeSetDES(self);

2
release/sysinstall/dist.h
View File

@ -27,7 +27,7 @@
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
#define _DIST_XDEV \
(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
/* Subtypes for DES distribution */
#define DIST_DES_DES 0x0001

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.53 1996/11/04 17:42:04 jkh Exp $
* $Id: config.c,v 1.54 1996/11/07 08:03:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -357,9 +357,9 @@ configNTP(dialogMenuItem *self)
int
configXFree86(dialogMenuItem *self)
{
if (file_executable("/usr/X11R6/bin/xf86config")) {
if (file_executable("/usr/X11R6/bin/XF86Setup")) {
dialog_clear();
systemExecute("/usr/X11R6/bin/xf86config");
systemExecute("/usr/X11R6/bin/XF86Setup");
return DITEM_SUCCESS | DITEM_RESTORE;
}
else {

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.53 1996/11/04 17:42:04 jkh Exp $
* $Id: config.c,v 1.54 1996/11/07 08:03:18 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -357,9 +357,9 @@ configNTP(dialogMenuItem *self)
int
configXFree86(dialogMenuItem *self)
{
if (file_executable("/usr/X11R6/bin/xf86config")) {
if (file_executable("/usr/X11R6/bin/XF86Setup")) {
dialog_clear();
systemExecute("/usr/X11R6/bin/xf86config");
systemExecute("/usr/X11R6/bin/XF86Setup");
return DITEM_SUCCESS | DITEM_RESTORE;
}
else {

6
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.74 1996/11/02 19:50:28 jkh Exp $
* $Id: dist.c,v 1.75 1996/11/06 19:15:22 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -75,7 +75,7 @@ static Distribution DistTable[] = {
{ "compat21", "/", &Dists, DIST_COMPAT21, NULL },
{ "commerce", "/usr/local", &Dists, DIST_COMMERCIAL, NULL },
{ "xperimnt", "/usr/local", &Dists, DIST_EXPERIMENTAL, NULL },
{ "XF86312", "/usr", &Dists, DIST_XF86, XF86DistTable },
{ "XF8632", "/usr", &Dists, DIST_XF86, XF86DistTable },
{ NULL },
};
@ -230,7 +230,7 @@ distSetXUser(dialogMenuItem *self)
{
distReset(NULL);
Dists = _DIST_USER;
XF86Dists = DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86Dists = DIST_XF86_BIN | DIST_XF86_SET | DIST_XF86_LIB | DIST_XF86_MAN | DIST_XF86_SERVER | DIST_XF86_FONTS;
XF86ServerDists = DIST_XF86_SERVER_SVGA;
XF86FontDists = DIST_XF86_FONTS_MISC;
return distSetXF86(NULL) | distMaybeSetDES(self);

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

@ -27,7 +27,7 @@
(DIST_BIN | DIST_DOC | DIST_MANPAGES | DIST_DICT)
#define _DIST_XDEV \
(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
(DIST_XF86_BIN | DIST_XF86_LIB | DIST_XF86_PROG | DIST_XF86_MAN | DIST_XF86_SET | DIST_XF86_SET | DIST_XF86_SERVER | DIST_XF86_FONTS)
/* Subtypes for DES distribution */
#define DIST_DES_DES 0x0001