jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-12-04 10:19:26 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

MFS: sync with -stable by removing the now-vestigal X_AS_PKG stuff.

Browse Source
This commit is contained in:
Jordan K. Hubbard 2000-09-07 16:05:52 +00:00
parent c613a5e7dc
commit c0953990e0
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=65574
11 changed files with 0 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
release/sysinstall/Makefile
View File

@ -21,9 +21,6 @@ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
.if ${MACHINE_ARCH} != "i386" || defined(X_AS_PKG)
CFLAGS+= -DX_AS_PKG
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio

18
release/sysinstall/dist.c
View File

@ -277,9 +277,7 @@ distSetX(void)
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;
#ifndef X_AS_PKG
return distSetXF86(NULL);
#endif
return DITEM_SUCCESS;
}
@ -887,9 +885,6 @@ distExtractAll(dialogMenuItem *self)
int old_dists, retries = 0, status = DITEM_SUCCESS;
char buf[512];
WINDOW *w;
#ifdef X_AS_PKG
int want_x_package = 0;
#endif
/* paranoia */
if (!Dists) {
@ -907,23 +902,10 @@ distExtractAll(dialogMenuItem *self)
w = savescr();
msgNotify("Attempting to install all selected distributions..");
#ifdef X_AS_PKG
/* Clear any XFree86 dist flags, but remember they were present. */
if(Dists & DIST_XF86)
want_x_package = 1;
Dists &= ~DIST_XF86;
/*Dists &= ~(DIST_XF86 | XF86Dists | XF86ServerDists | XF86FontDists);*/
#endif
/* Try for 3 times around the loop, then give up. */
while (Dists && ++retries < 3)
distExtract(NULL, DistTable);
#ifdef X_AS_PKG
if (want_x_package)
status |= installX11package(NULL);
#endif
dialog_clear_norefresh();
/* Only do bin fixup if bin dist was successfully extracted */
if ((old_dists & DIST_BIN) && !(Dists & DIST_BIN))

17
release/sysinstall/install.c
View File

@ -817,21 +817,6 @@ installFixupBin(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE;
}
#ifdef X_AS_PKG
int
installX11package(dialogMenuItem *self)
{
WINDOW *w = savescr();
int i;
dialog_clear_norefresh();
msgNotify("Installing XFree86 package...");
i = package_add("XFree86");
restorescr(w);
return i;
}
#endif
/* Fix side-effects from the the XFree86 installation */
int
installFixupXFree(dialogMenuItem *self)
@ -843,14 +828,12 @@ installFixupXFree(dialogMenuItem *self)
vsystem("chmod -R a+r /usr/X11R6");
vsystem("find /usr/X11R6 -type d | xargs chmod a+x");
#ifndef X_AS_PKG
/* Also do bogus minimal package registration so ports don't whine */
if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) {
dialog_clear_norefresh();
msgNotify("Installing package metainfo..");
vsystem("tar xpzf /usr/X11R6/lib/X11/pkgreg.tar.gz -C / && rm /usr/X11R6/lib/X11/pkgreg.tar.gz");
}
#endif
}
return DITEM_SUCCESS | DITEM_RESTORE;
}

4
release/sysinstall/menus.c
View File

@ -867,11 +867,7 @@ DMenu MenuSubDistributions = {
{ " local", "Local additions collection",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
{ " XFree86", "The XFree86 3.3.6 distribution",
#ifdef X_AS_PKG
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 },
#else
x11FlagCheck, distSetXF86 },
#endif
{ NULL } },
};

3
usr.sbin/sade/Makefile
View File

@ -21,9 +21,6 @@ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
.if ${MACHINE_ARCH} != "i386" || defined(X_AS_PKG)
CFLAGS+= -DX_AS_PKG
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio

17
usr.sbin/sade/install.c
View File

