- Update to 5.45

  Please note that expectk is no longer included in the distribution. Please
  use ${WISH} with [package require Expect] instead.

7 files changed, 95 insertions, 129 deletions

diff --git a/lang/expect/Makefile b/lang/expect/Makefile
index 5a8f9ac0ef66..e7e79498c638 100644
--- a/lang/expect/Makefile
+++ b/lang/expect/Makefile
@@ -2,73 +2,37 @@
 # $FreeBSD$
 
 PORTNAME=	expect
-PORTVERSION=	5.43.0
-PORTREVISION=	4
+PORTVERSION=	5.45
 CATEGORIES=	lang tcl tk
-MASTER_SITES=	http://mirror.amdmi3.ru/distfiles/
+MASTER_SITES=	SF/expect/Expect/${PORTVERSION}
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	tcltk@FreeBSD.org
-COMMENT=	A sophisticated scripter based on tcl/tk
+COMMENT=	Sophisticated scripter based on Tcl/Tk
 
-CONFLICTS=	expect-5.44* weather-[0-9]*
+CONFLICTS=	weather-[0-9]*
 
-PORTSCOUT=	skipv:5.44.0,5.44.1	# These were recalled by NIST
+LIBEXPECT_VER=	${PORTVERSION:S/.//}
 
-EXPECT_VER=	5.43
-LIBEXPECT_VER=	543
+WRKSRC=		${WRKDIR}/${PORTNAME}${PORTVERSION}
 
-WRKSRC=		${WRKDIR}/expect-${EXPECT_VER}
+USES=		tcl
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-MAKE_JOBS_UNSAFE=	yes
-
-PLIST_SUB+=	EXPECT_VER="${EXPECT_VER}"
-PLIST_SUB+=	LIBEXPECT_VER="${LIBEXPECT_VER}"
-
-OPTIONS_DEFINE=	X11
-OPTIONS_DEFAULT=	X11
-
-NO_STAGE=	yes
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MX11}
-LIB_DEPENDS?=	tk84.1:${PORTSDIR}/x11-toolkits/tk84
-.else
-LIB_DEPENDS?=	tcl84.1:${PORTSDIR}/lang/tcl84
-.endif
-
-.if ${PORT_OPTIONS:MX11}
-TK_CONFIG_ARGS=	--with-tkconfig=${LOCALBASE}/lib/tk8.4 \
-		--with-tkinclude=${LOCALBASE}/include/tk8.4
-PLIST_SUB+=	XFILES=""
-.else
-TK_CONFIG_ARGS=
-PLIST_SUB+=	XFILES="@comment "
-.endif
-
-CONFIGURE_ARGS?=--enable-shared \
-		--with-tclconfig=${LOCALBASE}/lib/tcl8.4 \
-		--with-tclinclude=${LOCALBASE}/include/tcl8.4 \
-		${TK_CONFIG_ARGS}
-
-.if !defined(NO_MAN_INSTALL)
-MAN1=		autoexpect.1 cryptdir.1 decryptdir.1 dislocate.1 \
-		expect.1 kibitz.1 mkpasswd.1 multixterm.1 passmass.1 \
-		tknewsbiff.1 unbuffer.1 xkibitz.1
-.if ${PORT_OPTIONS:MX11}
-MAN1+=		expectk.1
-.endif
-MAN3=		libexpect.3
-.endif
-
-post-patch:
-	${REINPLACE_CMD} -e \
-		's|@TCLHDIRDASHI@|& -I${LOCALBASE}/include/tcl8.4/unix|' \
-		${WRKSRC}/Makefile.in ${WRKSRC}/DbgMkfl.in
-	${TOUCH} ${WRKSRC}/configure
+CONFIGURE_ARGS=	--enable-shared \
+		--exec-prefix=${PREFIX} \
+		--with-tclconfig=${TCL_LIBDIR} \
+		--with-tclinclude=${TCL_INCLUDEDIR}
+PLIST_SUB+=	EXPECT_VER=${PORTVERSION} \
+		LIBEXPECT_VER=${LIBEXPECT_VER}
 
 post-install:
