diff options
| -rw-r--r-- | lang/expect/Makefile | 28 | ||||
| -rw-r--r-- | lang/expect/distinfo | 2 | ||||
| -rw-r--r-- | lang/expect/files/patch-aa | 20 | ||||
| -rw-r--r-- | lang/expect/pkg-plist | 12 |
4 files changed, 25 insertions, 37 deletions
diff --git a/lang/expect/Makefile b/lang/expect/Makefile index cba2703..cfa3fb5 100644 --- a/lang/expect/Makefile +++ b/lang/expect/Makefile @@ -1,26 +1,26 @@ # New ports collection makefile for: expect # Date created: 20 November 1994 # Whom: pst -# Version required: 5.30 +# Version required: 5.31 # # $FreeBSD$ DISTNAME= expect -PKGNAME= expect-5.30 -CATEGORIES= lang tcl80 tk80 +PKGNAME= expect-5.31 +CATEGORIES= lang tcl82 tk82 MASTER_SITES= http://expect.nist.gov/ MAINTAINER= ports@freebsd.org -LIB_DEPENDS?= tk80.1:${PORTSDIR}/x11-toolkits/tk80 +LIB_DEPENDS?= tk82.1:${PORTSDIR}/x11-toolkits/tk82 WRKSRC= ${WRKDIR}/${PKGNAME} GNU_CONFIGURE= yes CONFIGURE_ARGS?= --enable-shared \ - --with-tclconfig=${PREFIX}/lib/tcl8.0 \ - --with-tclinclude=${PREFIX}/include/tcl8.0 \ - --with-tkconfig=${PREFIX}/lib/tk8.0 \ - --with-tkinclude=${PREFIX}/include/tk8.0 + --with-tclconfig=${PREFIX}/lib/tcl8.2 \ + --with-tclinclude=${PREFIX}/include/tcl8.2 \ + --with-tkconfig=${PREFIX}/lib/tk8.2 \ + --with-tkinclude=${PREFIX}/include/tk8.2 .if !defined(NO_MAN_INSTALL) MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \ expect.1 expectk.1 kibitz.1 mkpasswd.1 passmass.1 \ @@ -28,16 +28,8 @@ MAN1= autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \ MAN3= libexpect.3 .endif -.include <bsd.port.pre.mk> - -.if ${PORTOBJFORMAT} == "elf" -SOLIB= libexpect530.so.1 -.else -SOLIB= libexpect530.so.1.2 -.endif - post-install: - ${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect530.so + ${LN} -sf libexpect531.so.1 ${PREFIX}/lib/libexpect531.so ${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff --git a/lang/expect/distinfo b/lang/expect/distinfo index e150c07..678e948 100644 --- a/lang/expect/distinfo +++ b/lang/expect/distinfo @@ -1 +1 @@ -MD5 (expect.tar.gz) = 947ac547a40b02e7db0ecdae84b33ca7 +MD5 (expect.tar.gz) = 2a478e626019c29ef7a13140b05f85f1 diff --git a/lang/expect/files/patch-aa b/lang/expect/files/patch-aa index 42250a2..c446124 100644 --- a/lang/expect/files/patch-aa +++ b/lang/expect/files/patch-aa @@ -1,19 +1,15 @@ ---- configure.orig Wed Aug 18 11:52:19 1999 -+++ configure Wed Aug 18 18:24:52 1999 -@@ -6076,7 +6076,11 @@ +--- configure.orig Fri Oct 22 22:48:14 1999 ++++ configure Wed Oct 27 18:10:25 1999 +@@ -6273,7 +6273,7 @@ + echo "configure:6274: 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 - # EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_DBGX$TCL_SHLIB_SUFFIX - eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}" -+ if test X`objformat` = Xelf ; then -+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1" -+ else -+ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1.2" -+ fi ++ eval "EXP_SHARED_LIB_FILE=libexpect`echo ${VERSION} | tr -d .`.so.1" 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 -@@ -6290,7 +6294,7 @@ +@@ -6504,7 +6504,7 @@ s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g @@ -22,12 +18,12 @@ s%@TCL_LIB_SPEC@%$TCL_LIB_SPEC%g s%@TCL_SHARED_LIB_SUFFIX@%$TCL_SHARED_LIB_SUFFIX%g s%@TK_VERSION@%$TK_VERSION%g -@@ -6298,7 +6302,7 @@ +@@ -6512,7 +6512,7 @@ s%@TK_DBGX@%$TK_DBGX%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 + s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g diff --git a/lang/expect/pkg-plist b/lang/expect/pkg-plist index 3d148b0..1d5c126 100644 --- a/lang/expect/pkg-plist +++ b/lang/expect/pkg-plist @@ -25,11 +25,11 @@ include/expect_comm.h include/expect_tcl.h include/tclRegexp.h include/tcldbg.h -lib/expect5.30/pkgIndex.tcl -lib/expect5.30/libexpect530.a -lib/libexpect530.a -lib/libexpect530.so -lib/libexpect530.so.1 +lib/expect5.31/pkgIndex.tcl +lib/expect5.31/libexpect531.a +lib/libexpect531.a +lib/libexpect531.so +lib/libexpect531.so.1 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R -@dirrm lib/expect5.30 +@dirrm lib/expect5.31 |