@ -817,21 +817,6 @@ installFixupBin(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE;
}
#ifdef X_AS_PKG
int
installX11package(dialogMenuItem *self)
{
WINDOW *w = savescr();
int i;
dialog_clear_norefresh();
msgNotify("Installing XFree86 package...");
i = package_add("XFree86");
restorescr(w);
return i;
}
#endif
/* Fix side-effects from the the XFree86 installation */
int
installFixupXFree(dialogMenuItem *self)
@ -843,14 +828,12 @@ installFixupXFree(dialogMenuItem *self)
vsystem("chmod -R a+r /usr/X11R6");
vsystem("find /usr/X11R6 -type d | xargs chmod a+x");
#ifndef X_AS_PKG
/* Also do bogus minimal package registration so ports don't whine */
if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) {
dialog_clear_norefresh();
msgNotify("Installing package metainfo..");
vsystem("tar xpzf /usr/X11R6/lib/X11/pkgreg.tar.gz -C / && rm /usr/X11R6/lib/X11/pkgreg.tar.gz");
}
#endif
}
return DITEM_SUCCESS | DITEM_RESTORE;
}

4
usr.sbin/sade/menus.c
View File

@ -867,11 +867,7 @@ DMenu MenuSubDistributions = {
{ " local", "Local additions collection",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
{ " XFree86", "The XFree86 3.3.6 distribution",
#ifdef X_AS_PKG
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 },
#else
x11FlagCheck, distSetXF86 },
#endif
{ NULL } },
};

3
usr.sbin/sysinstall/Makefile
View File

@ -21,9 +21,6 @@ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR}
.if ${MACHINE} == "pc98"
CFLAGS+= -DPC98
.endif
.if ${MACHINE_ARCH} != "i386" || defined(X_AS_PKG)
CFLAGS+= -DX_AS_PKG
.endif
DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO}
LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio

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

@ -277,9 +277,7 @@ distSetX(void)
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;
#ifndef X_AS_PKG
return distSetXF86(NULL);
#endif
return DITEM_SUCCESS;
}
@ -887,9 +885,6 @@ distExtractAll(dialogMenuItem *self)
int old_dists, retries = 0, status = DITEM_SUCCESS;
char buf[512];
WINDOW *w;
#ifdef X_AS_PKG
int want_x_package = 0;
#endif
/* paranoia */
if (!Dists) {
@ -907,23 +902,10 @@ distExtractAll(dialogMenuItem *self)
w = savescr();
msgNotify("Attempting to install all selected distributions..");
#ifdef X_AS_PKG
/* Clear any XFree86 dist flags, but remember they were present. */
if(Dists & DIST_XF86)
want_x_package = 1;
Dists &= ~DIST_XF86;
/*Dists &= ~(DIST_XF86 | XF86Dists | XF86ServerDists | XF86FontDists);*/
#endif
/* Try for 3 times around the loop, then give up. */
while (Dists && ++retries < 3)
distExtract(NULL, DistTable);
#ifdef X_AS_PKG
if (want_x_package)
status |= installX11package(NULL);
#endif
dialog_clear_norefresh();
/* Only do bin fixup if bin dist was successfully extracted */
if ((old_dists & DIST_BIN) && !(Dists & DIST_BIN))

17
usr.sbin/sysinstall/install.c
View File

@ -817,21 +817,6 @@ installFixupBin(dialogMenuItem *self)
return DITEM_SUCCESS | DITEM_RESTORE;
}
#ifdef X_AS_PKG
int
installX11package(dialogMenuItem *self)
{
WINDOW *w = savescr();
int i;
dialog_clear_norefresh();
msgNotify("Installing XFree86 package...");
i = package_add("XFree86");
restorescr(w);
return i;
}
#endif
/* Fix side-effects from the the XFree86 installation */
int
installFixupXFree(dialogMenuItem *self)
@ -843,14 +828,12 @@ installFixupXFree(dialogMenuItem *self)
vsystem("chmod -R a+r /usr/X11R6");
vsystem("find /usr/X11R6 -type d | xargs chmod a+x");
#ifndef X_AS_PKG
/* Also do bogus minimal package registration so ports don't whine */
if (file_readable("/usr/X11R6/lib/X11/pkgreg.tar.gz")) {
dialog_clear_norefresh();
msgNotify("Installing package metainfo..");
vsystem("tar xpzf /usr/X11R6/lib/X11/pkgreg.tar.gz -C / && rm /usr/X11R6/lib/X11/pkgreg.tar.gz");
}
#endif
}
return DITEM_SUCCESS | DITEM_RESTORE;
}

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

@ -867,11 +867,7 @@ DMenu MenuSubDistributions = {
{ " local", "Local additions collection",
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL},
{ " XFree86", "The XFree86 3.3.6 distribution",
#ifdef X_AS_PKG
dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 },
#else
x11FlagCheck, distSetXF86 },
#endif
{ NULL } },
};