Date: Tue, 2 Apr 2002 12:57:55 -0800 (PST) From: Murray Stokely <murray@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8920 for review Message-ID: <200204022057.g32KvtZ16850@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8920 Change 8920 by murray@murray_builder on 2002/04/02 12:57:09 IFC - install.c WITHOUT David's /usr/tmp -> /var/tmp change, which is too risky this late. Affected files ... ... //depot/releng/5_dp1/src/usr.sbin/sysinstall/install.c#2 integrate Differences ... ==== //depot/releng/5_dp1/src/usr.sbin/sysinstall/install.c#2 (text+ko) ==== @@ -4,7 +4,7 @@ * This is probably the last program in the `sysinstall' line - the next * generation being essentially a complete rewrite. * - * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.319 2002/02/08 13:42:35 brian Exp $ + * $FreeBSD: src/usr.sbin/sysinstall/install.c,v 1.321 2002/04/02 20:42:52 obrien Exp $ * * Copyright (c) 1995 * Jordan Hubbard. All rights reserved. @@ -870,6 +870,21 @@ 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-4"); + restorescr(w); + return i; +} +#endif + /* Fix side-effects from the the XFree86 installation */ int installFixupXFree(dialogMenuItem *self) @@ -881,12 +896,14 @@ 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; } To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-releng" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200204022057.g32KvtZ16850>