update to version 5.26

This commit is contained in:
marc 1998-08-27 04:36:32 +00:00
parent f3de8151da
commit ca1a5a050e
7 changed files with 31 additions and 109 deletions

View File

@ -1,13 +1,13 @@
# New ports collection makefile for: expect
# Date created: 29 January 1998
# Whom: niklas
# Version required: 5.25
# Version required: 5.26
#
# $Id: Makefile,v 1.3 1998/02/10 10:45:23 niklas Exp $
# $Id: Makefile,v 1.4 1998/08/27 04:36:32 marc Exp $
#
DISTNAME= expect
PKGNAME= expect-5.25
PKGNAME= expect-5.26
CATEGORIES= lang tcl80 tk80
MASTER_SITES= http://expect.nist.gov/
@ -15,14 +15,17 @@ MAINTAINER= niklas@openbsd.org
LIB_DEPENDS= tk80\\.1:${PORTSDIR}/x11/tk80
WRKSRC= ${WRKDIR}/expect-5.25
WRKSRC= ${WRKDIR}/expect-5.26
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-shared \
--with-tclconfig=${PREFIX}/lib/tcl8.0 \
CONFIGURE_ARGS= --with-tclconfig=${PREFIX}/lib/tcl8.0 \
--with-tclinclude=${PREFIX}/include/tcl8.0 \
--with-tkconfig=${PREFIX}/lib/tk8.0 \
--with-tkinclude=${PREFIX}/include/tk8.0
.if (${MACHINE_ARCH} != "alpha")
CONFIGURE_ARGS+=--enable-shared
.endif
# needed for japanese/expect
.if !defined(NO_MAN_INSTALL)
MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \

View File

@ -1 +1 @@
MD5 (expect.tar.gz) = f64a719737b0b012f8bbee115a6b9a72
MD5 (expect.tar.gz) = 61fb608b69189753a5aa682bdd16ca0c

View File

@ -1,5 +1,5 @@
--- configure.orig Sun Sep 28 19:23:25 1997
+++ configure Fri Dec 5 11:39:17 1997
--- configure.~1~ Tue Jun 16 06:54:37 1998
+++ configure Wed Aug 26 21:09:33 1998
@@ -1236,6 +1236,8 @@
# It thinks the first close brace ends the variable substitution.
test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
@ -9,7 +9,7 @@
test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
@@ -5845,7 +5847,7 @@
@@ -5902,7 +5904,7 @@
if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
# EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
@ -18,7 +18,7 @@
EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_UNSHARED_LIB_FILE"
echo "$ac_t""both shared and unshared" 1>&6
@@ -6008,17 +6010,18 @@
@@ -6099,17 +6101,18 @@
s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g

View File

