From 544cd270718f99cd8ace270283bee201401acc10 Mon Sep 17 00:00:00 2001
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 3 Dec 2002 19:36:12 +0000
Subject: [PATCH] Rename installX11package() to installPackage() and tweak it
 so that it can be used to install any arbitrary package.

Approved by:	re
---
 usr.sbin/sade/install.c          | 8 +++-----
 usr.sbin/sade/sade.h             | 2 +-
 usr.sbin/sysinstall/install.c    | 8 +++-----
 usr.sbin/sysinstall/sysinstall.h | 2 +-
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c
index b9fe9b2fcbba..9862e5627a79 100644
--- a/usr.sbin/sade/install.c
+++ b/usr.sbin/sade/install.c
@@ -842,20 +842,18 @@ installFixupBin(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_RESTORE;
 }
 
-#ifdef X_AS_PKG
 int
-installX11package(dialogMenuItem *self)
+installPackage(dialogMenuItem *self, char *desc, char *package)
 {
     WINDOW *w = savescr();
     int i;
 
     dialog_clear_norefresh();
-    msgNotify("Installing XFree86 package...");
-    i = package_add("XFree86-4");
+    msgNotify("Installing %s package...", desc);
+    i = package_add(package);
     restorescr(w);
     return i;
 }
-#endif
 
 /* Fix side-effects from the the XFree86 installation */
 int
diff --git a/usr.sbin/sade/sade.h b/usr.sbin/sade/sade.h
index 81fdd35981aa..1a0e20a7b94c 100644
--- a/usr.sbin/sade/sade.h
+++ b/usr.sbin/sade/sade.h
@@ -642,7 +642,7 @@ extern int	installUpgrade(dialogMenuItem *self);
 extern int	installFilesystems(dialogMenuItem *self);
 extern int	installVarDefaults(dialogMenuItem *self);
 extern void	installEnvironment(void);
-extern int	installX11package(dialogMenuItem *self);
+extern int	installPackage(dialogMenuItem *self, char *package, char *desc);
 extern Boolean	copySelf(void);
 
 /* kget.c */
diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c
index b9fe9b2fcbba..9862e5627a79 100644
--- a/usr.sbin/sysinstall/install.c
+++ b/usr.sbin/sysinstall/install.c
@@ -842,20 +842,18 @@ installFixupBin(dialogMenuItem *self)
     return DITEM_SUCCESS | DITEM_RESTORE;
 }
 
-#ifdef X_AS_PKG
 int
-installX11package(dialogMenuItem *self)
+installPackage(dialogMenuItem *self, char *desc, char *package)
 {
     WINDOW *w = savescr();
     int i;
 
     dialog_clear_norefresh();
-    msgNotify("Installing XFree86 package...");
-    i = package_add("XFree86-4");
+    msgNotify("Installing %s package...", desc);
+    i = package_add(package);
     restorescr(w);
     return i;
 }
-#endif
 
 /* Fix side-effects from the the XFree86 installation */
 int
diff --git a/usr.sbin/sysinstall/sysinstall.h b/usr.sbin/sysinstall/sysinstall.h
index 81fdd35981aa..1a0e20a7b94c 100644
--- a/usr.sbin/sysinstall/sysinstall.h
+++ b/usr.sbin/sysinstall/sysinstall.h
@@ -642,7 +642,7 @@ extern int	installUpgrade(dialogMenuItem *self);
 extern int	installFilesystems(dialogMenuItem *self);
 extern int	installVarDefaults(dialogMenuItem *self);
 extern void	installEnvironment(void);
-extern int	installX11package(dialogMenuItem *self);
+extern int	installPackage(dialogMenuItem *self, char *package, char *desc);
 extern Boolean	copySelf(void);
 
 /* kget.c */