diff options
author | jkh <jkh@FreeBSD.org> | 2000-09-07 16:05:52 +0000 |
---|---|---|
committer | jkh <jkh@FreeBSD.org> | 2000-09-07 16:05:52 +0000 |
commit | 48a226d4c835b83eafbfa399f61d7c6f2163a291 (patch) | |
tree | 545dd0d4361c901d3df747989f3c807a11cd9ca1 /usr.sbin/sade/install.c | |
parent | 5240cf8e358ee03ca9844377bddf6386d80e8f5d (diff) | |
download | FreeBSD-src-48a226d4c835b83eafbfa399f61d7c6f2163a291.zip FreeBSD-src-48a226d4c835b83eafbfa399f61d7c6f2163a291.tar.gz |
MFS: sync with -stable by removing the now-vestigal X_AS_PKG stuff.
Diffstat (limited to 'usr.sbin/sade/install.c')
-rw-r--r-- | usr.sbin/sade/install.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 888151f..67399ca 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -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; } |