diff options
Diffstat (limited to 'usr.sbin/sade')
| -rw-r--r-- | usr.sbin/sade/Makefile | 3 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 17 | ||||
| -rw-r--r-- | usr.sbin/sade/menus.c | 4 |
3 files changed, 0 insertions, 24 deletions
diff --git a/usr.sbin/sade/Makefile b/usr.sbin/sade/Makefile index f30ef54..c65464a 100644 --- a/usr.sbin/sade/Makefile +++ b/usr.sbin/sade/Makefile @@ -21,9 +21,6 @@ CFLAGS+= -Wall -I${.CURDIR}/../../gnu/lib/libdialog -I${.OBJDIR} .if ${MACHINE} == "pc98" CFLAGS+= -DPC98 .endif -.if ${MACHINE_ARCH} != "i386" || defined(X_AS_PKG) -CFLAGS+= -DX_AS_PKG -.endif DPADD= ${LIBDIALOG} ${LIBNCURSES} ${LIBMYTINFO} ${LIBUTIL} ${LIBDISK} ${LIBFTPIO} LDADD= -ldialog -lncurses -lmytinfo -lutil -ldisk -lftpio 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; } diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index f06d5bd..eee9959 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -867,11 +867,7 @@ DMenu MenuSubDistributions = { { " local", "Local additions collection", dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_LOCAL}, { " XFree86", "The XFree86 3.3.6 distribution", -#ifdef X_AS_PKG - dmenuFlagCheck, dmenuSetFlag, NULL, &Dists, '[', 'X', ']', DIST_XF86 }, -#else x11FlagCheck, distSetXF86 }, -#endif { NULL } }, }; |
