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

Update for XFree86 3.3.1

Browse Source
This commit is contained in:
Jordan K. Hubbard 1997-09-09 16:26:29 +00:00
parent 27495372d1
commit 948ae9ab81
2 changed files with 94 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

94
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.110 1997/06/13 11:00:13 jkh Exp $
* $Id: dist.c,v 1.111 1997/07/01 03:50:58 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -122,64 +122,64 @@ static Distribution SrcDistTable[] = {
#ifndef USE_XIG_ENVIRONMENT
/* The XFree86 distribution */
static Distribution XF86DistTable[] = {
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
{ "XF86-xc", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
{ "XF86-co", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
{ "X33bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
{ "X33cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
{ "X33doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
{ "X33html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
{ "X33lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
{ "X33lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
{ "X33lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
{ "X33man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
{ "X33prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
{ "X33ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
{ "X33set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
{ "X331bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
{ "X331cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
{ "X331doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
{ "X331html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
{ "X331lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
{ "X331lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
{ "X331lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
{ "X331man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
{ "X331prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
{ "X331ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
{ "X331set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
{ NULL },
};
/* The XFree86 server distribution */
static Distribution XF86ServerDistTable[] = {
{ "X338514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
{ "X339480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
{ "X339EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
{ "X339GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
{ "X339GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
{ "X339LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
{ "X339NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
{ "X339NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
{ "X339SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
{ "X339TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
{ "X339WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
{ "X339WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
{ "X339WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
{ "X33AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
{ "X33I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
{ "X33Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
{ "X33Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
{ "X33Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
{ "X33Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
{ "X33P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
{ "X33S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
{ "X33S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
{ "X33SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
{ "X33VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
{ "X33W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
{ "X33nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ "X33vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
{ "X3318514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
{ "X3319480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
{ "X3319EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
{ "X3319GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
{ "X3319GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
{ "X3319LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
{ "X3319NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
{ "X3319NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
{ "X3319SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
{ "X3319TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
{ "X3319WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
{ "X3319WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
{ "X3319WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
{ "X331AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
{ "X331I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
{ "X331Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
{ "X331Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
{ "X331Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
{ "X331Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
{ "X331P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
{ "X331S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
{ "X331S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
{ "X331SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
{ "X331VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
{ "X331W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
{ "X331nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ "X331vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
{ NULL },
};
/* The XFree86 font distribution */
static Distribution XF86FontDistTable[] = {
{ "X33fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
{ "X33f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
{ "X33fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
{ "X33fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
{ "X33fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
{ "X33fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
{ "X331fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
{ "X331f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
{ "X331fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
{ "X331fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
{ "X331fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
{ "X331fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
{ NULL },
};
#endif /* !USE_XIG_ENVIRONMENT */

94
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.110 1997/06/13 11:00:13 jkh Exp $
* $Id: dist.c,v 1.111 1997/07/01 03:50:58 jkh Exp $
*
* Copyright (c) 1995
* Jordan Hubbard. All rights reserved.
@ -122,64 +122,64 @@ static Distribution SrcDistTable[] = {
#ifndef USE_XIG_ENVIRONMENT
/* The XFree86 distribution */
static Distribution XF86DistTable[] = {
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
{ "XF8633", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_FONTS, XF86FontDistTable },
{ "XF86331", "/usr/X11R6", &XF86Dists, DIST_XF86_SERVER, XF86ServerDistTable },
{ "XF86-xc", "/usr/X11R6/src", &XF86Dists, DIST_XF86_SRC, NULL },
{ "XF86-co", "/usr/X11R6/src", &XF86Dists, DIST_XF86_CSRC, NULL },
{ "X33bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
{ "X33cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
{ "X33doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
{ "X33html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
{ "X33lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
{ "X33lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
{ "X33lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
{ "X33man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
{ "X33prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
{ "X33ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
{ "X33set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
{ "X331bin", "/usr/X11R6", &XF86Dists, DIST_XF86_BIN, NULL },
{ "X331cfg", "/usr/X11R6", &XF86Dists, DIST_XF86_CFG, NULL },
{ "X331doc", "/usr/X11R6", &XF86Dists, DIST_XF86_DOC, NULL },
{ "X331html", "/usr/X11R6", &XF86Dists, DIST_XF86_HTML, NULL },
{ "X331lib", "/usr/X11R6", &XF86Dists, DIST_XF86_LIB, NULL },
{ "X331lk98", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT98, NULL },
{ "X331lkit", "/usr/X11R6", &XF86Dists, DIST_XF86_LKIT, NULL },
{ "X331man", "/usr/X11R6", &XF86Dists, DIST_XF86_MAN, NULL },
{ "X331prog", "/usr/X11R6", &XF86Dists, DIST_XF86_PROG, NULL },
{ "X331ps", "/usr/X11R6", &XF86Dists, DIST_XF86_PS, NULL },
{ "X331set", "/usr/X11R6", &XF86Dists, DIST_XF86_SET, NULL },
{ NULL },
};
/* The XFree86 server distribution */
static Distribution XF86ServerDistTable[] = {
{ "X338514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
{ "X339480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
{ "X339EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
{ "X339GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
{ "X339GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
{ "X339LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
{ "X339NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
{ "X339NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
{ "X339SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
{ "X339TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
{ "X339WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
{ "X339WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
{ "X339WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
{ "X33AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
{ "X33I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
{ "X33Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
{ "X33Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
{ "X33Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
{ "X33Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
{ "X33P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
{ "X33S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
{ "X33S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
{ "X33SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
{ "X33VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
{ "X33W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
{ "X33nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ "X33vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
{ "X3318514", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_8514, NULL },
{ "X3319480", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9480, NULL },
{ "X3319EGC", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9EGC, NULL },
{ "X3319GA9", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GA9, NULL },
{ "X3319GAN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9GAN, NULL },
{ "X3319LPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9LPW, NULL },
{ "X3319NKV", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NKV, NULL },
{ "X3319NS3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9NS3, NULL },
{ "X3319SPW", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9SPW, NULL },
{ "X3319TGU", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9TGU, NULL },
{ "X3319WEP", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WEP, NULL },
{ "X3319WS", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WS, NULL },
{ "X3319WSN", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_9WSN, NULL },
{ "X331AGX", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_AGX, NULL },
{ "X331I128", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_I128, NULL },
{ "X331Ma8", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH8, NULL },
{ "X331Ma32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH32,NULL },
{ "X331Ma64", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MACH64,NULL },
{ "X331Mono", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_MONO, NULL },
{ "X331P9K", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_P9000, NULL },
{ "X331S3", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3, NULL },
{ "X331S3V", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_S3V, NULL },
{ "X331SVGA", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_SVGA, NULL },
{ "X331VG16", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VGA16, NULL },
{ "X331W32", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_W32, NULL },
{ "X331nest", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_NEST, NULL },
{ "X331vfb", "/usr/X11R6", &XF86ServerDists, DIST_XF86_SERVER_VFB, NULL },
{ NULL },
};
/* The XFree86 font distribution */
static Distribution XF86FontDistTable[] = {
{ "X33fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
{ "X33f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
{ "X33fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
{ "X33fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
{ "X33fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
{ "X33fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
{ "X331fnts", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_MISC, NULL },
{ "X331f100", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_100, NULL },
{ "X331fcyr", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_CYR, NULL },
{ "X331fscl", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SCALE, NULL },
{ "X331fnon", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_NON, NULL },
{ "X331fsrv", "/usr/X11R6", &XF86FontDists, DIST_XF86_FONTS_SERVER, NULL },
{ NULL },
};
#endif /* !USE_XIG_ENVIRONMENT */