* add SVR4 and OSF/1 enabling in the Start Up config menu

* deals with X11 install when all we have is the Port (such as on the Alpha)

Ok'ed by:	JKH

1 files changed, 17 insertions, 0 deletions

diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index ec508e1..5f187b7 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -797,6 +797,21 @@ 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)
@@ -808,12 +823,14 @@ 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;
 }