[PATCH xinit v2 1/3] Remove unixware / sco support

[Mark Kettenis]

> From: Hans de Goede <hdegoede at redhat.com>
> Date: Thu, 27 Mar 2014 12:55:55 +0100
> 
> We don't support SCO / Unixware anymore, so lets remove the SCO / Unixware
> specific bits from startx and xinitrc
> 
> Signed-off-by: Hans de Goede <hdegoede at redhat.com>

Reviewed-by: Mark Kettenis <kettenis at openbsd.org>

> ---
>  startx.cpp  | 53 +----------------------------------------------------
>  xinitrc.cpp | 43 -------------------------------------------
>  2 files changed, 1 insertion(+), 95 deletions(-)
> 
> diff --git a/startx.cpp b/startx.cpp
> index c595b84..b7a29f9 100644
> --- a/startx.cpp
> +++ b/startx.cpp
> @@ -14,7 +14,7 @@ XCOMM
>  unset DBUS_SESSION_BUS_ADDRESS
>  unset SESSION_MANAGER
>  
> -#if defined(__SCO__) || defined(__UNIXWARE__) || defined(__APPLE__)
> +#ifdef __APPLE__
>  
>  XCOMM Check for /usr/bin/X11 and BINDIR in the path, if not add them.
>  XCOMM This allows startx to be placed in a place like /usr/bin or /usr/local/bin
> @@ -33,11 +33,7 @@ case $PATH in
>  esac
>  
>  XCOMM Now the "old" compiled path
> -#ifdef __APPLE__
>  oldbindir=/usr/X11R6/bin
> -#else
> -oldbindir=/usr/bin/X11
> -#endif
>  
>  if [ -d "$oldbindir" ] ; then
>      case $PATH in
> @@ -51,24 +47,8 @@ XCOMM so export the new PATH just in case the user changes the shell
>  export PATH
>  #endif
>  
> -#if defined(__SCO__) || defined(__UNIXWARE__)
> -XCOMM Set up the XMERGE env var so that dos merge is happy under X
> -
> -if [ -f /usr/lib/merge/xmergeset.sh ]; then
> -	. /usr/lib/merge/xmergeset.sh
> -elif [ -f /usr/lib/merge/console.disp ]; then
> -	XMERGE=`cat /usr/lib/merge/console.disp`
> -	export XMERGE
> -fi
> -
> -userclientrc=$HOME/.startxrc
> -sysclientrc=LIBDIR/sys.startxrc
> -scouserclientrc=$HOME/.xinitrc
> -scosysclientrc=XINITDIR/xinitrc
> -#else
>  userclientrc=$HOME/.xinitrc
>  sysclientrc=XINITDIR/xinitrc
> -#endif
>  
>  userserverrc=$HOME/.xserverrc
>  sysserverrc=XINITDIR/xserverrc
> @@ -145,21 +125,6 @@ done
>  defaultdisplay=":$d"
>  unset d
>  
> -#if defined(__SCO__) || defined(__UNIXWARE__)
> -
> -XCOMM SCO -t option: do not start an X server
> -case $1 in
> -  -t)   if [ -n "$DISPLAY" ]; then
> -                REMOTE_SERVER=TRUE
> -                shift
> -        else
> -                echo "DISPLAY environment variable not set"
> -                exit 1
> -        fi
> -        ;;
> -esac
> -#endif
> -
>  whoseargs="client"
>  while [ x"$1" != x ]; do
>      case "$1" in
> @@ -209,12 +174,6 @@ if [ x"$client" = x ]; then
>              client=$userclientrc
>          elif [ -f "$sysclientrc" ]; then
>              client=$sysclientrc
> -#if defined(__SCO__) || defined(__UNIXWARE__)
> -        elif [ -f "$scouserclientrc" ]; then
> -            client=$scouserclientrc
> -        elif [ -f "$scosysclientrc" ]; then
> -            client=$scosysclientrc
> -#endif
>          fi
>      fi
>  fi
> @@ -319,21 +278,11 @@ EOF
>      done
>  fi
>  
> -#if defined(__SCO__) || defined(__UNIXWARE__)
> -if [ "$REMOTE_SERVER" = "TRUE" ]; then
> -        exec SHELL_CMD ${client}
> -else
> -        XINIT "$client" $clientargs -- "$server" $display $serverargs
> -fi
> -#else
> -
>  #if defined(__APPLE__) || defined(__CYGWIN__)
>  eval XINIT \"$client\" $clientargs -- \"$server\" $display $serverargs
>  #else
>  XINIT "$client" $clientargs -- "$server" $display $serverargs
>  #endif
> -
> -#endif
>  retval=$?
>  
>  if [ x"$enable_xauth" = x1 ] ; then
> diff --git a/xinitrc.cpp b/xinitrc.cpp
> index 81c238b..14d3cbc 100644
> --- a/xinitrc.cpp
> +++ b/xinitrc.cpp
> @@ -41,49 +41,6 @@ fi
>  
>  XCOMM start some nice programs
>  
> -#if defined(__SCO__) || defined(__UNIXWARE__)
> -if [ -r /etc/default/xdesktops ]; then
> -  . /etc/default/xdesktops
> -fi
> -
> -if [ -r $HOME/.x11rc ]; then
> -  . $HOME/.x11rc
> -else
> -  if [ -r /etc/default/X11 ]; then
> -  . /etc/default/X11
> -  fi
> -fi
> -
> -#if defined(__SCO__)
> -if [ -n "$XSESSION" ]; then
> -  case "$XSESSION" in
> -    [Yy][Ee][Ss])
> -      [ -x /usr/bin/X11/scosession ] && exec /usr/bin/X11/scosession
> -      ;;
> -  esac
> -fi
> -
> -if [ -n "$XDESKTOP" ]; then
> -  exec `eval echo $"$XDESKTOP"`
> -else
> -  if [ -x /usr/bin/X11/pmwm -a -x /usr/bin/X11/scoterm ]; then
> -    /usr/bin/X11/scoterm 2> /dev/null &
> -    exec /usr/bin/X11/pmwm    2> /dev/null
> -  fi
> -fi
> -#elif defined(__UNIXWARE__)
> -if [ -n "$XDESKTOP" ]; then
> -  exec `eval echo $"$XDESKTOP"`
> -else
> -  if [ -x /usr/X/bin/pmwm ]; then
> -    exec /usr/X/bin/pmwm    2> /dev/null
> -  fi
> -fi
> -#endif
> -
> -XCOMM This is the fallback case if nothing else is executed above
> -#endif /* !defined(__SCO__)  && !defined(__UNIXWARE__) */
> -
>  if [ -d XINITDIR/xinitrc.d ] ; then
>  	for f in XINITDIR/xinitrc.d/?*.sh ; do
>  		[ -x "$f" ] && . "$f"
> -- 
> 1.9.0
> 
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel
>