@ -1,6 +1,6 @@
--- Makefile.in.orig Sun Sep 28 19:20:30 1997
+++ Makefile.in Fri Oct 10 09:05:17 1997
@@ -186,6 +186,7 @@
--- Makefile.in.orig Tue Jun 16 06:53:36 1998
+++ Makefile.in Wed Aug 26 21:11:59 1998
@@ -180,6 +180,7 @@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@ -8,7 +8,7 @@
INSTALL_DATA = @INSTALL_DATA@
AR = ar
@@ -202,6 +203,7 @@
@@ -196,6 +197,7 @@
"HDEFS=$(HDEFS)" \
"INSTALL=$(INSTALL)" \
"INSTALL_DATA=$(INSTALL_DATA)" \
@ -16,7 +16,7 @@
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
"LDFLAGS=$(LDFLAGS)" \
"RUNTEST=$(RUNTEST)" \
@@ -350,7 +352,7 @@
@@ -344,7 +346,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
@@ -430,7 +432,7 @@
@@ -424,7 +426,7 @@
${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
-for i in $(SCRIPT_LIST) ; do \
if [ -f $$i ] ; then \

View File

@ -1,83 +0,0 @@
--- config.sub.orig Fri May 3 22:02:38 1996
+++ config.sub Fri Jan 30 00:20:11 1998
@@ -17,7 +17,8 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 59 Temple Place - Suite 330,
+# Boston, MA 02111-1307, USA.
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@ -128,8 +129,8 @@
case $basic_machine in
# Recognize the basic CPU types without company name.
# Some are omitted here because they have special meanings below.
- tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm | armeb \
- | armel | pyramid \
+ tahoe | i[345]86 | i860 | m68k | m68000 | m88k | ns32k | arm \
+ | arme[lb] | pyramid \
| tron | a29k | 580 | i960 | h8300 | hppa1.0 | hppa1.1 \
| alpha | we32k | ns16k | clipper | sparclite | i370 | sh \
| powerpc | powerpcle | sparc64 | 1750a | dsp16xx | mips64 | mipsel \
@@ -144,7 +145,7 @@
;;
# Recognize the basic CPU types with company name.
vax-* | tahoe-* | i[345]86-* | i860-* | m68k-* | m68000-* | m88k-* \
- | sparc-* | ns32k-* | fx80-* | arm-* | arme[lb]-* | c[123]* \
+ | sparc-* | ns32k-* | fx80-* | arm-* | c[123]* \
| mips-* | pyramid-* | tron-* | a29k-* | romp-* | rs6000-* | power-* \
| none-* | 580-* | cray2-* | h8300-* | i960-* | xmp-* | ymp-* \
| hppa1.0-* | hppa1.1-* | alpha-* | we32k-* | cydra-* | ns16k-* \
@@ -430,10 +431,13 @@
# We don't have specific support for AMD's K5 yet, so just call it a Pentium
basic_machine=i586-amd
;;
- nexgen)
+ nexen)
# We don't have specific support for Nexgen yet, so just call it a Pentium
basic_machine=i586-nexgen
;;
+ mips-arc-*)
+ basic_machine=mips-r4kle
+ ;;
pn)
basic_machine=pn-gould
;;
@@ -629,17 +633,20 @@
;;
# First accept the basic system types.
# The portable systems comes first.
- # Each alternative must end in a *, to match a version number.
+ # Each alternative MUST END IN A *, to match a version number.
# -sysv* is not here because it comes later, after sysvr4.
- -gnu* | -bsd* | -mach* | -lites* | -minix* | -genix* | -ultrix* | -irix* \
+ -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
| -vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[345]* \
| -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
- | -amigados* | -msdos* | -moss* | -newsos* | -unicos* | -aos* \
+ | -amigados* | -msdos* | -newsos* | -unicos* | -aos* \
| -nindy* | -vxworks* | -ebmon* | -hms* | -mvs* | -clix* \
| -riscos* | -linux* | -uniplus* | -iris* | -rtu* | -xenix* \
- | -hiux* | -386bsd* | -netbsd* | -freebsd* | -riscix* | -lites* \
+ | -hiux* | -386bsd* | -netbsd* | -freebsd* | -openbsd* \
+ | -riscix* \
| -lynxos* | -bosx* | -nextstep* | -cxux* | -aout* | -elf* \
- | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta | -udi | -eabi*)
+ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
+ | -udi* | -eabi* | -lites* )
+ # Remember, each alternative MUST END IN *, to match a version number.
;;
-sunos5*)
os=`echo $os | sed -e 's|sunos5|solaris2|'`
@@ -717,6 +724,9 @@
case $basic_machine in
*-acorn)
os=-riscix1.2
+ ;;
+ arm*-semi)
+ os=-aout
;;
pdp11-*)
os=-none

View File

@ -24,12 +24,13 @@ include/Dbg.h
include/expect.h
include/expect_comm.h
include/expect_tcl.h
lib/expect5.25/pkgIndex.tcl
lib/expect5.25/libexpect525.a
include/tclRegexp.h
lib/expect5.26/pkgIndex.tcl
lib/expect5.26/libexpect526.a
@exec ranlib %D/%F
lib/libexpect525.a
lib/libexpect526.a
@exec ranlib %D/%F
lib/libexpect525.so.1.2
lib/libexpect526.so.1.2
@exec /sbin/ldconfig -m %B
man/man1/autoexpect.1
man/man1/cryptdir.1
@ -44,4 +45,4 @@ man/man1/tknewsbiff.1
man/man1/unbuffer.1
man/man1/xkibitz.1
man/man3/libexpect.3
@dirrm lib/expect5.25
@dirrm lib/expect5.26

View File

@ -24,10 +24,11 @@ include/Dbg.h
include/expect.h
include/expect_comm.h
include/expect_tcl.h
lib/expect5.25/pkgIndex.tcl
lib/expect5.25/libexpect525.a
include/tclRegexp.h
lib/expect5.26/pkgIndex.tcl
lib/expect5.26/libexpect526.a
@exec ranlib %D/%F
lib/libexpect525.a
lib/libexpect526.a
@exec ranlib %D/%F
man/man1/autoexpect.1
man/man1/cryptdir.1
@ -42,4 +43,4 @@ man/man1/tknewsbiff.1
man/man1/unbuffer.1
man/man1/xkibitz.1
man/man3/libexpect.3
@dirrm lib/expect5.25
@dirrm lib/expect5.26