-	${LN} -sf libexpect${LIBEXPECT_VER}.so.1 \
-		${PREFIX}/lib/libexpect${LIBEXPECT_VER}.so
+	${LN} -sf expect${PORTVERSION}/libexpect${LIBEXPECT_VER}.so \
+	    	${STAGEDIR}${PREFIX}/lib/libexpect.so.1
+	${LN} -sf libexpect.so.1 \
+		${STAGEDIR}${PREFIX}/lib/libexpect.so
+
+regression-test: build
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE} test
 
 .include <bsd.port.mk>
diff --git a/lang/expect/distinfo b/lang/expect/distinfo
index 4dd1c188d113..e58d1076f935 100644
--- a/lang/expect/distinfo
+++ b/lang/expect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (expect-5.43.0.tar.gz) = 4c9decec3c5541806f1758706fe649193d5c8afa2913a79361d9fa5f2c993ba1
-SIZE (expect-5.43.0.tar.gz) = 525572
+SHA256 (expect5.45.tar.gz) = b28dca90428a3b30e650525cdc16255d76bb6ccd65d448be53e620d95d5cc040
+SIZE (expect5.45.tar.gz) = 628808
diff --git a/lang/expect/files/patch-Makefile.in b/lang/expect/files/patch-Makefile.in
new file mode 100644
index 000000000000..4ce083e57568
--- /dev/null
+++ b/lang/expect/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig	2014-02-21 14:51:15.000000000 +0100
++++ Makefile.in	2014-02-21 14:55:44.000000000 +0100
+@@ -239,7 +239,7 @@
+ 	@mkdir -p $(DESTDIR)$(prefix)/bin
+ 	-for i in $(SCRIPT_LIST) ; do \
+ 	  if [ -f $$i ] ; then \
+-	    $(INSTALL_PROGRAM) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
++	    $(INSTALL_SCRIPT) $$i $(DESTDIR)$(prefix)/bin/$$i ; \
+ 	    rm -f $$i ; \
+ 	  else true; fi ; \
+ 	done
diff --git a/lang/expect/files/patch-aa b/lang/expect/files/patch-aa
deleted file mode 100644
index c446124b48fb..000000000000
--- a/lang/expect/files/patch-aa
+++ /dev/null
@@ -1,29 +0,0 @@
---- 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
--  eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
-+  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
-@@ -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
--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
-@@ -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%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g
- s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g
diff --git a/lang/expect/files/patch-ac b/lang/expect/files/patch-ac
deleted file mode 100644
index 6eff75af883d..000000000000
--- a/lang/expect/files/patch-ac
+++ /dev/null
@@ -1,36 +0,0 @@
---- Makefile.in.orig	Sun Sep 28 19:20:30 1997
-+++ Makefile.in	Fri Oct 10 09:05:17 1997
-@@ -186,6 +186,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- AR = ar
-@@ -202,6 +203,7 @@
- 	"HDEFS=$(HDEFS)" \
- 	"INSTALL=$(INSTALL)" \
- 	"INSTALL_DATA=$(INSTALL_DATA)" \
-+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
- 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
- 	"LDFLAGS=$(LDFLAGS)" \
- 	"RUNTEST=$(RUNTEST)" \
-@@ -350,7 +352,7 @@
- 	else true; fi
- 	if [ -s $(EXP_SHARED_LIB_FILE) ] ; then \
- 	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)/$(EXP_SHARED_LIB_FILE) ; \
--	  $(INSTALL_PROGRAM) pkgIndex $(libdir)/pkgIndex.tcl ; \
-+	  $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
- 	else true; fi
- 
- expect_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
-@@ -430,7 +432,7 @@
- 	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
- 	-for i in $(SCRIPT_LIST) ; do \
- 	  if [ -f $$i ] ; then \
--	    $(INSTALL_PROGRAM) $$i $(bindir_arch_indep)/$$i ; \
-+	    $(INSTALL_SCRIPT) $$i $(bindir_arch_indep)/$$i ; \
- 	    rm -f $$i ; \
- 	  else true; fi ; \
- 	done
diff --git a/lang/expect/files/patch-configure b/lang/expect/files/patch-configure
new file mode 100644
index 000000000000..d8ca39262353
--- /dev/null
+++ b/lang/expect/files/patch-configure
@@ -0,0 +1,45 @@
+--- configure.orig	2010-09-16 22:46:47.000000000 +0200
++++ configure	2014-02-21 14:43:41.000000000 +0100
+@@ -8103,7 +8103,7 @@
+ 	    # This configuration from FreeBSD Ports.
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD="${CC} -shared"
+-	    TCL_SHLIB_LD_EXTRAS="-soname \$@"
++	    TCL_SHLIB_LD_EXTRAS="-Wl,-soname=\$@"
+ 	    SHLIB_SUFFIX=".so"
+ 	    LDFLAGS=""
+ 	    if test $doRpath = yes; then
+@@ -8123,7 +8123,7 @@
+ 	    # Version numbers are dot-stripped by system policy.
+ 	    TCL_TRIM_DOTS=`echo ${VERSION} | tr -d .`
+ 	    UNSHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}.a'
+-	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so.1'
++	    SHARED_LIB_SUFFIX='${TCL_TRIM_DOTS}\$\{DBGX\}.so'
+ 	    TCL_LIB_VERSIONS_OK=nodots
+ 	    ;;
+ 	Darwin-*)
+@@ -16349,9 +16349,9 @@
+ 	    if test x"${TK_BIN_DIR}" != x ; then
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} \"`${CYGPATH} ${TK_BIN_DIR}/${TK_STUB_LIB_FILE}`\""
+ 	    fi
+-	    eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
++	    eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${EXP_LIB_VERSION}${SHARED_LIB_SUFFIX}"
+ 	else
+-	    eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
++	    eval eval "PKG_LIB_FILE=${PACKAGE_NAME}${EXP_LIB_VERSION}${UNSHARED_LIB_SUFFIX}"
+ 	fi
+ 	# Some packages build their own stubs libraries
+ 	eval eval "PKG_STUB_LIB_FILE=${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
+@@ -16368,10 +16368,10 @@
+ 	    if test x"${TK_BIN_DIR}" != x ; then
+ 		SHLIB_LD_LIBS="${SHLIB_LD_LIBS} ${TK_STUB_LIB_SPEC}"
+ 	    fi
+-	    eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${SHARED_LIB_SUFFIX}"
++	    eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${EXP_LIB_VERSION}${SHARED_LIB_SUFFIX}"
+ 	    RANLIB=:
+ 	else
+-	    eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${UNSHARED_LIB_SUFFIX}"
++	    eval eval "PKG_LIB_FILE=lib${PACKAGE_NAME}${EXP_LIB_VERSION}${UNSHARED_LIB_SUFFIX}"
+ 	fi
+ 	# Some packages build their own stubs libraries
+ 	eval eval "PKG_STUB_LIB_FILE=lib${PACKAGE_NAME}stub${UNSHARED_LIB_SUFFIX}"
diff --git a/lang/expect/pkg-plist b/lang/expect/pkg-plist
index b061793adcf6..3da66a4e01ea 100644
--- a/lang/expect/pkg-plist
+++ b/lang/expect/pkg-plist
@@ -4,7 +4,6 @@ bin/cryptdir
 bin/decryptdir
 bin/dislocate
 bin/expect
