root/BePorts/trunk/dev-libs/apr/apr-0.9.x.diff

network_io/unix/sockopt.c

@@ -21 +21 @@
-static apr_status_t soblock(int sd)
-{
-/* BeOS uses setsockopt at present for non blocking... */
-ndef BEOS
+ !defined(BEOS) || defined(__HAIKU__)
-    int fd_flags;
-
-    fd_flags = fcntl(sd, F_GETFL, 0);
@@ -47 +47 @@
-
-static apr_status_t sononblock(int sd)
-{
-ndef BEOS
+ !defined(BEOS) || defined(__HAIKU__)
-    int fd_flags;
-
-    fd_flags = fcntl(sd, F_GETFL, 0);
@@ -221 +221 @@
-         * As it can't be turned off we might as well check if they're asking
-         * for it to be turned on!
-         */
-def BEOS
+ defined(BEOS) && !defined(__HAIKU__)
-        if (on == 1)
-            return APR_SUCCESS;
-        else

network_io/unix/sockaddr.c

@@ -458 +458 @@
-    apr_sockaddr_t *prev_sa;
-    int curaddr;
-#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
-
+ // CHECKME
-#ifdef GETHOSTBYNAME_R_HOSTENT_DATA
-    struct hostent_data hd;
-#else
@@ -489 +489 @@
-    }
-    else {
-#if APR_HAS_THREADS && !defined(GETHOSTBYNAME_IS_THREAD_SAFE) && \
-
+ // CHECKME
-#if defined(GETHOSTBYNAME_R_HOSTENT_DATA)
-        /* AIX, HP/UX, D/UX et alia */
-        gethostbyname_r(hostname, &hs, &hd);
@@ -560 +560 @@
-
-    if ((masked = flags & (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK))) {
-        if (!hostname ||
-F
+PR
-            masked == (APR_IPV4_ADDR_OK | APR_IPV6_ADDR_OK)) {
-            return APR_EINVAL;
-        }
@@ -656 +656 @@
-    return APR_SUCCESS;
-#else
-#if APR_HAS_THREADS && !defined(GETHOSTBYADDR_IS_THREAD_SAFE) && \
-
+ // CHECKME
-#ifdef GETHOSTBYNAME_R_HOSTENT_DATA
-    struct hostent_data hd;
-#else

network_io/unix/sockets.c

@@ -21 +21 @@
-#include "apr_portable.h"
-#include "apr_arch_inherit.h"
-
-
+ && !defined(__HAIKU__)
-#define close closesocket
-#endif
-
@@ -47 +47 @@
-    apr_sockaddr_vars_set(sock->local_addr, family, 0);
-    apr_sockaddr_vars_set(sock->remote_addr, family, 0);
-    sock->netmask = 0;
-
+ && !defined(__HAIKU__)
-    /* BeOS pre-BONE has TCP_NODELAY on by default and it can't be
-     * switched off!
-     */

network_io/beos/sendrecv.c

@@ -15 +15 @@
- */
-
-#include "apr_private.h"
-
+|| defined(__HAIKU__) 
-#include "../unix/sendrecv.c"
-#else
-#include "apr_arch_networkio.h"

include/arch/unix/apr_arch_file_io.h

@@ -68 +68 @@
-#include <kernel/OS.h>
-#endif
-
-
+
+
+
-# ifndef BONE7
-  /* prior to BONE/7 fd_set & select were defined in sys/socket.h */
-#  include <sys/socket.h>

include/apr_errno.h

@@ -1155 +1155 @@
-/** operation would block */
-#if !defined(EWOULDBLOCK) || !defined(EAGAIN)
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN)
+#elif BEOS
+#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN)
-#elif (EWOULDBLOCK == EAGAIN)
-#define APR_STATUS_IS_EAGAIN(s)         ((s) == APR_EAGAIN)
-#else

configure.in

@@ -219 +219 @@
-dnl otherwise.
-
-case $host in
-
+|*-haiku*
-        if test "$ac_test_CFLAGS" != set; then
-           APR_REMOVEFROM(CFLAGS,-g)
-        fi
@@ -403 +403 @@
-             ;;
-       esac
-       ;;
+   *haiku*)
+       OSDIR="beos"
+       APR_ADDTO(CPPFLAGS,-DBEOS)
+       enable_threads="system_threads"
+       eolstr="\\n"
+       proc_mutex_is_global=1
+       file_as_socket="1"
+       ;;
-   *os390)
-       OSDIR="os390"
-       eolstr="\\n"
@@ -1274 +1282 @@
-       ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-       size_t_fmt='#define APR_SIZE_T_FMT "lu"'
-       ;;
-
+|*haiku*
-        ssize_t_fmt='#define APR_SSIZE_T_FMT "ld"'
-        size_t_fmt='#define APR_SIZE_T_FMT "ld"'
-        ;;

