Update to version 5.30

PR:		13242
Submitted by:	Ade Lovett <ade@lovett.com>

4 files changed, 25 insertions, 35 deletions

diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 88292de0aa39..6f63a31d83b7 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -1,20 +1,20 @@
 # New ports collection makefile for:	expect
 # Date created:		20 November 1994
 # Whom:			pst
-# Version required:	5.28
+# Version required:	5.30
 #
-# $Id: Makefile,v 1.37 1998/10/10 04:07:04 steve Exp $
-#
-# Note this file is included from japanese/expect/Makefile
+# $Id: Makefile,v 1.38 1998/11/14 09:43:17 asami Exp $
 
-DISTNAME=	expect-5.28
+DISTNAME=	expect
+PKGNAME=	expect-5.30
 CATEGORIES=	lang tcl80 tk80
-MASTER_SITES=	ftp://peloton.physics.montana.edu/pub/distfiles/
+MASTER_SITES=	http://expect.nist.gov/
 
 MAINTAINER=	ports@freebsd.org
 
 LIB_DEPENDS?=	tk80.1:${PORTSDIR}/x11-toolkits/tk80
 
+WRKSRC=		${WRKDIR}/${PKGNAME}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS?= --enable-shared \
 		--with-tclconfig=${PREFIX}/lib/tcl8.0 \
@@ -31,13 +31,13 @@ MAN3=		libexpect.3
 .include <bsd.port.pre.mk>
 
 .if ${PORTOBJFORMAT} == "elf"
-SOLIB=	libexpect528.so.1
+SOLIB=	libexpect530.so.1
 .else
-SOLIB=	libexpect528.so.1.2
+SOLIB=	libexpect530.so.1.2
 .endif
 
 post-install:
-	${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect528.so
+	${LN} -sf ${SOLIB} ${PREFIX}/lib/libexpect530.so
 	${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 
 .include <bsd.port.post.mk>
diff --git a/lang/expect/distinfo b/lang/expect/distinfo
index b2c89a95cd3d..1caf7bc2838e 100644
--- a/lang/expect/distinfo
+++ b/lang/expect/distinfo
@@ -1 +1 @@
-MD5 (expect-5.28.tar.gz) = 4fd07ed06049da86f63f8b0aa188367a
+MD5 (expect.tar.gz) = fdfb69b8f41802e690bc7d002c559d72
diff --git a/lang/expect/files/patch-aa b/lang/expect/files/patch-aa
index 0f67973ca20c..42250a2fcc87 100644
--- a/lang/expect/files/patch-aa
+++ b/lang/expect/files/patch-aa
@@ -1,18 +1,9 @@
---- configure.orig	Tue May 19 00:22:13 1998
-+++ configure	Thu Oct  1 08:14:36 1998
-@@ -1236,6 +1236,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'
- 
- 
-@@ -5902,7 +5904,11 @@
+--- configure.orig	Wed Aug 18 11:52:19 1999
++++ configure	Wed Aug 18 18:24:52 1999
+@@ -6076,7 +6076,11 @@
  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
+ #  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"
@@ -22,7 +13,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
-@@ -6099,17 +6105,18 @@
+@@ -6290,7 +6294,7 @@
  s%@TCL_SHLIB_LD@%$TCL_SHLIB_LD%g
  s%@SHLIB_SUFFIX@%$SHLIB_SUFFIX%g
  s%@TCL_LD_FLAGS@%$TCL_LD_FLAGS%g
@@ -31,7 +22,8 @@
  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
+@@ -6298,7 +6302,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
@@ -39,7 +31,3 @@
  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%@RANLIB@%$RANLIB%g
- s%@subdirs@%$subdirs%g
diff --git a/lang/expect/pkg-plist b/lang/expect/pkg-plist
index 3fc60245e83e..3d148b07a8c7 100644
--- a/lang/expect/pkg-plist
+++ b/lang/expect/pkg-plist
@@ -23,11 +23,13 @@ bin/xpstat
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
-lib/expect5.28/pkgIndex.tcl
-lib/expect5.28/libexpect528.a
-lib/libexpect528.a
-lib/libexpect528.so
-lib/libexpect528.so.1.2
+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
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R
-@dirrm lib/expect5.28
+@dirrm lib/expect5.30