-%%XFILES%%bin/expectk
 bin/ftp-rfc
 bin/kibitz
 bin/lpunlock
@@ -25,9 +24,21 @@ include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
 include/tcldbg.h
+man/man1/autoexpect.1.gz
+man/man1/cryptdir.1.gz
+man/man1/decryptdir.1.gz
+man/man1/dislocate.1.gz
+man/man1/expect.1.gz
+man/man1/kibitz.1.gz
+man/man1/mkpasswd.1.gz
+man/man1/multixterm.1.gz
+man/man1/passmass.1.gz
+man/man1/tknewsbiff.1.gz
+man/man1/unbuffer.1.gz
+man/man1/xkibitz.1.gz
+man/man3/libexpect.3.gz
 lib/expect%%EXPECT_VER%%/pkgIndex.tcl
-lib/expect%%EXPECT_VER%%/libexpect%%LIBEXPECT_VER%%.a
-lib/libexpect%%LIBEXPECT_VER%%.a
-lib/libexpect%%LIBEXPECT_VER%%.so
-lib/libexpect%%LIBEXPECT_VER%%.so.1
+lib/expect%%EXPECT_VER%%/libexpect%%LIBEXPECT_VER%%.so
+lib/libexpect.so.1
+lib/libexpect.so
 @dirrm lib/expect%%EXPECT_VER%%