upgrade to expect 5.32.1
This commit is contained in:
brad
parent
793e62a6b7
commit
57c9b344b8
@ -1,8 +1,8 @@
|
||||
# $OpenBSD: Makefile,v 1.29 2000/07/20 04:56:42 brad Exp $
|
||||
# $OpenBSD: Makefile,v 1.30 2000/09/06 01:06:26 brad Exp $
|
||||
|
||||
DISTNAME= expect-5.31
|
||||
DISTNAME= expect-5.32.1
|
||||
CATEGORIES= lang
|
||||
NEED_VERSION= 1.317
|
||||
NEED_VERSION= 1.324
|
||||
MASTER_SITES= http://expect.nist.gov/old/
|
||||
|
||||
HOMEPAGE= http://expect.nist.gov/
|
||||
@ -16,15 +16,20 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
FAKE_FLAGS= INSTALL_ROOT="${WRKINST}"
|
||||
|
||||
SEPARATE_BUILD= concurrent
|
||||
CONFIGURE_STYLE= gnu dest
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS+= ${CONFIGURE_SHARED}
|
||||
CONFIGURE_ARGS+=--with-tclconfig=${PREFIX}/lib/tcl8.3 \
|
||||
--with-tclinclude=${PREFIX}/include/tcl8.3 \
|
||||
--with-tkconfig=${PREFIX}/lib/tk8.3 \
|
||||
--with-tkinclude=${PREFIX}/include/tk8.3
|
||||
|
||||
WRKDIST= ${WRKDIR}/${PKGNAME}
|
||||
WRKDIST= ${WRKDIR}/expect-5.32
|
||||
|
||||
post-extract:
|
||||
@cp -f ${FILESDIR}/config.guess ${WRKSRC}
|
||||
|
||||
# make sure configure is newer than Makefile.in, since we patch Makefile.in
|
||||
# as well.
|
||||
@ -32,6 +37,6 @@ post-patch:
|
||||
@touch ${WRKSRC}/configure
|
||||
|
||||
test: build
|
||||
@cd ${WRKBUILD}; make test
|
||||
@cd ${WRKBUILD}; ${MAKE} test
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
1183
lang/expect/files/config.guess
vendored
Executable file
1183
lang/expect/files/config.guess
vendored
Executable file
File diff suppressed because it is too large
Load Diff
@ -1,3 +1,3 @@
|
||||
MD5 (expect-5.31.tar.gz) = 86bc4d9498c8d705a4bc572ec55956e3
|
||||
RMD160 (expect-5.31.tar.gz) = 76a487b4dbe6a3b0fd32026031b0e55ac42c79c1
|
||||
SHA1 (expect-5.31.tar.gz) = fe20025fcf9e69a43a8b897d52d552db19e68521
|
||||
MD5 (expect-5.32.1.tar.gz) = af232cc2f8537565efa31e2f7ef7cde5
|
||||
RMD160 (expect-5.32.1.tar.gz) = c8ae893f0a21f2c67c0b4b2adf200e25d8c54a03
|
||||
SHA1 (expect-5.32.1.tar.gz) = db5f4b501fc1065b6a44c72f2afb8c4e399745ba
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
--- Makefile.in.orig Mon Aug 23 19:51:30 1999
|
||||
+++ Makefile.in Mon Aug 23 19:51:42 1999
|
||||
--- Makefile.in.orig Fri May 12 13:59:44 2000
|
||||
+++ Makefile.in Tue Sep 5 20:42:05 2000
|
||||
@@ -191,6 +191,7 @@
|
||||
|
||||
INSTALL = @INSTALL@
|
||||
@ -16,7 +16,7 @@
|
||||
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
|
||||
"LDFLAGS=$(LDFLAGS)" \
|
||||
"RUNTEST=$(RUNTEST)" \
|
||||
@@ -356,7 +358,7 @@
|
||||
@@ -365,7 +367,7 @@
|
||||
else true; fi
|
||||
if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
|
||||
$(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
|
||||
@ -25,7 +25,7 @@
|
||||
else true; fi
|
||||
|
||||
expect_installed: exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
|
||||
@@ -439,7 +441,7 @@
|
||||
@@ -448,7 +450,7 @@
|
||||
${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
|
||||
-for i in $(SCRIPT_LIST) ; do \
|
||||
if [ -f $$i ] ; then \
|
||||
@ -1,498 +0,0 @@
|
||||
--- config.guess.orig Mon Jul 28 02:01:10 1997
|
||||
+++ config.guess Fri Jan 30 00:20:11 1998
|
||||
@@ -1,6 +1,6 @@
|
||||
#! /bin/sh
|
||||
# Attempt to guess a canonical system name.
|
||||
-# Copyright (C) 1992, 1993, 1994, 1995 Free Software Foundation, Inc.
|
||||
+# Copyright (C) 1992, 93, 94, 95, 96, 1997 Free Software Foundation, Inc.
|
||||
#
|
||||
# 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
|
||||
@@ -51,46 +51,65 @@
|
||||
# Note: order is significant - the case branches are not exclusive.
|
||||
|
||||
case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
|
||||
- alpha:OSF1:V*:*)
|
||||
- # After 1.2, OSF1 uses "V1.3" for uname -r.
|
||||
- echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^V//'`
|
||||
- exit 0 ;;
|
||||
alpha:OSF1:*:*)
|
||||
+ # 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.
|
||||
- echo alpha-dec-osf${UNAME_RELEASE}
|
||||
- exit 0 ;;
|
||||
+ echo alpha-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[VTX]//'`
|
||||
+ exit 0 ;;
|
||||
21064:Windows_NT:50:3)
|
||||
echo alpha-dec-winnt3.5
|
||||
exit 0 ;;
|
||||
+ Amiga*:UNIX_System_V:4.0:*)
|
||||
+ echo m68k-cbm-sysv4
|
||||
+ exit 0;;
|
||||
amiga:NetBSD:*:*)
|
||||
echo m68k-cbm-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ amiga:OpenBSD:*:*)
|
||||
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ hkmips:OpenBSD:*:*)
|
||||
+ echo mips-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ arc64:OpenBSD:*:*)
|
||||
+ echo mips64el-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ arc:OpenBSD:*:*)
|
||||
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ pmax:OpenBSD:*:*)
|
||||
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ sgi:OpenBSD:*:*)
|
||||
+ echo mips-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ wgrisc:OpenBSD:*:*)
|
||||
+ echo mipsel-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
|
||||
echo arm-acorn-riscix${UNAME_RELEASE}
|
||||
exit 0;;
|
||||
- *:*:*:dcosx)
|
||||
- # Pyramid DC/OSX
|
||||
- echo mips-mips-svr4
|
||||
- exit 0;;
|
||||
- *:Reliant*:*:*)
|
||||
- # Pyramid Reliant Unix
|
||||
- echo mips-mips-svr4
|
||||
- exit 0;;
|
||||
- Pyramid*:OSx*:*:*)
|
||||
+ SR2?01:HI-UX/MPP:*:*)
|
||||
+ echo hppa1.1-hitachi-hiuxmpp
|
||||
+ exit 0;;
|
||||
+ Pyramid*:OSx*:*:*|MIS*:OSx*:*:*)
|
||||
+ # akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
|
||||
if test "`(/bin/universe) 2>/dev/null`" = att ; then
|
||||
echo pyramid-pyramid-sysv3
|
||||
else
|
||||
echo pyramid-pyramid-bsd
|
||||
fi
|
||||
exit 0 ;;
|
||||
- sun4*:SunOS:5.*:*)
|
||||
- echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
+ NILE:*:*:dcosx)
|
||||
+ echo pyramid-pyramid-svr4
|
||||
exit 0 ;;
|
||||
- DS/90*:UNIX_System_V:4.*:*)
|
||||
+ sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
|
||||
echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit 0 ;;
|
||||
i86pc:SunOS:5.*:*)
|
||||
- echo i386-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
+ echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
exit 0 ;;
|
||||
sun4*:SunOS:6*:*)
|
||||
# According to config.sub, this is the proper way to canonicalize
|
||||
@@ -110,27 +129,71 @@
|
||||
sun3*:SunOS:*:*)
|
||||
echo m68k-sun-sunos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ aushp:SunOS:*:*)
|
||||
+ echo sparc-auspex-sunos${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
atari*:NetBSD:*:*)
|
||||
echo m68k-atari-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ atari*:OpenBSD:*:*)
|
||||
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
sun3*:NetBSD:*:*)
|
||||
echo m68k-sun-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ sun3*:OpenBSD:*:*)
|
||||
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
mac68k:NetBSD:*:*)
|
||||
echo m68k-apple-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ mac68k:OpenBSD:*:*)
|
||||
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ mvme68k:OpenBSD:*:*)
|
||||
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ mvme88k:OpenBSD:*:*)
|
||||
+ echo m88k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ powerpc:machten:*:*)
|
||||
+ echo powerpc-apple-machten${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ RISC*:Mach:*:*)
|
||||
+ echo mips-dec-mach_bsd4.3
|
||||
+ exit 0 ;;
|
||||
RISC*:ULTRIX:*:*)
|
||||
echo mips-dec-ultrix${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
VAX*:ULTRIX*:*:*)
|
||||
echo vax-dec-ultrix${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
- mips:*:4*:UMIPS)
|
||||
- echo mips-mips-riscos4sysv
|
||||
- exit 0 ;;
|
||||
- mips:*:5*:RISCos)
|
||||
+ mips:*:*:UMIPS | mips:*:*:RISCos)
|
||||
+ sed 's/^ //' << EOF >dummy.c
|
||||
+ int main (argc, argv) int argc; char **argv; {
|
||||
+ #if defined (host_mips) && defined (MIPSEB)
|
||||
+ #if defined (SYSTYPE_SYSV)
|
||||
+ printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
|
||||
+ #endif
|
||||
+ #if defined (SYSTYPE_SVR4)
|
||||
+ printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
|
||||
+ #endif
|
||||
+ #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
|
||||
+ printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
|
||||
+ #endif
|
||||
+ #endif
|
||||
+ exit (-1);
|
||||
+ }
|
||||
+EOF
|
||||
+ ${CC-cc} dummy.c -o dummy \
|
||||
+ && ./dummy `echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` \
|
||||
+ && rm dummy.c dummy && exit 0
|
||||
+ rm -f dummy.c dummy
|
||||
echo mips-mips-riscos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
+ Night_Hawk:Power_UNIX:*:*)
|
||||
+ echo powerpc-harris-powerunix
|
||||
+ exit 0 ;;
|
||||
m88k:CX/UX:7*:*)
|
||||
echo m88k-harris-cxux7
|
||||
exit 0 ;;
|
||||
@@ -141,12 +204,17 @@
|
||||
echo m88k-motorola-sysv3
|
||||
exit 0 ;;
|
||||
AViiON:dgux:*:*)
|
||||
+ # DG/UX returns AViiON for all architectures
|
||||
+ UNAME_PROCESSOR=`/usr/bin/uname -p`
|
||||
+ if [ $UNAME_PROCESSOR = mc88100 -o $UNAME_PROCESSOR = mc88110 ] ; then
|
||||
if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx \
|
||||
-o ${TARGET_BINARY_INTERFACE}x = x ] ; then
|
||||
echo m88k-dg-dgux${UNAME_RELEASE}
|
||||
else
|
||||
echo m88k-dg-dguxbcs${UNAME_RELEASE}
|
||||
fi
|
||||
+ else echo i586-dg-dgux${UNAME_RELEASE}
|
||||
+ fi
|
||||
exit 0 ;;
|
||||
M88*:DolphinOS:*:*) # DolphinOS (SVR3)
|
||||
echo m88k-dolphin-sysv3
|
||||
@@ -164,10 +232,10 @@
|
||||
*:IRIX*:*:*)
|
||||
echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
|
||||
exit 0 ;;
|
||||
- ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
|
||||
+ ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
|
||||
echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id
|
||||
exit 0 ;; # Note that: echo "'`uname -s`'" gives 'AIX '
|
||||
- i[34]86:AIX:*:*)
|
||||
+ i?86:AIX:*:*)
|
||||
echo i386-ibm-aix
|
||||
exit 0 ;;
|
||||
*:AIX:2:3)
|
||||
@@ -212,7 +280,7 @@
|
||||
echo romp-ibm-bsd4.4
|
||||
exit 0 ;;
|
||||
ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC NetBSD and
|
||||
- echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
|
||||
+ echo romp-ibm-bsd${UNAME_RELEASE} # 4.3 with uname added to
|
||||
exit 0 ;; # report: romp-ibm BSD 4.3
|
||||
*:BOSX:*:*)
|
||||
echo rs6000-bull-bosx
|
||||
@@ -230,7 +298,7 @@
|
||||
case "${UNAME_MACHINE}" in
|
||||
9000/31? ) HP_ARCH=m68000 ;;
|
||||
9000/[34]?? ) HP_ARCH=m68k ;;
|
||||
- 9000/7?? | 9000/8?[79] ) HP_ARCH=hppa1.1 ;;
|
||||
+ 9000/7?? | 9000/8?[1679] ) HP_ARCH=hppa1.1 ;;
|
||||
9000/8?? ) HP_ARCH=hppa1.0 ;;
|
||||
esac
|
||||
HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
|
||||
@@ -278,6 +346,13 @@
|
||||
hp8??:OSF1:*:*)
|
||||
echo hppa1.0-hp-osf
|
||||
exit 0 ;;
|
||||
+ i?86:OSF1:*:*)
|
||||
+ if [ -x /usr/sbin/sysversion ] ; then
|
||||
+ echo ${UNAME_MACHINE}-unknown-osf1mk
|
||||
+ else
|
||||
+ echo ${UNAME_MACHINE}-unknown-osf1
|
||||
+ fi
|
||||
+ exit 0 ;;
|
||||
parisc*:Lites*:*:*)
|
||||
echo hppa1.1-hp-lites
|
||||
exit 0 ;;
|
||||
@@ -305,17 +380,33 @@
|
||||
CRAY*Y-MP:*:*:*)
|
||||
echo ymp-cray-unicos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
- CRAY*C90:*:*:*)
|
||||
- echo c90-cray-unicos${UNAME_RELEASE}
|
||||
+ CRAY*[A-Z]90:*:*:*)
|
||||
+ echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
|
||||
+ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
|
||||
+ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/
|
||||
+ exit 0 ;;
|
||||
+ CRAY*TS:*:*:*)
|
||||
+ echo t90-cray-unicos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
CRAY-2:*:*:*)
|
||||
echo cray2-cray-unicos
|
||||
exit 0 ;;
|
||||
+ F300:UNIX_System_V:*:*)
|
||||
+ FUJITSU_SYS=`uname -p | tr [A-Z] [a-z] | sed -e 's/\///'`
|
||||
+ FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
|
||||
+ echo "f300-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
|
||||
+ exit 0 ;;
|
||||
+ F301:UNIX_System_V:*:*)
|
||||
+ echo f301-fujitsu-uxpv`echo $UNAME_RELEASE | sed 's/ .*//'`
|
||||
+ exit 0 ;;
|
||||
hp3[0-9][05]:NetBSD:*:*)
|
||||
echo m68k-hp-netbsd${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
- i[34]86:BSD/386:*:* | *:BSD/OS:*:*)
|
||||
- echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
|
||||
+ hp300:OpenBSD:*:*)
|
||||
+ echo m68k-unknown-openbsd${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ i?86:BSD/386:*:* | *:BSD/OS:*:*)
|
||||
+ echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
*:FreeBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
|
||||
@@ -323,26 +414,63 @@
|
||||
*:NetBSD:*:*)
|
||||
echo ${UNAME_MACHINE}-unknown-netbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
exit 0 ;;
|
||||
+ *:OpenBSD:*:*)
|
||||
+ echo ${UNAME_MACHINE}-unknown-openbsd`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
|
||||
+ exit 0 ;;
|
||||
+ i*:CYGWIN*:*)
|
||||
+ echo i386-pc-cygwin32
|
||||
+ exit 0 ;;
|
||||
+ p*:CYGWIN*:*)
|
||||
+ echo powerpcle-unknown-cygwin32
|
||||
+ exit 0 ;;
|
||||
+ prep*:SunOS:5.*:*)
|
||||
+ echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
|
||||
+ exit 0 ;;
|
||||
*:GNU:*:*)
|
||||
- echo `echo ${UNAME_MACHINE}|sed -e 's,/.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
+ echo `echo ${UNAME_MACHINE}|sed -e 's,-.*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
|
||||
exit 0 ;;
|
||||
*:Linux:*:*)
|
||||
# The BFD linker knows what the default object file format is, so
|
||||
# first see if it will tell us.
|
||||
ld_help_string=`ld --help 2>&1`
|
||||
- if echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: elf_i[345]86"; then
|
||||
- echo "${UNAME_MACHINE}-unknown-linux" ; exit 0
|
||||
- elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i[345]86linux"; then
|
||||
- echo "${UNAME_MACHINE}-unknown-linuxaout" ; exit 0
|
||||
- elif echo $ld_help_string | grep >/dev/null 2>&1 "supported emulations: i[345]86coff"; then
|
||||
- echo "${UNAME_MACHINE}-unknown-linuxcoff" ; exit 0
|
||||
+ if echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf_i.86"; then
|
||||
+ echo "${UNAME_MACHINE}-pc-linux-gnu" ; exit 0
|
||||
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86linux"; then
|
||||
+ echo "${UNAME_MACHINE}-pc-linux-gnuaout" ; exit 0
|
||||
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: i.86coff"; then
|
||||
+ echo "${UNAME_MACHINE}-pc-linux-gnucoff" ; exit 0
|
||||
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68kelf"; then
|
||||
+ echo "${UNAME_MACHINE}-unknown-linux-gnu" ; exit 0
|
||||
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: m68klinux"; then
|
||||
+ echo "${UNAME_MACHINE}-unknown-linux-gnuaout" ; exit 0
|
||||
+ elif echo "$ld_help_string" | grep >/dev/null 2>&1 "supported emulations: elf32ppc"; then
|
||||
+ echo "powerpc-unknown-linux-gnu" ; exit 0
|
||||
elif test "${UNAME_MACHINE}" = "alpha" ; then
|
||||
- echo alpha-unknown-linux ; exit 0
|
||||
+ echo alpha-unknown-linux-gnu ; exit 0
|
||||
+ elif test "${UNAME_MACHINE}" = "sparc" ; then
|
||||
+ echo sparc-unknown-linux-gnu ; exit 0
|
||||
+ elif test "${UNAME_MACHINE}" = "mips" ; then
|
||||
+ cat >dummy.c <<EOF
|
||||
+main(argc, argv)
|
||||
+int argc;
|
||||
+char *argv[];
|
||||
+{
|
||||
+#ifdef __MIPSEB__
|
||||
+ printf ("%s-unknown-linux-gnu\n", argv[1]);
|
||||
+#endif
|
||||
+#ifdef __MIPSEL__
|
||||
+ printf ("%sel-unknown-linux-gnu\n", argv[1]);
|
||||
+#endif
|
||||
+ return 0;
|
||||
+}
|
||||
+EOF
|
||||
+ ${CC-cc} dummy.c -o dummy 2>/dev/null && ./dummy "${UNAME_MACHINE}" && rm dummy.c dummy && exit 0
|
||||
+ rm -f dummy.c dummy
|
||||
else
|
||||
- # Either a pre-BFD a.out linker (linuxoldld) or one that does not give us
|
||||
- # useful --help. Gcc wants to distinguish between linuxoldld and linuxaout.
|
||||
+ # Either a pre-BFD a.out linker (linux-gnuoldld) or one that does not give us
|
||||
+ # useful --help. Gcc wants to distinguish between linux-gnuoldld and linux-gnuaout.
|
||||
test ! -d /usr/lib/ldscripts/. \
|
||||
- && echo "${UNAME_MACHINE}-unknown-linuxoldld" && exit 0
|
||||
+ && echo "${UNAME_MACHINE}-pc-linux-gnuoldld" && exit 0
|
||||
# Determine whether the default compiler is a.out or elf
|
||||
cat >dummy.c <<EOF
|
||||
main(argc, argv)
|
||||
@@ -350,9 +478,9 @@
|
||||
char *argv[];
|
||||
{
|
||||
#ifdef __ELF__
|
||||
- printf ("%s-unknown-linux\n", argv[1]);
|
||||
+ printf ("%s-pc-linux-gnu\n", argv[1]);
|
||||
#else
|
||||
- printf ("%s-unknown-linuxaout\n", argv[1]);
|
||||
+ printf ("%s-pc-linux-gnuaout\n", argv[1]);
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
@@ -362,30 +490,32 @@
|
||||
fi ;;
|
||||
# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. earlier versions
|
||||
# are messed up and put the nodename in both sysname and nodename.
|
||||
- i[34]86:DYNIX/ptx:4*:*)
|
||||
+ i?86:DYNIX/ptx:4*:*)
|
||||
echo i386-sequent-sysv4
|
||||
exit 0 ;;
|
||||
- i[34]86:*:4.*:* | i[34]86:SYSTEM_V:4.*:*)
|
||||
+ i?86:*:4.*:* | i?86:SYSTEM_V:4.*:*)
|
||||
if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
|
||||
echo ${UNAME_MACHINE}-univel-sysv${UNAME_RELEASE}
|
||||
else
|
||||
- echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}
|
||||
+ echo ${UNAME_MACHINE}-pc-sysv${UNAME_RELEASE}
|
||||
fi
|
||||
exit 0 ;;
|
||||
- i[34]86:*:3.2:*)
|
||||
+ i?86:*:3.2:*)
|
||||
if test -f /usr/options/cb.name; then
|
||||
UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
|
||||
- echo ${UNAME_MACHINE}-unknown-isc$UNAME_REL
|
||||
+ echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
|
||||
elif /bin/uname -X 2>/dev/null >/dev/null ; then
|
||||
UNAME_REL=`(/bin/uname -X|egrep Release|sed -e 's/.*= //')`
|
||||
(/bin/uname -X|egrep i80486 >/dev/null) && UNAME_MACHINE=i486
|
||||
- echo ${UNAME_MACHINE}-unknown-sco$UNAME_REL
|
||||
+ (/bin/uname -X|egrep '^Machine.*Pentium' >/dev/null) \
|
||||
+ && UNAME_MACHINE=i586
|
||||
+ echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
|
||||
else
|
||||
- echo ${UNAME_MACHINE}-unknown-sysv32
|
||||
+ echo ${UNAME_MACHINE}-pc-sysv32
|
||||
fi
|
||||
exit 0 ;;
|
||||
Intel:Mach:3*:*)
|
||||
- echo i386-unknown-mach3
|
||||
+ echo i386-pc-mach3
|
||||
exit 0 ;;
|
||||
paragon:*:*:*)
|
||||
echo i860-intel-osf1
|
||||
@@ -401,28 +531,36 @@
|
||||
# "miniframe"
|
||||
echo m68010-convergent-sysv
|
||||
exit 0 ;;
|
||||
- M680[234]0:*:R3V[567]*:*)
|
||||
+ M68*:*:R3V[567]*:*)
|
||||
test -r /sysV68 && echo 'm68k-motorola-sysv' && exit 0 ;;
|
||||
- 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0)
|
||||
- uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||
- && echo i486-ncr-sysv4.3 && exit 0 ;;
|
||||
+ 3[34]??:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 4850:*:4.0:3.0)
|
||||
+ OS_REL=''
|
||||
+ test -r /etc/.relid \
|
||||
+ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
|
||||
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||
+ && echo i486-ncr-sysv4.3${OS_REL} && exit 0
|
||||
+ /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
|
||||
+ && echo i586-ncr-sysv4.3${OS_REL} && exit 0 ;;
|
||||
3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
|
||||
- uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||
+ /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
|
||||
&& echo i486-ncr-sysv4 && exit 0 ;;
|
||||
- m680[234]0:LynxOS:2.[23]*:*)
|
||||
- echo m68k-lynx-lynxos${UNAME_RELEASE}
|
||||
+ m68*:LynxOS:2.*:*)
|
||||
+ echo m68k-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
mc68030:UNIX_System_V:4.*:*)
|
||||
echo m68k-atari-sysv4
|
||||
exit 0 ;;
|
||||
- i[34]86:LynxOS:2.[23]*:*)
|
||||
- echo i386-lynx-lynxos${UNAME_RELEASE}
|
||||
+ i?86:LynxOS:2.*:*)
|
||||
+ echo i386-unknown-lynxos${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ TSUNAMI:LynxOS:2.*:*)
|
||||
+ echo sparc-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
- TSUNAMI:LynxOS:2.[23]*:*)
|
||||
- echo sparc-lynx-lynxos${UNAME_RELEASE}
|
||||
+ rs6000:LynxOS:2.*:* | PowerPC:LynxOS:2.*:*)
|
||||
+ echo rs6000-unknown-lynxos${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
- rs6000:LynxOS:2.[23]*:*)
|
||||
- echo rs6000-lynx-lynxos${UNAME_RELEASE}
|
||||
+ SM[BE]S:UNIX_SV:*:*)
|
||||
+ echo mips-dde-sysv${UNAME_RELEASE}
|
||||
exit 0 ;;
|
||||
RM*:SINIX-*:*:*)
|
||||
echo mips-sni-sysv4
|
||||
@@ -435,6 +573,29 @@
|
||||
echo ns32k-sni-sysv
|
||||
fi
|
||||
exit 0 ;;
|
||||
+ PENTIUM:CPunix:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
|
||||
+ # says <Richard.M.Bartel@ccMail.Census.GOV>
|
||||
+ echo i586-unisys-sysv4
|
||||
+ exit 0 ;;
|
||||
+ *:UNIX_System_V:4*:FTX*)
|
||||
+ # From Gerald Hewes <hewes@openmarket.com>.
|
||||
+ # How about differentiating between stratus architectures? -djm
|
||||
+ echo hppa1.1-stratus-sysv4
|
||||
+ exit 0 ;;
|
||||
+ *:*:*:FTX*)
|
||||
+ # From seanf@swdc.stratus.com.
|
||||
+ echo i860-stratus-sysv4
|
||||
+ exit 0 ;;
|
||||
+ mc68*:A/UX:*:*)
|
||||
+ echo m68k-apple-aux${UNAME_RELEASE}
|
||||
+ exit 0 ;;
|
||||
+ R3000:*System_V*:*:* | R4000:UNIX_SYSV:*:*)
|
||||
+ if [ -d /usr/nec ]; then
|
||||
+ echo mips-nec-sysv${UNAME_RELEASE}
|
||||
+ else
|
||||
+ echo mips-unknown-sysv${UNAME_RELEASE}
|
||||
+ fi
|
||||
+ exit 0 ;;
|
||||
esac
|
||||
|
||||
#echo '(No uname command or uname output not recognized.)' 1>&2
|
||||
@@ -478,7 +639,7 @@
|
||||
#endif
|
||||
int version;
|
||||
version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
|
||||
- printf ("%s-next-nextstep%s\n", __ARCHITECTURE__, version==2 ? "2" : "3");
|
||||
+ printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
|
||||
exit (0);
|
||||
#endif
|
||||
|
||||
@@ -495,7 +656,7 @@
|
||||
#endif
|
||||
|
||||
#if defined (__386BSD__)
|
||||
- printf ("i386-unknown-bsd\n"); exit (0);
|
||||
+ printf ("i386-pc-bsd\n"); exit (0);
|
||||
#endif
|
||||
|
||||
#if defined (sequent)
|
||||
@ -1,7 +1,7 @@
|
||||
--- configure.orig Mon Mar 6 16:25:50 2000
|
||||
+++ configure Mon Mar 20 20:34:09 2000
|
||||
@@ -6326,7 +6326,7 @@
|
||||
echo "configure:6327: checking for type of library to build" >&5
|
||||
--- configure.orig Thu Jul 13 10:49:34 2000
|
||||
+++ configure Tue Sep 5 20:39:53 2000
|
||||
@@ -6369,7 +6369,7 @@
|
||||
echo "configure:6370: checking for type of library to build" >&5
|
||||
if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
|
||||
EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
|
||||
- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.1 2000/07/20 04:56:43 brad Exp $
|
||||
lib/expect5.31/pkgIndex.tcl
|
||||
lib/libexpect531.so.1.2
|
||||
@comment $OpenBSD: PFRAG.shared,v 1.2 2000/09/06 01:06:27 brad Exp $
|
||||
lib/expect5.32/pkgIndex.tcl
|
||||
lib/libexpect532.so.1.2
|
||||
DYNLIBDIR(%B)
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
@comment $OpenBSD: PLIST,v 1.11 2000/07/20 04:56:43 brad Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.12 2000/09/06 01:06:28 brad Exp $
|
||||
bin/autoexpect
|
||||
bin/autopasswd
|
||||
bin/cryptdir
|
||||
@ -25,8 +25,8 @@ include/expect.h
|
||||
include/expect_comm.h
|
||||
include/expect_tcl.h
|
||||
include/tcldbg.h
|
||||
lib/expect5.31/libexpect531.a
|
||||
lib/libexpect531.a
|
||||
lib/expect5.32/libexpect532.a
|
||||
lib/libexpect532.a
|
||||
%%SHARED%%
|
||||
man/man1/autoexpect.1
|
||||
man/man1/cryptdir.1
|
||||
@ -41,4 +41,4 @@ man/man1/tknewsbiff.1
|
||||
man/man1/unbuffer.1
|
||||
man/man1/xkibitz.1
|
||||
man/man3/libexpect.3
|
||||
@dirrm lib/expect5.31
|
||||
@dirrm lib/expect5.32
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user