diff options
Diffstat (limited to 'lang/expect')
| -rw-r--r-- | lang/expect/Makefile | 5 | ||||
| -rw-r--r-- | lang/expect/distinfo | 2 | ||||
| -rw-r--r-- | lang/expect/files/patch-aa | 64 | ||||
| -rw-r--r-- | lang/expect/files/patch-ac | 10 |
4 files changed, 49 insertions, 32 deletions
diff --git a/lang/expect/Makefile b/lang/expect/Makefile index e93df5c9de39..dc180d0d9055 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,12 +1,13 @@ # New ports collection makefile for: expect -# Version required: 5.21.6 +# Version required: 5.21.7 # Date created: 20 November 1994 # Whom: pst # -# $Id: Makefile,v 1.14 1996/12/07 19:58:09 max Exp $ +# $Id: Makefile,v 1.15 1996/12/16 12:12:59 peter Exp $ # DISTNAME= expect-5.21 +PKGNAME= expect-5.21.7 CATEGORIES= lang MASTER_SITES= http://expect.nist.gov/ \ ftp://expect.nist.gov/mel/div826/subject/expect/ diff --git a/lang/expect/distinfo b/lang/expect/distinfo index 100cf6d01ff4..b0bc681e7fbf 100644 --- a/lang/expect/distinfo +++ b/lang/expect/distinfo @@ -1 +1 @@ -MD5 (expect.tar.gz) = 56594aa15a3beb22a12e1c3d47f9e153 +MD5 (expect.tar.gz) = dc6001f78aa4f0dc8bd047bfbe38e6a3 diff --git a/lang/expect/files/patch-aa b/lang/expect/files/patch-aa index 986efd66dd5c..a3ea87759a7d 100644 --- a/lang/expect/files/patch-aa +++ b/lang/expect/files/patch-aa @@ -1,24 +1,40 @@ -diff -cdNr expect-5.18.ORG/configure expect-5.18/configure -*** expect-5.18.ORG/configure Tue Nov 21 23:38:23 1995 ---- configure Thu Dec 7 23:35:09 1995 -*************** -*** 704,709 **** ---- 704,711 ---- - # It thinks the first close brace ends the variable substitution. - test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' - -+ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' -+ - test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' - - -*************** -*** 4601,4606 **** ---- 4603,4609 ---- - s%@CPP@%$CPP%g - s%@RANLIB@%$RANLIB%g - s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g -+ s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g - s%@INSTALL_DATA@%$INSTALL_DATA%g - s%@subdirs@%$subdirs%g - s%@TCLHDIR@%$TCLHDIR%g +--- configure.orig Sat Dec 28 03:18:44 1996 ++++ configure Mon Jan 6 18:38:40 1997 +@@ -1159,6 +1159,8 @@ + # It thinks the first close brace ends the variable substitution. + test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' + ++test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' ++ + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' + + +@@ -5719,15 +5721,17 @@ + EXP_LIB_VERSION=$EXP_VERSION_NODOTS + fi + ++VERSION=${EXP_LIB_VERSION} ++ + EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}" + EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}" +-EXP_NONSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a ++eval EXP_NONSHARED_LIB_FILE=libexpect${TCL_UNSHARED_LIB_SUFFIX} + + echo $ac_n "checking for type of library to build""... $ac_c" 1>&6 + echo "configure:5728: checking for type of library to build" >&5 +-if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then ++if test "$enable_shared" = "yes" -a "x${TCL_SHARED_LIB_SUFFIX}" != "x" ; then + EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS +- EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX ++ eval EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX} + EXP_LIB_FILE=$EXP_SHARED_LIB_FILE + EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_NONSHARED_LIB_FILE" + echo "$ac_t""both shared and nonshared" 1>&6 +@@ -5899,6 +5903,7 @@ + s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g + s%@CC@%$CC%g + s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g ++s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g + s%@INSTALL_DATA@%$INSTALL_DATA%g + s%@subdirs@%$subdirs%g + s%@CPP@%$CPP%g diff --git a/lang/expect/files/patch-ac b/lang/expect/files/patch-ac index f7a994c646d8..f456c3e352fd 100644 --- a/lang/expect/files/patch-ac +++ b/lang/expect/files/patch-ac @@ -1,6 +1,6 @@ ---- Makefile.in.orig Wed Apr 24 10:37:25 1996 -+++ Makefile.in Sun Apr 28 09:40:54 1996 -@@ -169,6 +169,7 @@ +--- Makefile.in.orig Sat Dec 28 01:50:41 1996 ++++ Makefile.in Mon Jan 6 18:40:39 1997 +@@ -180,6 +180,7 @@ INSTALL = @INSTALL@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -8,7 +8,7 @@ INSTALL_DATA = @INSTALL_DATA@ AR = ar -@@ -185,6 +186,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)" \ -@@ -388,7 +390,7 @@ +@@ -437,7 +439,7 @@ ${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR) -for i in $(SCRIPT_LIST) ; do \ if [ -f $$i ] ; then \ |