From 1a50e1e5a963ddda7f70e7445bf9a7dcdaa4d7b0 Mon Sep 17 00:00:00 2001 From: chase Date: Sat, 12 May 2018 16:18:11 -0700 Subject: [PATCH] Remove bsdi support --- cde/config/cf/Imake.cf | 10 --- cde/config/cf/Imakefile | 1 - cde/config/cf/bsdi.cf | 150 --------------------------------- cde/config/imake/imakemdep.h | 8 +- cde/programs/dtlogin/chooser.c | 2 +- 5 files changed, 3 insertions(+), 168 deletions(-) delete mode 100644 cde/config/cf/bsdi.cf diff --git a/cde/config/cf/Imake.cf b/cde/config/cf/Imake.cf index ad53872e..529dacd7 100644 --- a/cde/config/cf/Imake.cf +++ b/cde/config/cf/Imake.cf @@ -40,16 +40,6 @@ XCOMM $TOG: Imake.cf /main/30 1998/04/28 13:55:25 barstow $ # define VaxArchitecture #endif /* vax */ -#ifdef bsdi -# define MacroIncludeFile -# define MacroFile bsdi.cf -# undef bsdi -# define BSD386Architecture -# define i386BsdArchitecture -# define i386Architecture -# undef i386 -#endif /* bsdi */ - #ifdef __OpenBSD__ # undef __OpenBSD__ # undef __NetBSD__ diff --git a/cde/config/cf/Imakefile b/cde/config/cf/Imakefile index 5f1ed0cd..7673c776 100644 --- a/cde/config/cf/Imakefile +++ b/cde/config/cf/Imakefile @@ -67,7 +67,6 @@ Oki.cf \ Win32.cf \ apollo.cf \ bsd.cf \ -bsdi.cf \ convex.cf \ cray.cf \ fujitsu.cf \ diff --git a/cde/config/cf/bsdi.cf b/cde/config/cf/bsdi.cf deleted file mode 100644 index a6760687..00000000 --- a/cde/config/cf/bsdi.cf +++ /dev/null @@ -1,150 +0,0 @@ -XCOMM platform: $XConsortium: bsdi.cf /main/22 1996/09/28 16:09:30 rws $ -XCOMM platform: $XFree86: xc/config/cf/bsdi.cf,v 3.19 1995/10/21 11:26:00 dawes Exp $ - -#ifndef OSName -#define OSName BSD/OS 2.0 -#endif -#ifndef OSVendor -#define OSVendor BSDI -#endif -XCOMM operating system: OSName -#ifndef OSMajorVersion -#define OSMajorVersion 2 -#endif -#ifndef OSMinorVersion -#define OSMinorVersion 0 -#endif - -#define HasPutenv YES -#define HasBSD44Sockets YES - -XCOMM BSD/OS 2.0 comes with gcc 2.6.3 installed as gcc2 and gcc. -XCOMM gcc 1.42 is installed as cc. -XCOMM BSD/386 1.1 comes with gcc 2.5.8 installed as gcc2. -XCOMM gcc 1.42 is installed as cc and gcc. -XCOMM BSD/386 1.0 comes with gcc 1.40 as the only compiler. -XCOMM The default is to use gcc2 on release 2.0 and 1.1 and gcc1 on 1.0 -XCOMM The defaults can be altered by defining "HasGcc2" as YES or NO in -XCOMM xf86site.def - -#ifndef HasGcc -# define HasGcc YES -#endif -#if OSMajorVersion > 1 || OSMinorVersion >= 1 -# ifndef HasGcc2 -# define HasGcc2 YES -# endif -#endif -#if HasGcc2 -# ifndef HasGcc2ForCplusplus -# define HasGcc2ForCplusplus YES -# endif -# define CcCmd gcc2 -# define OptimizedCDebugFlags DefaultGcc2i386Opt -m486 -#else -# define CcCmd cc -# define OptimizedCDebugFlags -O -#endif -#define CppCmd /usr/bin/cpp -#define TroffCmd groff -Tps -#define MkdirHierCmd mkdir -p -#define SetTtyGroup YES -#define HasNdbm YES -#define HasWChar32 YES -#define DirFailPrefix - -#define AvoidNullMakeCommand YES -# ifndef GccUsesGas -# define GccUsesGas YES -# endif -#if HasGcc -#if UseInstalled -#define DefaultCCOptions /**/ -#else -#define DefaultCCOptions -ansi -#endif -#endif - -#if GccUsesGas -# define GccGasOption -DGCCUSESGAS -#else -# define GccGasOption /**/ -#endif - -#define ServerExtraDefines GccGasOption XFree86ServerDefines -#define ServerOSDefines XFree86ServerOSDefines -DDDXTIME -#define XFree86ConsoleDefines /**/ -#define AsmDefines -DUSE_GAS - -#define StandardDefines -DCSRG_BASED - -#define InstallCmd /usr/bin/install -#define EqnCmd eqn -Tps - COL = col - NEQN = eqn -Tascii - NROFF = nroff - -#define DefaultUserPath :/bin:/usr/bin:/usr/local/bin:$(BINDIR) -#define DefaultSystemPath /sbin:/usr/sbin:/bin:/usr/bin:$(BINDIR) - -XCOMM Man pages need to be formatted when installed, so override the default -XCOMM imake rules. - -#define ManSuffix 1 -#define ManSourcePath $(MANPATH)/cat - -#define InstallManPageLong(file,destdir,dest) @@\ -all:: file.0 @@\ - @@\ -file.0:: file.man @@\ - @if [ -f file.man ]; \ @@\ - then \ @@\ - cat file.man | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.man; \ @@\ - cp /tmp/$$$$.man file.0; \ @@\ - $(RM) /tmp/$$$$.man; \ @@\ - fi @@\ - @@\ -file.man:: @@\ - @@\ -install.man:: @@\ - MakeDir($(DESTDIR)destdir) @@\ - -@if [ -f file.0 ]; \ @@\ - then \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) file.0 $(DESTDIR)destdir/dest.0; \@@\ - fi - -#define InstallGenManPageLong(file,destdir,dest,suffix) @@\ - InstallManPageLong(file,destdir,dest) - -#define InstallMultipleManSuffix(list,dest,suff) @@\ -install.man:: @@\ - MakeDir($(DESTDIR)dest) @@\ - case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in list; do \ @@\ - (set -x; \ @@\ - cat $$i.suff | $(NEQN) | $(TBL) | $(NROFF) $(MANMACROS) | $(COL) >/tmp/$$$$.suff; \ @@\ - $(INSTALL) -c $(INSTMANFLAGS) /tmp/$$$$.suff $(DESTDIR)dest/$$i.0; \ @@\ - $(RM) /tmp/$$$$.suff); \ @@\ - done - -#define InstallMultipleMan(list,dest) @@\ - InstallMultipleManSuffix(list,dest,man) - -#define InstallManPageAliases(file,destdir,aliases) @@\ -install.man:: @@\ - @case '${MFLAGS}' in *[i]*) set +e;; esac; \ @@\ - for i in aliases; do \ @@\ - (set -x; \ @@\ - $(RM) $(DESTDIR)destdir/$$i.0;\ @@\ - (cd $(DESTDIR)destdir; $(LN) file.0 $$i.0);\ @@\ - ); \ @@\ - done - -#define InstallGenManPageAliases(file,destdir,suffix,aliases) @@\ - InstallManPageAliases(file,destdir,aliases) - -/* - * These seem redundant, but leave them in for now. - */ -#define i386Bsd 1 -#define i386Bsdi 1 -#include diff --git a/cde/config/imake/imakemdep.h b/cde/config/imake/imakemdep.h index a8e818aa..115109cc 100644 --- a/cde/config/imake/imakemdep.h +++ b/cde/config/imake/imakemdep.h @@ -258,8 +258,7 @@ in this Software without prior written authorization from The Open Group. #if defined(sun) && (defined(SVR4) || defined(__svr4__) || defined(__SVR4) || defined(__sol__)) #define DEFAULT_CPP "/usr/ccs/lib/cpp" #endif -#if defined(__bsdi__) || defined(__NetBSD__) \ - || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) +#if defined(__NetBSD__) || (defined(__FreeBSD__) && !defined(CPP_IN_LIBEXEC)) #define DEFAULT_CPP "/usr/bin/cpp" #endif #ifdef __uxp__ @@ -316,7 +315,7 @@ char *cpp_argv[ARGUMENTS] = { #ifdef unix "-Uunix", /* remove unix symbol so that filename unix.c okay */ #endif -#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(USL) || defined(sco) || defined(ISC) || defined(__bsdi__) || defined(linux) || defined(__hpux__) || defined(__vxworks) +#if defined(__386BSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(MACH) || defined(USL) || defined(sco) || defined(ISC) || defined(linux) || defined(__hpux__) || defined(__vxworks) # ifdef __i386__ "-D__i386__", # endif @@ -852,9 +851,6 @@ struct symtab predefs[] = { {"_SEQUENT_", "1"}, {"__STDC__", "1"}, #endif -#ifdef __bsdi__ - {"__bsdi__", "1"}, -#endif #ifdef nec_ews_svr2 {"nec_ews_svr2", "1"}, #endif diff --git a/cde/programs/dtlogin/chooser.c b/cde/programs/dtlogin/chooser.c index 152c6dba..ac52ef91 100644 --- a/cde/programs/dtlogin/chooser.c +++ b/cde/programs/dtlogin/chooser.c @@ -594,7 +594,7 @@ RegisterHostname (char *name) if (ioctl (socketFD, (int) SIOCGIFCONF, (char *) &ifc) < 0) return 0; for (ifr = ifc.ifc_req -#if defined (__bsdi__) || defined(__NetBSD__) +#if defined(__NetBSD__) ; (char *)ifr < ifc.ifc_buf + ifc.ifc_len; ifr = (struct ifreq *)((char *)ifr + sizeof (struct ifreq) + (ifr->ifr_addr.sa_len > sizeof (ifr->ifr_addr) ? -- 2.25.1