diff options
author | jkh <jkh@FreeBSD.org> | 1999-03-19 10:54:38 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 1999-03-19 10:54:38 +0000 |
commit | 2dae5ffd5c4c68c1cd320125a65923ddf159be24 (patch) | |
tree | 8a34965da2ef831e1626d462505e0d00b58e5b92 /usr.sbin | |
parent | 9dfb67dcc52a615300d6627d4db6529fd0eeb917 (diff) | |
download | FreeBSD-src-2dae5ffd5c4c68c1cd320125a65923ddf159be24.zip FreeBSD-src-2dae5ffd5c4c68c1cd320125a65923ddf159be24.tar.gz |
Offer an X Kern Developer collection, by user request (it's also more
orthogonal to the other entries).
Clean up X selection code a bit.
Choose proper architecture subdirectories on mirror sites now that we've
gone fully to the new multi-arch directory scheme.
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/sade/menus.c | 181 | ||||
-rw-r--r-- | usr.sbin/sade/sade.h | 3 | ||||
-rw-r--r-- | usr.sbin/sysinstall/dist.c | 35 | ||||
-rw-r--r-- | usr.sbin/sysinstall/menus.c | 181 | ||||
-rw-r--r-- | usr.sbin/sysinstall/sysinstall.h | 3 |
5 files changed, 218 insertions, 185 deletions
diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index d1b9f7b..c0a5bd5 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.191 1999/02/14 21:35:02 jkh Exp $ + * $Id: menus.c,v 1.192 1999/03/09 12:36:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -37,10 +37,11 @@ #include "sysinstall.h" #ifdef __alpha__ -#define _AR(str) str "alpha/" +#define _AS(str) str "alpha/" #else /* i386 */ -#define _AR(str) str "i386/" +#define _AS(str) str "i386/" #endif +#define _AP(str) _AS(str "/pub/FreeBSD/releases/") /* Miscellaneous work routines for menus */ static int @@ -155,6 +156,12 @@ checkDistKernDeveloper(dialogMenuItem *self) } static int +checkDistXKernDeveloper(dialogMenuItem *self) +{ + return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_SYS); +} + +static int checkDistUser(dialogMenuItem *self) { return IS_USER(Dists, 0); @@ -488,163 +495,163 @@ DMenu MenuMediaFTP = { "Select a site that's close!", "install", { { "Primary Site", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH _AR("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, + VAR_FTP_PATH _AS("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, { "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH _AR("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, + VAR_FTP_PATH _AS("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, { "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH _AR("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, + VAR_FTP_PATH _AS("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ar.freebsd.org") }, { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.au.freebsd.org") }, { "Australia #2", "ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.au.freebsd.org") }, { "Australia #3", "ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.au.freebsd.org") }, { "Australia #4", "ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.au.freebsd.org") }, { "Australia #5", "ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.au.freebsd.org") }, { "Brazil", "ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.br.freebsd.org") }, { "Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.br.freebsd.org") }, { "Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.br.freebsd.org") }, { "Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.br.freebsd.org") }, { "Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.br.freebsd.org") }, { "Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.br.freebsd.org") }, { "Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp7.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp7.br.freebsd.org") }, { "Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ca.freebsd.org") }, { "Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.cz.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.cz.freebsd.org") }, { "Denmark", "ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.dk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.dk.freebsd.org") }, { "Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.dk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.dk.freebsd.org") }, { "Estonia", "ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ee.freebsd.org") }, { "Finland", "ftp.fi.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.fi.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.fi.freebsd.org") }, { "France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.fr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.fr.freebsd.org") }, { "France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.fr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.fr.freebsd.org") }, { "Germany", "ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.de.freebsd.org") }, { "Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.de.freebsd.org") }, { "Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.de.freebsd.org") }, { "Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.de.freebsd.org") }, { "Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.de.freebsd.org") }, { "Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.de.freebsd.org") }, { "Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp7.de.freebsd.org") }, { "Holland", "ftp.nl.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.nl.freebsd.org") }, { "Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.hk.super.net") }, { "Iceland", "ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.is.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.is.freebsd.org") }, { "Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ie.freebsd.org") }, { "Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.il.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.il.freebsd.org") }, { "Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.il.freebsd.org") }, { "Japan", "ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.jp.freebsd.org") }, { "Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.jp.freebsd.org") }, { "Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.jp.freebsd.org") }, { "Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.jp.freebsd.org") }, { "Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.jp.freebsd.org") }, { "Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.jp.freebsd.org") }, { "Korea", "ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.kr.freebsd.org") }, { "Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.kr.freebsd.org") }, { "Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.kr.freebsd.org") }, { "Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.kr.freebsd.org") }, { "Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.kr.freebsd.org") }, { "Poland", "ftp.pl.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.pl.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.pl.freebsd.org") }, { "Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.pt.freebsd.org/pub/misc/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.pt.freebsd.org") }, { "Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.pt.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.pt.freebsd.org") }, { "Russia", "ftp.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ru.freebsd.org") }, { "Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.ru.freebsd.org") }, { "Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.ru.freebsd.org") }, { "Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.ru.freebsd.org") }, { "South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.za.freebsd.org") }, { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.za.freebsd.org") }, { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.za.freebsd.org") }, { "South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.za.freebsd.org") }, { "Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.es.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.es.freebsd.org") }, { "Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.es.freebsd.org") }, { "Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.se.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.se.freebsd.org") }, { "Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.se.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.se.freebsd.org") }, { "Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.se.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.se.freebsd.org") }, { "Taiwan", "ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD" }, + VAR_FTP_PATH _AP("=ftp://ftp.tw.freebsd.org") }, { "Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.tw.freebsd.org/pub/FreeBSD" }, + VAR_FTP_PATH _AP("=ftp://ftp2.tw.freebsd.org") }, { "Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.tw.freebsd.org") }, { "Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" }, + VAR_FTP_PATH _AS("=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/") }, { "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.uk.freebsd.org") }, { "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.uk.freebsd.org") }, { "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.uk.freebsd.org") }, { "UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.uk.freebsd.org") }, { "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.freebsd.org") }, { "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.freebsd.org") }, { "USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.freebsd.org") }, { "USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.freebsd.org") }, { "USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.freebsd.org") }, { "USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.freebsd.org") }, { NULL } } }; @@ -716,17 +723,19 @@ DMenu MenuDistributions = { "distributions", { { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, - { "2 X-Developer", "Same as above, but includes the X Window System", + { "2 X-Developer", "Same as above + X Window System", checkDistXDeveloper, distSetXDeveloper }, { "3 Kern-Developer", "Full binaries and doc, kernel sources only", checkDistKernDeveloper, distSetKernDeveloper }, - { "4 User", "Average user - binaries and doc only", + { "4 X-Kern-Developer", "Same as above + X Window System", + checkDistXKernDeveloper, distSetXKernDeveloper }, + { "5 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "5 X-User", "Same as above, but includes the X Window System", + { "6 X-User", "Same as above + X Window System", checkDistXUser, distSetXUser }, - { "6 Minimal", "The smallest configuration possible", + { "7 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, - { "7 Custom", "Specify your own distribution set", + { "8 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, { "8 All", "All sources and binaries (incl X Window System)", checkDistEverything, distSetEverything }, diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h index 481a068..42537d0 100644 --- a/usr.sbin/sade/sade.h +++ b/usr.sbin/sade/sade.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.157 1999/02/05 22:25:13 jkh Exp $ + * $Id: sysinstall.h,v 1.158 1999/02/09 22:18:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -462,6 +462,7 @@ extern int distSetCustom(dialogMenuItem *self); extern int distSetDeveloper(dialogMenuItem *self); extern int distSetXDeveloper(dialogMenuItem *self); extern int distSetKernDeveloper(dialogMenuItem *self); +extern int distSetXKernDeveloper(dialogMenuItem *self); extern int distSetUser(dialogMenuItem *self); extern int distSetXUser(dialogMenuItem *self); extern int distSetMinimum(dialogMenuItem *self); diff --git a/usr.sbin/sysinstall/dist.c b/usr.sbin/sysinstall/dist.c index 1fc1f97..31451a8 100644 --- a/usr.sbin/sysinstall/dist.c +++ b/usr.sbin/sysinstall/dist.c @@ -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.135 1999/02/07 12:57:04 jkh Exp $ + * $Id: dist.c,v 1.136 1999/02/14 18:53:17 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -246,6 +246,16 @@ distConfig(dialogMenuItem *self) return DITEM_SUCCESS | DITEM_REDRAW; } +static int +distSetX(void) +{ + 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; + return distSetXF86(NULL); +} + int distSetDeveloper(dialogMenuItem *self) { @@ -265,11 +275,7 @@ distSetXDeveloper(dialogMenuItem *self) int i; 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); + i |= distSetX(); distVerifyFlags(); return i; } @@ -288,6 +294,17 @@ distSetKernDeveloper(dialogMenuItem *self) } int +distSetXKernDeveloper(dialogMenuItem *self) +{ + int i; + + i = distSetKernDeveloper(self); + i |= distSetX(); + distVerifyFlags(); + return i; +} + +int distSetUser(dialogMenuItem *self) { int i; @@ -305,11 +322,7 @@ distSetXUser(dialogMenuItem *self) int i; 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); + i |= distSetX(); distVerifyFlags(); return i; } diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index d1b9f7b..c0a5bd5 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $Id: menus.c,v 1.191 1999/02/14 21:35:02 jkh Exp $ + * $Id: menus.c,v 1.192 1999/03/09 12:36:28 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -37,10 +37,11 @@ #include "sysinstall.h" #ifdef __alpha__ -#define _AR(str) str "alpha/" +#define _AS(str) str "alpha/" #else /* i386 */ -#define _AR(str) str "i386/" +#define _AS(str) str "i386/" #endif +#define _AP(str) _AS(str "/pub/FreeBSD/releases/") /* Miscellaneous work routines for menus */ static int @@ -155,6 +156,12 @@ checkDistKernDeveloper(dialogMenuItem *self) } static int +checkDistXKernDeveloper(dialogMenuItem *self) +{ + return IS_DEVELOPER(Dists, DIST_XF86) && _IS_SET(SrcDists, DIST_SRC_SYS); +} + +static int checkDistUser(dialogMenuItem *self) { return IS_USER(Dists, 0); @@ -488,163 +495,163 @@ DMenu MenuMediaFTP = { "Select a site that's close!", "install", { { "Primary Site", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH _AR("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, + VAR_FTP_PATH _AS("=ftp://ftp.freebsd.org/pub/FreeBSD/releases/") }, { "URL", "Specify some other ftp site by URL", NULL, dmenuSetVariable, NULL, VAR_FTP_PATH "=other" }, { "4.0 SNAP Server", "current.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH _AR("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, + VAR_FTP_PATH _AS("=ftp://current.freebsd.org/pub/FreeBSD/snapshots/") }, { "3.0 SNAP Server", "releng3.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH _AR("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, + VAR_FTP_PATH _AS("=ftp://releng3.freebsd.org/pub/FreeBSD/snapshots/") }, { "Argentina", "ftp.ar.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ar.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ar.freebsd.org") }, { "Australia", "ftp.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.au.freebsd.org") }, { "Australia #2", "ftp2.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.au.freebsd.org") }, { "Australia #3", "ftp3.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.au.freebsd.org") }, { "Australia #4", "ftp4.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.au.freebsd.org") }, { "Australia #5", "ftp5.au.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.au.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.au.freebsd.org") }, { "Brazil", "ftp.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.br.freebsd.org") }, { "Brazil #2", "ftp2.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.br.freebsd.org") }, { "Brazil #3", "ftp3.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.br.freebsd.org") }, { "Brazil #4", "ftp4.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.br.freebsd.org") }, { "Brazil #5", "ftp5.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.br.freebsd.org") }, { "Brazil #6", "ftp6.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.br.freebsd.org") }, { "Brazil #7", "ftp7.br.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp7.br.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp7.br.freebsd.org") }, { "Canada", "ftp.ca.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ca.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ca.freebsd.org") }, { "Czech Republic", "ftp.cz.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.cz.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.cz.freebsd.org") }, { "Denmark", "ftp.dk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.dk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.dk.freebsd.org") }, { "Denmark #2", "ftp2.dk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.dk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.dk.freebsd.org") }, { "Estonia", "ftp.ee.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ee.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ee.freebsd.org") }, { "Finland", "ftp.fi.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.fi.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.fi.freebsd.org") }, { "France", "ftp.fr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.fr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.fr.freebsd.org") }, { "France #2", "ftp2.fr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.fr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.fr.freebsd.org") }, { "Germany", "ftp.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.de.freebsd.org") }, { "Germany #2", "ftp2.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.de.freebsd.org") }, { "Germany #3", "ftp3.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.de.freebsd.org") }, { "Germany #4", "ftp4.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.de.freebsd.org") }, { "Germany #5", "ftp5.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.de.freebsd.org") }, { "Germany #6", "ftp6.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.de.freebsd.org") }, { "Germany #7", "ftp7.de.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp7.de.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp7.de.freebsd.org") }, { "Holland", "ftp.nl.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.nl.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.nl.freebsd.org") }, { "Hong Kong", "ftp.hk.super.net", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.hk.super.net/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.hk.super.net") }, { "Iceland", "ftp.is.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.is.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.is.freebsd.org") }, { "Ireland", "ftp.ie.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ie.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ie.freebsd.org") }, { "Israel", "ftp.il.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.il.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.il.freebsd.org") }, { "Israel #2", "ftp2.il.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.il.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.il.freebsd.org") }, { "Japan", "ftp.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.jp.freebsd.org") }, { "Japan #2", "ftp2.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.jp.freebsd.org") }, { "Japan #3", "ftp3.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.jp.freebsd.org") }, { "Japan #4", "ftp4.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.jp.freebsd.org") }, { "Japan #5", "ftp5.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.jp.freebsd.org") }, { "Japan #6", "ftp6.jp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.jp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.jp.freebsd.org") }, { "Korea", "ftp.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.kr.freebsd.org") }, { "Korea #2", "ftp2.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.kr.freebsd.org") }, { "Korea #3", "ftp3.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.kr.freebsd.org") }, { "Korea #4", "ftp4.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.kr.freebsd.org") }, { "Korea #5", "ftp5.kr.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.kr.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.kr.freebsd.org") }, { "Poland", "ftp.pl.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.pl.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.pl.freebsd.org") }, { "Portugal", "ftp.pt.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.pt.freebsd.org/pub/misc/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.pt.freebsd.org") }, { "Portugal #2", "ftp2.pt.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.pt.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.pt.freebsd.org") }, { "Russia", "ftp.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.ru.freebsd.org") }, { "Russia #2", "ftp2.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.ru.freebsd.org") }, { "Russia #3", "ftp3.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.ru.freebsd.org") }, { "Russia #4", "ftp4.ru.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.ru.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.ru.freebsd.org") }, { "South Africa", "ftp.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.za.freebsd.org") }, { "South Africa #2", "ftp2.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.za.freebsd.org") }, { "South Africa #3", "ftp3.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.za.freebsd.org") }, { "South Africa #4", "ftp4.za.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.za.freebsd.org") }, { "Spain", "ftp.es.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.es.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.es.freebsd.org") }, { "Spain #2", "ftp2.es.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.za.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.es.freebsd.org") }, { "Sweden", "ftp.se.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.se.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.se.freebsd.org") }, { "Sweden #2", "ftp2.se.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.se.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.se.freebsd.org") }, { "Sweden #3", "ftp3.se.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.se.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.se.freebsd.org") }, { "Taiwan", "ftp.tw.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.tw.freebsd.org/pub/FreeBSD" }, + VAR_FTP_PATH _AP("=ftp://ftp.tw.freebsd.org") }, { "Taiwan #2", "ftp2.tw.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.tw.freebsd.org/pub/FreeBSD" }, + VAR_FTP_PATH _AP("=ftp://ftp2.tw.freebsd.org") }, { "Taiwan #3", "ftp3.tw.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.tw.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.tw.freebsd.org") }, { "Thailand", "ftp.nectec.or.th", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/" }, + VAR_FTP_PATH _AS("=ftp://ftp.nectec.or.th/pub/mirrors/FreeBSD/") }, { "UK", "ftp.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.uk.freebsd.org") }, { "UK #2", "ftp2.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.uk.freebsd.org") }, { "UK #3", "ftp3.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.uk.freebsd.org") }, { "UK #4", "ftp4.uk.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.uk.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.uk.freebsd.org") }, { "USA", "ftp.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp.freebsd.org") }, { "USA #2", "ftp2.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp2.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp2.freebsd.org") }, { "USA #3", "ftp3.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp3.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp3.freebsd.org") }, { "USA #4", "ftp4.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp4.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp4.freebsd.org") }, { "USA #5", "ftp5.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp5.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp5.freebsd.org") }, { "USA #6", "ftp6.freebsd.org", NULL, dmenuSetVariable, NULL, - VAR_FTP_PATH "=ftp://ftp6.freebsd.org/pub/FreeBSD/" }, + VAR_FTP_PATH _AP("=ftp://ftp6.freebsd.org") }, { NULL } } }; @@ -716,17 +723,19 @@ DMenu MenuDistributions = { "distributions", { { "1 Developer", "Full sources, binaries and doc but no games", checkDistDeveloper, distSetDeveloper }, - { "2 X-Developer", "Same as above, but includes the X Window System", + { "2 X-Developer", "Same as above + X Window System", checkDistXDeveloper, distSetXDeveloper }, { "3 Kern-Developer", "Full binaries and doc, kernel sources only", checkDistKernDeveloper, distSetKernDeveloper }, - { "4 User", "Average user - binaries and doc only", + { "4 X-Kern-Developer", "Same as above + X Window System", + checkDistXKernDeveloper, distSetXKernDeveloper }, + { "5 User", "Average user - binaries and doc only", checkDistUser, distSetUser }, - { "5 X-User", "Same as above, but includes the X Window System", + { "6 X-User", "Same as above + X Window System", checkDistXUser, distSetXUser }, - { "6 Minimal", "The smallest configuration possible", + { "7 Minimal", "The smallest configuration possible", checkDistMinimum, distSetMinimum }, - { "7 Custom", "Specify your own distribution set", + { "8 Custom", "Specify your own distribution set", NULL, dmenuSubmenu, NULL, &MenuSubDistributions, '>', '>', '>' }, { "8 All", "All sources and binaries (incl X Window System)", checkDistEverything, distSetEverything }, diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h index 481a068..42537d0 100644 --- a/usr.sbin/sysinstall/sysinstall.h +++ b/usr.sbin/sysinstall/sysinstall.h @@ -4,7 +4,7 @@ * This is probably the last attempt in the `sysinstall' line, the next * generation being slated to essentially a complete rewrite. * - * $Id: sysinstall.h,v 1.157 1999/02/05 22:25:13 jkh Exp $ + * $Id: sysinstall.h,v 1.158 1999/02/09 22:18:10 jkh Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -462,6 +462,7 @@ extern int distSetCustom(dialogMenuItem *self); extern int distSetDeveloper(dialogMenuItem *self); extern int distSetXDeveloper(dialogMenuItem *self); extern int distSetKernDeveloper(dialogMenuItem *self); +extern int distSetXKernDeveloper(dialogMenuItem *self); extern int distSetUser(dialogMenuItem *self); extern int distSetXUser(dialogMenuItem *self); extern int distSetMinimum(dialogMenuItem *self); |