diff options
author | obrien <obrien@FreeBSD.org> | 2002-04-02 20:42:54 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2002-04-02 20:42:54 +0000 |
commit | 60f91e4cada4f9a237e8a2858a93c8beef63130d (patch) | |
tree | d43bab971b0e937a1970dc0705e09080ceb98367 /usr.sbin/sade/install.c | |
parent | 2c4739409a5f713a428487bdefbc90a4f835d93a (diff) | |
download | FreeBSD-src-60f91e4cada4f9a237e8a2858a93c8beef63130d.zip FreeBSD-src-60f91e4cada4f9a237e8a2858a93c8beef63130d.tar.gz |
Switch to using XFree86 version 4. We do this thru installing the package,
so know we have proper PKG registration and dependency information.
This is a WIP for 5.0 DP #1, so it is still rough around the edges and
does not GC the old XFree86 3.3.6 handling stuff that should be GC'ed.
Sponsored by: FreeBSD Mall, Inc.
Diffstat (limited to 'usr.sbin/sade/install.c')
-rw-r--r-- | usr.sbin/sade/install.c | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 892f8fa..d54d7f6 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -870,6 +870,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-4"); + restorescr(w); + return i; +} +#endif + /* Fix side-effects from the the XFree86 installation */ int installFixupXFree(dialogMenuItem *self) @@ -881,12 +896,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; } |