From owner-p4-releng  Tue Apr  2 12:58:26 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0D2E837B416; Tue,  2 Apr 2002 12:58:03 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 98AAB37B432
	for <perforce@freebsd.org>; Tue,  2 Apr 2002 12:57:55 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g32KvtZ16850
	for perforce@freebsd.org; Tue, 2 Apr 2002 12:57:55 -0800 (PST)
	(envelope-from murray@freebsd.org)
Date: Tue, 2 Apr 2002 12:57:55 -0800 (PST)
Message-Id: <200204022057.g32KvtZ16850@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to murray@freebsd.org using -f
From: Murray Stokely <murray@FreeBSD.org>
Subject: PERFORCE change 8920 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

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