Deleted Added
sdiff udiff text old ( 149541 ) new ( 156123 )
full compact
dist.c (149541) dist.c (156123)
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last program in the `sysinstall' line - the next
5 * generation being essentially a complete rewrite.
6 *
1/*
2 * The new sysinstall program.
3 *
4 * This is probably the last program in the `sysinstall' line - the next
5 * generation being essentially a complete rewrite.
6 *
7 * $FreeBSD: head/usr.sbin/sysinstall/dist.c 149541 2005-08-28 02:30:50Z murray $
7 * $FreeBSD: head/usr.sbin/sysinstall/dist.c 156123 2006-02-28 21:49:33Z jhb $
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

--- 47 unchanged lines hidden (view full) ---

63static Distribution XOrgDistTable[];
64
65#define DTE_TARBALL(name, mask, flag, directory) \
66 { name, mask, DIST_ ## flag, DT_TARBALL, { directory } }
67#define DTE_PACKAGE(name, mask, flag, package) \
68 { name, mask, DIST_ ## flag, DT_PACKAGE, { package } }
69#define DTE_SUBDIST(name, mask, flag, subdist) \
70 { name, mask, DIST_ ## flag, DT_SUBDIST, { .my_dist = subdist } }
8 *
9 * Copyright (c) 1995
10 * Jordan Hubbard. All rights reserved.
11 *
12 * Redistribution and use in source and binary forms, with or without
13 * modification, are permitted provided that the following conditions
14 * are met:
15 * 1. Redistributions of source code must retain the above copyright

--- 47 unchanged lines hidden (view full) ---

63static Distribution XOrgDistTable[];
64
65#define DTE_TARBALL(name, mask, flag, directory) \
66 { name, mask, DIST_ ## flag, DT_TARBALL, { directory } }
67#define DTE_PACKAGE(name, mask, flag, package) \
68 { name, mask, DIST_ ## flag, DT_PACKAGE, { package } }
69#define DTE_SUBDIST(name, mask, flag, subdist) \
70 { name, mask, DIST_ ## flag, DT_SUBDIST, { .my_dist = subdist } }
71#define DTE_END { NULL, NULL, 0, 0, { NULL } }
71
72#define BASE_DIST (&DistTable[0])
73
74/* The top-level distribution categories */
75static Distribution DistTable[] = {
76 DTE_TARBALL("base", &Dists, BASE, "/"),
77 DTE_TARBALL("doc", &Dists, DOC, "/"),
78 DTE_TARBALL("games", &Dists, GAMES, "/"),

--- 4 unchanged lines hidden (view full) ---

83 DTE_TARBALL("info", &Dists, INFO, "/"),
84#ifdef __amd64__
85 DTE_TARBALL("lib32", &Dists, LIB32, "/"),
86#endif
87 DTE_SUBDIST("src", &Dists, SRC, SrcDistTable),
88 DTE_TARBALL("ports", &Dists, PORTS, "/usr"),
89 DTE_TARBALL("local", &Dists, LOCAL, "/"),
90 DTE_SUBDIST("X.Org", &Dists, XORG, XOrgDistTable),
72
73#define BASE_DIST (&DistTable[0])
74
75/* The top-level distribution categories */
76static Distribution DistTable[] = {
77 DTE_TARBALL("base", &Dists, BASE, "/"),
78 DTE_TARBALL("doc", &Dists, DOC, "/"),
79 DTE_TARBALL("games", &Dists, GAMES, "/"),

--- 4 unchanged lines hidden (view full) ---

84 DTE_TARBALL("info", &Dists, INFO, "/"),
85#ifdef __amd64__
86 DTE_TARBALL("lib32", &Dists, LIB32, "/"),
87#endif
88 DTE_SUBDIST("src", &Dists, SRC, SrcDistTable),
89 DTE_TARBALL("ports", &Dists, PORTS, "/usr"),
90 DTE_TARBALL("local", &Dists, LOCAL, "/"),
91 DTE_SUBDIST("X.Org", &Dists, XORG, XOrgDistTable),
91 { NULL },
92 DTE_END,
92};
93
94/* The /usr/src distribution */
95static Distribution SrcDistTable[] = {
96 DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"),
97 DTE_TARBALL("scontrib", &SrcDists, SRC_CONTRIB, "/usr/src"),
98 DTE_TARBALL("scrypto", &SrcDists, SRC_SCRYPTO, "/usr/src"),
99 DTE_TARBALL("sgnu", &SrcDists, SRC_GNU, "/usr/src"),

--- 8 unchanged lines hidden (view full) ---

108 DTE_TARBALL("ssecure", &SrcDists, SRC_SSECURE, "/usr/src"),
109 DTE_TARBALL("ssbin", &SrcDists, SRC_SBIN, "/usr/src"),
110 DTE_TARBALL("sshare", &SrcDists, SRC_SHARE, "/usr/src"),
111 DTE_TARBALL("ssys", &SrcDists, SRC_SYS, "/usr/src"),
112 DTE_TARBALL("subin", &SrcDists, SRC_UBIN, "/usr/src"),
113 DTE_TARBALL("susbin", &SrcDists, SRC_USBIN, "/usr/src"),
114 DTE_TARBALL("stools", &SrcDists, SRC_TOOLS, "/usr/src"),
115 DTE_TARBALL("srescue", &SrcDists, SRC_RESCUE, "/usr/src"),
93};
94
95/* The /usr/src distribution */
96static Distribution SrcDistTable[] = {
97 DTE_TARBALL("sbase", &SrcDists, SRC_BASE, "/usr/src"),
98 DTE_TARBALL("scontrib", &SrcDists, SRC_CONTRIB, "/usr/src"),
99 DTE_TARBALL("scrypto", &SrcDists, SRC_SCRYPTO, "/usr/src"),
100 DTE_TARBALL("sgnu", &SrcDists, SRC_GNU, "/usr/src"),

--- 8 unchanged lines hidden (view full) ---

109 DTE_TARBALL("ssecure", &SrcDists, SRC_SSECURE, "/usr/src"),
110 DTE_TARBALL("ssbin", &SrcDists, SRC_SBIN, "/usr/src"),
111 DTE_TARBALL("sshare", &SrcDists, SRC_SHARE, "/usr/src"),
112 DTE_TARBALL("ssys", &SrcDists, SRC_SYS, "/usr/src"),
113 DTE_TARBALL("subin", &SrcDists, SRC_UBIN, "/usr/src"),
114 DTE_TARBALL("susbin", &SrcDists, SRC_USBIN, "/usr/src"),
115 DTE_TARBALL("stools", &SrcDists, SRC_TOOLS, "/usr/src"),
116 DTE_TARBALL("srescue", &SrcDists, SRC_RESCUE, "/usr/src"),
116 { NULL },
117 DTE_END,
117};
118
119/* The X.Org distribution */
120static Distribution XOrgDistTable[] = {
121 DTE_PACKAGE("Xbin", &XOrgDists, XORG_CLIENTS, "xorg-clients"),
122 DTE_PACKAGE("Xlib", &XOrgDists, XORG_LIB, "xorg-libraries"),
123 DTE_PACKAGE("Xman", &XOrgDists, XORG_MAN, "xorg-manpages"),
124 DTE_PACKAGE("Xdoc", &XOrgDists, XORG_DOC, "xorg-documents"),

--- 6 unchanged lines hidden (view full) ---

131
132 DTE_PACKAGE("Xfmsc", &XOrgDists, XORG_FONTS_MISC, "xorg-fonts-miscbitmaps"),
133 DTE_PACKAGE("Xf75", &XOrgDists, XORG_FONTS_75, "xorg-fonts-75dpi"),
134 DTE_PACKAGE("Xf100", &XOrgDists, XORG_FONTS_100, "xorg-fonts-100dpi"),
135 DTE_PACKAGE("Xfcyr", &XOrgDists, XORG_FONTS_CYR, "xorg-fonts-cyrillic"),
136 DTE_PACKAGE("Xft1", &XOrgDists, XORG_FONTS_T1, "xorg-fonts-type1"),
137 DTE_PACKAGE("Xftt", &XOrgDists, XORG_FONTS_TT, "xorg-fonts-truetype"),
138 DTE_PACKAGE("Xfs", &XOrgDists, XORG_FONTSERVER, "xorg-fontserver"),
118};
119
120/* The X.Org distribution */
121static Distribution XOrgDistTable[] = {
122 DTE_PACKAGE("Xbin", &XOrgDists, XORG_CLIENTS, "xorg-clients"),
123 DTE_PACKAGE("Xlib", &XOrgDists, XORG_LIB, "xorg-libraries"),
124 DTE_PACKAGE("Xman", &XOrgDists, XORG_MAN, "xorg-manpages"),
125 DTE_PACKAGE("Xdoc", &XOrgDists, XORG_DOC, "xorg-documents"),

--- 6 unchanged lines hidden (view full) ---

132
133 DTE_PACKAGE("Xfmsc", &XOrgDists, XORG_FONTS_MISC, "xorg-fonts-miscbitmaps"),
134 DTE_PACKAGE("Xf75", &XOrgDists, XORG_FONTS_75, "xorg-fonts-75dpi"),
135 DTE_PACKAGE("Xf100", &XOrgDists, XORG_FONTS_100, "xorg-fonts-100dpi"),
136 DTE_PACKAGE("Xfcyr", &XOrgDists, XORG_FONTS_CYR, "xorg-fonts-cyrillic"),
137 DTE_PACKAGE("Xft1", &XOrgDists, XORG_FONTS_T1, "xorg-fonts-type1"),
138 DTE_PACKAGE("Xftt", &XOrgDists, XORG_FONTS_TT, "xorg-fonts-truetype"),
139 DTE_PACKAGE("Xfs", &XOrgDists, XORG_FONTSERVER, "xorg-fontserver"),
139 { NULL },
140 DTE_END,
140};
141
142static int distMaybeSetPorts(dialogMenuItem *self);
143
144static void
145distVerifyFlags(void)
146{
147 if (SrcDists)

--- 669 unchanged lines hidden --- 		141};
142
143static int distMaybeSetPorts(dialogMenuItem *self);
144
145static void
146distVerifyFlags(void)
147{
148 if (SrcDists)

--- 669 unchanged lines hidden ---