misc/unix/errorcodes.c

@@ -343 +343 @@
- * the prototype publically (doh!), so to avoid a build warning
- * we add a suitable prototype here.
- */
-
+ && !defined(__HAIKU__)
-const char *strerror_r(apr_status_t, char *, apr_size_t);
-#endif
-

threadproc/beos/proc.c

@@ -365 +365 @@
-}
-
-APR_DECLARE(apr_status_t) apr_procattr_limit_set(apr_procattr_t *attr, apr_int32_t what, 
-
+
+
+
+
+
+
-{
-    return APR_ENOTIMPL;
-}

build/config.guess

@@ -1 +1 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-
+
+
-
-2-03-20
+8-01-08
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
@@ -17 +18 @@
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-
+
+
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-#####################################################################
-# This file contains changes for Apache, clearly marked below.
-# These changes are hereby donated to the public domain.
-#####################################################################
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
@@ -58 +56 @@
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-
-
+,
+2002, 2003, 2004, 2005, 2006, 2007, 2008 
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -71 +69 @@
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-0 
+
-    --version | -v )
-0 
+
-    --help | --h* | -h )
-0 
+
-    -- )     # Stop option processing
-       shift; break ;;
-    - ) # Use stdin as input.
@@ -93 +91 @@
-  exit 1
-fi
-
+trap 'exit 1' 1 2 15
-
-
-
+
+
+
+
-
-# CC_FOR_BUILD -- compiler used by this script.
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        for c in cc gcc c89 c99 ; do
-
-
+
-             CC_FOR_BUILD="$c"; break ;
-          fi ;
-        done ;
-        rm -f $dummy.c $dummy.o $dummy.rel ;
-        if test x"$CC_FOR_BUILD" = x ; then
-          CC_FOR_BUILD=no_compiler_found ;
-        fi
-        ;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-
+ ; set_cc_for_build= ;
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
@@ -147 +157 @@
-        UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-            /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-        case "${UNAME_MACHINE_ARCH}" in
+            armeb) machine=armeb-unknown ;;
-            arm*) machine=arm-unknown ;;
-            sh3el) machine=shl-unknown ;;
-            sh3eb) machine=sh-unknown ;;
+            sh5el) machine=sh5le-unknown ;;
-            *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-        esac
-        # The Operating System including object format, if it has switched
@@ -172 +184 @@
-                ;;
-        esac
-        # The OS release
-
+
+
+
+
+
+
+
+
+
+
+
+
-        # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-        # contains redundant information, the shorter form:
-        # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-        echo "${machine}-${os}${release}"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    *:OpenBSD:*:*)
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    alpha:OSF1:*:*)
-
+
+
-                UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        # A Vn.n version is a released version.
-        # A Tn.n version is a released field test version.
-        # A Xn.n version is an unreleased experimental baselevel.
-        # 1.2 uses "1.2" for uname -r.
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    Alpha\ *:Windows_NT*:*)
-        # How do we know it's Interix rather than the generic POSIX subsystem?
-        # Should we change UNAME_MACHINE based on the output of uname instead
-        # of the specific Alpha model?
-        echo alpha-pc-interix
-0 
+
-    21064:Windows_NT:50:3)
-        echo alpha-dec-winnt3.5
-0 
+
-    Amiga*:UNIX_System_V:4.0:*)
-        echo m68k-unknown-sysv4
-0
+
-    *:[Aa]miga[Oo][Ss]:*:*)
-        echo ${UNAME_MACHINE}-unknown-amigaos
-0 
+
-    *:[Mm]orph[Oo][Ss]:*:*)
-        echo ${UNAME_MACHINE}-unknown-morphos
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    *:OS/390:*:*)
-        echo i370-ibm-openedition
-
+
+
+
+
+
+
+
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-        echo arm-acorn-riscix${UNAME_RELEASE}
-
+
+
+
+
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-        echo hppa1.1-hitachi-hiuxmpp
-0
+
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-        # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-        if test "`(/bin/universe) 2>/dev/null`" = att ; then
@@ -332 +313 @@
-        else
-                echo pyramid-pyramid-bsd
-        fi
-0 
+
-    NILE*:*:*:dcosx)
-        echo pyramid-pyramid-svr4
-
+
+
+
+
+
+
+
+
-    sun4H:SunOS:5.*:*)
-        echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-0 
+
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-        echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-0 
-
+
+ | i86xen:SunOS:5.*:*
-        echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-0 
+
-    sun4*:SunOS:6*:*)
-        # According to config.sub, this is the proper way to canonicalize
-        # SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-        # it's likely to be more like Solaris than SunOS4.
-        echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-0 
+
-    sun4*:SunOS:*:*)
-        case "`/usr/bin/arch -k`" in
-            Series*|S4*)
@@ -359 +347 @@
-        esac
-        # Japanese Language versions have a version number like `4.1.3-JL'.
-        echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-0 
+
-    sun3*:SunOS:*:*)
-        echo m68k-sun-sunos${UNAME_RELEASE}
-0 
+
-    sun*:*:4.2BSD:*)
-        UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-        test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
@@ -374 +362 @@
-                echo sparc-sun-sunos${UNAME_RELEASE}
-                ;;
-        esac
-0 
+
-    aushp:SunOS:*:*)
-        echo sparc-auspex-sunos${UNAME_RELEASE}
-0 
+
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
@@ -388 +376 @@
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-0 
+
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-0 
+
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-0 
+
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-0 
+
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-0 
+
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-
+
+
+
+
-    powerpc:machten:*:*)
-        echo powerpc-apple-machten${UNAME_RELEASE}
-0 
+
-    RISC*:Mach:*:*)
-        echo mips-dec-mach_bsd4.3
-0 
+
-    RISC*:ULTRIX:*:*)
-        echo mips-dec-ultrix${UNAME_RELEASE}
-0 
+
-    VAX*:ULTRIX*:*:*)
-        echo vax-dec-ultrix${UNAME_RELEASE}
-0 
+
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-        echo clipper-intergraph-clix${UNAME_RELEASE}
-0 
+
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
@@ -442 +433 @@
-          exit (-1);
-        }
-EOF
-$dummy.c -o $dummy \
-&& ./$dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
-&& rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+-o $dummy $dummy.c &&
+dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
+SYSTEM_NAME=`$dummy $dummyarg` &&
+    { echo "$SYSTEM_NAME"; exit; }
-        echo mips-mips-riscos${UNAME_RELEASE}
-0 
+
-    Motorola:PowerMAX_OS:*:*)
-        echo powerpc-motorola-powermax
-
+
+
+
+
+
+
+
-    Night_Hawk:Power_UNIX:*:*)
-        echo powerpc-harris-powerunix
-0 
+
-    m88k:CX/UX:7*:*)
-        echo m88k-harris-cxux7
-0 
+
-    m88k:*:4*:R4*)
-        echo m88k-motorola-sysv4
-0 
+
-    m88k:*:3*:R3*)
-        echo m88k-motorola-sysv3
-0 
+
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
@@ -478 +475 @@
-        else
-            echo i586-dg-dgux${UNAME_RELEASE}
-        fi
-0 
+
-    M88*:DolphinOS:*:*) # DolphinOS (SVR3)
-        echo m88k-dolphin-sysv3
-0 
+
-    M88*:*:R3*:*)
-        # Delta 88k system running SVR3
-        echo m88k-motorola-sysv3
-0 
+
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-        echo m88k-tektronix-sysv3
-0 
+
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-        echo m68k-tektronix-bsd
-0 
+
-    *:IRIX*:*:*)
-        echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-0 
+
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
- 
-0 ;;
+
+;; 
-    i*86:AIX:*:*)
-        echo i386-ibm-aix
-0 
+
-    ia64:AIX:*:*)
-        if [ -x /usr/bin/oslevel ] ; then
-                IBM_REV=`/usr/bin/oslevel`
@@ -508 +505 @@
-                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-        fi
-        echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-0 
+
-    *:AIX:2:3)
-        if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-                eval $set_cc_for_build
@@ -523 +520 @@
-                        exit(0);
-                        }
-EOF
-
-
-
+
+
+
+
+
+
-        elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-                echo rs6000-ibm-aix3.2.4
-        else
-                echo rs6000-ibm-aix3.2
-        fi
-0 
-
+
+6
-        IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-        if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-                IBM_ARCH=rs6000
@@ -545 +545 @@
-                IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-        fi
-        echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-0 
+
-    *:AIX:*:*)
-        echo rs6000-ibm-aix
-0 
+
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-        echo romp-ibm-bsd4.4
-0 
+
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-        echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-0 ;;
+;;  
-    *:BOSX:*:*)
-        echo rs6000-bull-bosx
-0 
+
-    DPX/2?00:B.O.S.:*:*)
-        echo m68k-bull-sysv3
-0 
+
-    9000/[34]??:4.3bsd:1.*:*)
-        echo m68k-hp-bsd
-0 
+
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-        echo m68k-hp-bsd4.4
-0 
+
-    9000/[34678]??:HP-UX:*:*)
-        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-        case "${UNAME_MACHINE}" in
@@ -622 +622 @@
-                  exit (0);
-              }
-EOF
-
-
-
+
+
-                fi ;;
-        esac
+        if [ ${HP_ARCH} = "hppa2.0w" ]
+        then
+            eval $set_cc_for_build
+
+            # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
+            # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
+            # generating 64-bit code.  GNU and HP use different nomenclature:
+            #
+            # $ CC_FOR_BUILD=cc ./config.guess
+            # => hppa2.0w-hp-hpux11.23
+            # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
+            # => hppa64-hp-hpux11.23
+
+            if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
+                grep __LP64__ >/dev/null
+            then
+                HP_ARCH="hppa2.0w"
+            else
+                HP_ARCH="hppa64"
+            fi
+        fi
-        echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-0 
+
-    ia64:HP-UX:*:*)
-        HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-        echo ia64-hp-hpux${HPUX_REV}
-0 
+
-    3050*:HI-UX:*:*)
-        eval $set_cc_for_build
-        sed 's/^        //' << EOF >$dummy.c
@@ -660 +680 @@
-          exit (0);
-        }
-EOF
-$dummy.c -o $dummy && ./$dummy && rm -f $dummy.c $dummy && exit 0
-rm -f $dummy.c $dummy
+-o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
+       { echo "$SYSTEM_NAME"; exit; }
-        echo unknown-hitachi-hiuxwe2
-0 
+
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-        echo hppa1.1-hp-bsd
-0 
+
-    9000/8??:4.3bsd:*:*)
-        echo hppa1.0-hp-bsd
-0 
+
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-        echo hppa1.0-hp-mpeix
-0 
+
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-        echo hppa1.1-hp-osf
-0 
+
-    hp8??:OSF1:*:*)
-        echo hppa1.0-hp-osf
-0 
+
-    i*86:OSF1:*:*)
-        if [ -x /usr/sbin/sysversion ] ; then
-            echo ${UNAME_MACHINE}-unknown-osf1mk
-        else
-            echo ${UNAME_MACHINE}-unknown-osf1
-        fi
-0 
+
-    parisc*:Lites*:*:*)
-        echo hppa1.1-hp-lites
-0 
+
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-        echo c1-convex-bsd
-0 
+
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-        if getsysinfo -f scalar_acc
-        then echo c32-convex-bsd
-        else echo c2-convex-bsd
-        fi
-0 
+
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-        echo c34-convex-bsd
-0 
+
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-        echo c38-convex-bsd
-0 
+
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-        echo c4-convex-bsd
-0 
+
-    CRAY*Y-MP:*:*:*)
-        echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-0 
+
-    CRAY*[A-Z]90:*:*:*)
-        echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-        | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-              -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-              -e 's/\.[^.]*$/.X/'
-0 
+
-    CRAY*TS:*:*:*)
-        echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-
-
-
-
+
-    CRAY*T3E:*:*:*)
-        echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-0 
+