diff options
| author | Thomas Gellekum <tg@FreeBSD.org> | 1997-12-05 10:58:55 +0000 |
|---|---|---|
| committer | Thomas Gellekum <tg@FreeBSD.org> | 1997-12-05 10:58:55 +0000 |
| commit | b98e871361ab77794d87ea4507e0fe196034afa6 (patch) | |
| tree | f3a083dd276875482492f6e83adc139a3f872bf2 /lang/expect | |
| parent | fix a typo error in pkg/DESCR, add @dirrm in pkg/PLIST (diff) | |
Freeze shared lib version number, as requested by Satoshi.
Set {TCL,TK}_BUILD_LIB_SPEC to {TCL,TK}_LIB_SPEC. We no longer need
the BUILD_DEPENDS.
Notes
Notes:
svn path=/head/; revision=9000
Diffstat (limited to 'lang/expect')
| -rw-r--r-- | lang/expect/Makefile | 4 | ||||
| -rw-r--r-- | lang/expect/files/patch-aa | 28 |
2 files changed, 26 insertions, 6 deletions
diff --git a/lang/expect/Makefile b/lang/expect/Makefile index 8944c73e6b33..3822f7be7003 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -3,7 +3,7 @@ # Whom: pst # Version required: 5.25 # -# $Id: Makefile,v 1.25 1997/10/17 05:27:40 asami Exp $ +# $Id: Makefile,v 1.26 1997/11/10 11:27:34 asami Exp $ # DISTNAME= expect @@ -14,8 +14,6 @@ MASTER_SITES= http://expect.nist.gov/ \ MAINTAINER= ports@freebsd.org -BUILD_DEPENDS= /nonexistent:${PORTSDIR}/lang/tcl80:build \ - /nonexistent:${PORTSDIR}/x11/tk80:build LIB_DEPENDS= tcl80\\.1\\.:${PORTSDIR}/lang/tcl80 \ tk80\\.1:${PORTSDIR}/x11/tk80 diff --git a/lang/expect/files/patch-aa b/lang/expect/files/patch-aa index 9ae9e31a3c0a..eafa9faa5d67 100644 --- a/lang/expect/files/patch-aa +++ b/lang/expect/files/patch-aa @@ -1,5 +1,5 @@ ---- configure.ORIG Sun Sep 28 19:23:25 1997 -+++ configure Fri Oct 10 08:37:05 1997 +--- configure.orig Sun Sep 28 19:23:25 1997 ++++ configure Fri Dec 5 11:39:17 1997 @@ -1236,6 +1236,8 @@ # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' @@ -9,7 +9,29 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -@@ -6019,6 +6021,7 @@ +@@ -5845,7 +5847,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 +- eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}" ++ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1.2" + 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 @@ + s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g + s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g + s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g +-s%@TCL_BUILD_LIB_SPEC@%$TCL_BUILD_LIB_SPEC%g ++s%@TCL_BUILD_LIB_SPEC@%$TCL_LIB_SPEC%g + s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g + s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g + s%@TK_VERSION@%$TK_VERSION%g + s%@TK_DEFS@%$TK_DEFS%g + s%@TK_XINCLUDES@%$TK_XINCLUDES%g + s%@TK_XLIBSW@%$TK_XLIBSW%g +-s%@TK_BUILD_LIB_SPEC@%$TK_BUILD_LIB_SPEC%g ++s%@TK_BUILD_LIB_SPEC@%$TK_LIB_SPEC%g s%@TK_LIB_SPEC@%$TK_LIB_SPEC%g s%@CC@%$CC%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g |