lang/tcl-expect: Upgrade from version 5.43 to 5.45

There doesn't appear to be a summary of changes between versions 5.43,
5.44 and 5.45.  Perusing the Changelog gives me the impression that
the updates are improvements and bug fixes against existing functionality.

Regardless, version 5.43 is incompatible with tcl8.5.  Expect had to
be updated after TCL was updated to version 8.5.

11 files changed, 213 insertions, 296 deletions

diff --git a/lang/tcl-expect/Makefile b/lang/tcl-expect/Makefile
index 6a65d7969de..49bd4fcfddc 100644
--- a/lang/tcl-expect/Makefile
+++ b/lang/tcl-expect/Makefile
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.25 2009/08/20 15:24:58 jwise Exp $
+# $NetBSD: Makefile,v 1.26 2012/08/21 21:33:58 marino Exp $
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "Makefile.common"
 
 PKGNAME=	tcl-expect-${EXPECT_VERSION}
-PKGREVISION=	1
 CATEGORIES=	lang
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Extensions to Tcl to support scripting of interactive programs
-
-CONFLICTS+=	expect-[0-9]*
+LICENSE=	public-domain
 
 CONFIGURE_ARGS+=	--enable-shared
-CONFIGURE_ARGS+=	--with-tclconfig=${PREFIX}/lib
-CONFIGURE_ARGS+=	--with-tclinclude=${PREFIX}/include/tcl
 CONFIGURE_ARGS+=	--without-x
 
 INSTALL_MAKE_FLAGS+=	INSTALL_ROOT=${DESTDIR:Q}
diff --git a/lang/tcl-expect/Makefile.common b/lang/tcl-expect/Makefile.common
index ace8b3a9a76..ac531f4dbd4 100644
--- a/lang/tcl-expect/Makefile.common
+++ b/lang/tcl-expect/Makefile.common
@@ -1,17 +1,25 @@
-# $NetBSD: Makefile.common,v 1.8 2006/05/13 08:58:37 skrll Exp $
+# $NetBSD: Makefile.common,v 1.9 2012/08/21 21:33:58 marino Exp $
 
-DISTNAME=	expect-${EXPECT_VERSION}
-MASTER_SITES=	http://expect.nist.gov/src/
-HOMEPAGE=	http://expect.nist.gov/
+DISTNAME=	expect${EXPECT_FNAME}
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=expect/}
+HOMEPAGE=	http://expect.sourceforge.net/
 
-EXPECT_VERSION=	5.43.0
-EXTRACT_SUFX=	.tar.bz2
+EXPECT_FNAME=	5.45
+EXPECT_VERSION=	5.45.0
+EXPECT_SONUM=	545
 
-WRKSRC=		${WRKDIR}/expect-5.43
-USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 TEST_TARGET=		test
 
+PLIST_SUBST+=		SONUM=${EXPECT_SONUM}
+PLIST_SUBST+=		BASEVER=${EXPECT_FNAME}
+
+# NetBSD 5.99 strip complains it doesn't recognized the format of
+# the utility scripts and didn't install any of them as a result.
+# Just in case there are other platforms like this, don't install
+# stripped binaries on any platform.
+INSTALL_UNSTRIPPED=	yes
+
 .include "../../mk/bsd.prefs.mk"
 
 # on IRIX 5.3 inttypes.h and sys/types.h are known to conflict
diff --git a/lang/tcl-expect/PLIST b/lang/tcl-expect/PLIST
index 374691f33e7..74c901d6c33 100644
--- a/lang/tcl-expect/PLIST
+++ b/lang/tcl-expect/PLIST
@@ -1,42 +1,44 @@
-@comment $NetBSD: PLIST,v 1.12 2009/06/14 20:34:16 joerg Exp $
+@comment $NetBSD: PLIST,v 1.13 2012/08/21 21:33:58 marino Exp $
+bin/autoexpect
+bin/autopasswd
+bin/cryptdir
+bin/decryptdir
+bin/dislocate
 bin/expect
+bin/ftp-rfc
+bin/kibitz
+bin/lpunlock
+bin/mkpasswd
+bin/multixterm
+bin/passmass
+bin/rftp
+bin/rlogin-cwd
+bin/timed-read
+bin/timed-run
+bin/tknewsbiff
+bin/tkpasswd
+bin/unbuffer
+bin/weather
+bin/xkibitz
+bin/xpstat
 include/expect.h
 include/expect_comm.h
 include/expect_tcl.h
 include/tcldbg.h
-lib/libexpect543.la
-lib/tcl/expect5.43/pkgIndex.tcl
+lib/libexpect${SONUM}.a
+lib/libexpect${SONUM}.so
+lib/libexpect${SONUM}.so.1.0
+lib/tcl/expect${BASEVER}/pkgIndex.tcl
+man/man1/autoexpect.1
+man/man1/cryptdir.1
+man/man1/decryptdir.1
+man/man1/dislocate.1
 man/man1/expect.1
+man/man1/kibitz.1
+man/man1/mkpasswd.1
+man/man1/multixterm.1
+man/man1/passmass.1
+man/man1/tknewsbiff.1
+man/man1/unbuffer.1
+man/man1/xkibitz.1
 man/man3/libexpect.3
-share/examples/tcl/expect/autoexpect
-share/examples/tcl/expect/autoexpect.1
-share/examples/tcl/expect/autopasswd
-share/examples/tcl/expect/cryptdir
-share/examples/tcl/expect/cryptdir.1
-share/examples/tcl/expect/decryptdir
-share/examples/tcl/expect/decryptdir.1
-share/examples/tcl/expect/dislocate
-share/examples/tcl/expect/dislocate.1
-share/examples/tcl/expect/ftp-rfc
-share/examples/tcl/expect/kibitz
-share/examples/tcl/expect/kibitz.1
-share/examples/tcl/expect/lpunlock
-share/examples/tcl/expect/mkpasswd
-share/examples/tcl/expect/mkpasswd.1
-share/examples/tcl/expect/multixterm
-share/examples/tcl/expect/multixterm.1
-share/examples/tcl/expect/passmass
-share/examples/tcl/expect/passmass.1
-share/examples/tcl/expect/rftp
-share/examples/tcl/expect/rlogin-cwd
-share/examples/tcl/expect/timed-read
-share/examples/tcl/expect/timed-run
-share/examples/tcl/expect/tknewsbiff
-share/examples/tcl/expect/tknewsbiff.1
-share/examples/tcl/expect/tkpasswd
-share/examples/tcl/expect/unbuffer
-share/examples/tcl/expect/unbuffer.1
-share/examples/tcl/expect/weather
-share/examples/tcl/expect/xkibitz
-share/examples/tcl/expect/xkibitz.1
-share/examples/tcl/expect/xpstat
diff --git a/lang/tcl-expect/distinfo b/lang/tcl-expect/distinfo
index 3f88eb7d9d2..742bd25cb1b 100644
--- a/lang/tcl-expect/distinfo
+++ b/lang/tcl-expect/distinfo
@@ -1,10 +1,7 @@
-$NetBSD: distinfo,v 1.15 2009/09/09 17:18:18 joerg Exp $
+$NetBSD: distinfo,v 1.16 2012/08/21 21:33:58 marino Exp $
 
-SHA1 (expect-5.43.0.tar.bz2) = a73530772f9d735e98175c7807efa8e785c5fa60
-RMD160 (expect-5.43.0.tar.bz2) = 27966c50923700a0b491d65cf54bd0e80eb6fa39
-Size (expect-5.43.0.tar.bz2) = 419691 bytes
-SHA1 (patch-aa) = c9991d876a55bfb5a3d8d98261ccb3e4a54d11a8
-SHA1 (patch-ab) = 642e714e58bfe72b332cb89559e1f55df9b6052f
-SHA1 (patch-ac) = 85702dac9cbc55875110cbed6ec3e73b7c66d07f
-SHA1 (patch-ad) = 460fcc04e6f1936fbb2669c80be91e790173b0a3
-SHA1 (patch-ae) = 308035226466d3fc0fa0a625365a817172842a69
+SHA1 (expect5.45.tar.gz) = e634992cab35b7c6931e1f21fbb8f74d464bd496
+RMD160 (expect5.45.tar.gz) = edffe881ee45abe6e9aa150ea5958a04d0ffeab0
+Size (expect5.45.tar.gz) = 628808 bytes
+SHA1 (patch-Makefile.in) = f1fdd2e3284b9b71ba231d8f8eff16729e1ef72f
+SHA1 (patch-configure) = a16c833e61d23f63abff1413522b99cd2251bc34
diff --git a/lang/tcl-expect/patches/patch-Makefile.in b/lang/tcl-expect/patches/patch-Makefile.in
new file mode 100644
index 00000000000..da71f234143
--- /dev/null
+++ b/lang/tcl-expect/patches/patch-Makefile.in
@@ -0,0 +1,68 @@
+$NetBSD: patch-Makefile.in,v 1.1 2012/08/21 21:33:58 marino Exp $
+
+New Makefile.in patch, no libtool
+
+--- Makefile.in.orig	2010-09-30 17:14:07.000000000 +0000
++++ Makefile.in
+@@ -99,7 +99,9 @@ PKG_HEADERS	= @PKG_HEADERS@
+ # configuration options) composed of the named objects.
+ #========================================================================
+ 
++SHLIB_VERSION	= .@SHLIB_VERSION@
+ PKG_LIB_FILE	= @PKG_LIB_FILE@
++PKG_LIB_A_FILE  = ${PKG_LIB_FILE:.so=.a}
+ PKG_STUB_LIB_FILE = @PKG_STUB_LIB_FILE@
+ 
+ lib_BINARIES	= $(PKG_LIB_FILE)
+@@ -121,9 +123,9 @@ includedir	= @includedir@
+ DESTDIR		=
+ 
+ PKG_DIR		= $(PACKAGE_NAME)$(PACKAGE_VERSION)
+-pkgdatadir	= $(datadir)/$(PKG_DIR)
+-pkglibdir	= $(libdir)/$(PKG_DIR)
+-pkgincludedir	= $(includedir)/$(PKG_DIR)
++pkgdatadir	= $(datadir)
++pkglibdir	= $(libdir)
++pkgincludedir	= $(includedir)
+ 
+ top_builddir	= .
+ 
+@@ -214,10 +216,15 @@ all: binaries libraries doc
+ # of the Makefile, in the "BINARIES" variable.
+ #========================================================================
+ 
+-binaries: $(BINARIES) pkgIndex.tcl-hand
++binaries: $(BINARIES) pkgIndex.tcl-hand ${PKG_LIB_A_FILE}
+ 
+ libraries:
+ 
++${PKG_LIB_A_FILE}: ${OBJS}
++	rm -rf $@
++	ar cr $@ ${OBJS}
++	$(RANLIB) $@
++
+ doc:
+ 
+ install: all install-binaries install-libraries install-doc
+@@ -547,6 +554,9 @@ install-lib-binaries:
+ 	    fi; \
+ 	  fi; \
+ 	done
++	mv $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_FILE)$(SHLIB_VERSION)
++	cd $(DESTDIR)$(pkglibdir) && ln -fs $(PKG_LIB_FILE)$(SHLIB_VERSION) $(PKG_LIB_FILE)
++	$(INSTALL_DATA) $(PKG_LIB_A_FILE) $(DESTDIR)$(pkglibdir)/$(PKG_LIB_A_FILE)
+ 	@list='$(PKG_TCL_SOURCES)'; for p in $$list; do \
+ 	  if test -f $(srcdir)/$$p; then \
+ 	    destp=`basename $$p`; \
+@@ -554,9 +564,10 @@ install-lib-binaries:
+ 	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(pkglibdir)/$$destp; \
+ 	  fi; \
+ 	done
++	mkdir -p $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION)
+ 	@if test "x$(SHARED_BUILD)" = "x1"; then \
+ 	    echo " Install pkgIndex.tcl $(DESTDIR)$(pkglibdir)"; \
+-	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir); \
++	    $(INSTALL_DATA) pkgIndex.tcl $(DESTDIR)$(pkglibdir)/tcl/expect$(PACKAGE_VERSION); \
+ 	fi
+ 
+ #========================================================================
diff --git a/lang/tcl-expect/patches/patch-aa b/lang/tcl-expect/patches/patch-aa
deleted file mode 100644
index 00f130b5b86..00000000000
--- a/lang/tcl-expect/patches/patch-aa
+++ /dev/null
@@ -1,177 +0,0 @@
-$NetBSD: patch-aa,v 1.6 2009/09/09 17:18:18 joerg Exp $
-
---- Makefile.in.orig	2004-05-07 18:10:30.000000000 +0000
-+++ Makefile.in
-@@ -57,9 +57,9 @@ X11_PROGS_INSTALLED = @X_PROGS@_installe
- # your Expect scripts.
- # Note: On Linux systems which only have dynamic X libraries, the -g prevents
- # the linker from using them.  So do not use -g on such systems.
--CFLAGS = @CFLAGS@
-+CFLAGS = @CFLAGS@ $(STTY) $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
- #XCFLAGS = @CFLAGS@ @EXP_CFLAGS@ @EXP_SHLIB_CFLAGS@ 
--XCFLAGS = @CFLAGS@ @EXP_CFLAGS@
-+XCFLAGS = @CFLAGS@ @EXP_CFLAGS@ $(STTY)
- 
- # Libraries built with optimization switches have this additional extension
- TCL_DBGX =              @TCL_DBGX@
-@@ -79,7 +79,8 @@ LDFLAGS = @EXP_LDFLAGS@
- # used when Tcl was compiled.  Changing this definition here can screw up
- # deductions that the configure script made on the assumption that you were
- # using a different compiler. 
--CC = @CC@
-+CC = ${LIBTOOL} --mode=compile @CC@
-+LD = ${LIBTOOL} --mode=link @CC@
- 
- # By default, "make install" will install the appropriate files in
- # /usr/local/bin, /usr/local/lib, /usr/local/man, etc.  By changing this
-@@ -171,10 +172,10 @@ STTY = -DDFLT_STTY="\"@DEFAULT_STTY_ARGS
- ######################################################################
- 
- bindir            = $(INSTALL_ROOT)@bindir@
--bindir_arch_indep = $(INSTALL_ROOT)$(prefix)/bin
--tcl_libdir        = $(INSTALL_ROOT)@libdir@
--libdir            = $(INSTALL_ROOT)@libdir@/expect$(VERSION)
--libdir_arch_indep = $(INSTALL_ROOT)$(prefix)/lib/expect$(VERSION)
-+bindir_arch_indep = $(INSTALL_ROOT)$(prefix)/share/examples/tcl/expect
-+tcl_libdir        = $(INSTALL_ROOT)$(prefix)/lib
-+libdir            = $(INSTALL_ROOT)@libdir@/tcl/expect$(VERSION)
-+libdir_arch_indep = $(INSTALL_ROOT)$(prefix)/lib/tcl/expect$(VERSION)
- 
- mandir 	= $(INSTALL_ROOT)@mandir@
- man1dir = $(mandir)/man1
-@@ -190,9 +191,10 @@ EXECSCRIPTDIR	= $(libdir)
- 
- SHELL = @EXP_CONFIG_SHELL@
- 
--INSTALL = @INSTALL@
--INSTALL_PROGRAM = @INSTALL_PROGRAM@
--INSTALL_DATA = @INSTALL_DATA@
-+INSTALL = ${LIBTOOL} --mode=install ${BSD_INSTALL}
-+INSTALL_PROGRAM = ${LIBTOOL} --mode=install ${BSD_INSTALL_PROGRAM}
-+INSTALL_DATA = ${LIBTOOL} --mode=install ${BSD_INSTALL_DATA}
-+INSTALL_SCRIPT = ${LIBTOOL} --mode=install ${BSD_INSTALL_SCRIPT}
- 
- AR = ar
- ARFLAGS = cr
-@@ -317,18 +319,18 @@ EXP_AND_TK_LIBS = $(LDFLAGS) @EXP_AND_TK
- CFLAGS_INT = $(MH_CFLAGS) $(CPPFLAGS) $(XCFLAGS)
- 
- LIB_INSTALL_DIR = $(tcl_libdir)
--LIB_RUNTIME_DIR = $(tcl_libdir)
-+LIB_RUNTIME_DIR = $(prefix)/lib
- # I don't understand why Tcl splits these up, but it does.  LIB_RUNTIME_DIR
- # can appear as part of the LD_SEARCH_FLAGS inherited by configure.
- 
--.c.o:
--	$(CC) -c $(CFLAGS_INT) $(STTY) $(HDEFS) $<
--	if [ "x$(EXP_UNSHARED_LIB_FILE)" != "x$(EXP_LIB_FILE)" ] ; then \
--	   if [ ! -d shared ] ; then \
--		mkdir shared ; \
--	   else true; fi ; \
--	   $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \
--	fi
-+#.c.o:
-+#	$(CC) -c $(CFLAGS_INT) $(STTY) $(HDEFS) $<
-+#	if [ "x$(EXP_UNSHARED_LIB_FILE)" != "x$(EXP_LIB_FILE)" ] ; then \
-+#	   if [ ! -d shared ] ; then \
-+#		mkdir shared ; \
-+#	   else true; fi ; \
-+#	   $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \
-+#	fi
- 
- all: binaries libraries doc
- 
-@@ -345,7 +347,7 @@ dvi:
- # build expect binary that does not depend on Expect's shared libs
- # IFF static Tcl/Tk libraries are available.
- expect:	exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
--	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
-+	$(LD) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
- 	$(SETUID) expect
- 
- # install Expect library
-@@ -360,24 +362,16 @@ expect:	exp_main_exp.o $(EXP_UNSHARED_LI
- #   is too long for some filesystems, sigh.
- install_shared_lib: $(EXP_LIB_FILES)
- 	${srcdir}/mkinstalldirs $(libdir)
--	if [ -s $(EXP_UNSHARED_LIB_FILE) ] ; then \
--	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	  $(UNSHARED_RANLIB) $(libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	  $(UNSHARED_RANLIB) $(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) ; \
--	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 ; \
--	else true; fi
-+	  $(INSTALL_DATA) $(EXP_SHARED_LIB_FILE) $(tcl_libdir)
-+	  $(INSTALL_DATA) pkgIndex $(libdir)/pkgIndex.tcl
- 
- expect_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
--	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
-+	$(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect_installed exp_main_exp.o $(EXP_SHARED_LIB_FILE) $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
- 	$(SETUID) expect_installed
- 
- # Build Expect with TestCenter
- expect.tc: exp_main_exp.o $(OFILES) 
--	proof $(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect.tc $(OFILES) exp_main_exp.o $(TCLLIB) $(EXP_AND_TCL_LIBS) 
-+	proof $(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expect.tc $(OFILES) exp_main_exp.o $(TCLLIB) $(EXP_AND_TCL_LIBS) 
- 	$(SETUID) expect.tc
- 
- # Build an executable with both Expect and Tk
-@@ -388,16 +382,16 @@ expect.tc: exp_main_exp.o $(OFILES) 
- # configure) separately for Expectk, but as far as I know, it doesn't hurt
- # anything here, so I'm not worrying about it.
- expectk: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
--	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	$(LD) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
- 	$(SETUID) expectk
- 
- expectk_installed: exp_main_tk.o $(EXP_LIB_FILE)
--	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	$(LD) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectk_installed exp_main_tk.o $(EXP_SHARED_LIB_FILE) $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
- 	$(SETUID) expectk_installed
- 
- # Build Expectk with TestCenter
- expectk.tc: exp_main_tk.o $(OFILES) 
--	proof $(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk.tc $(OFILES) exp_main_tk.o $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	proof $(LD) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk.tc $(OFILES) exp_main_tk.o $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
- 	$(SETUID) expectk.tc
- 
- expect-unshared-lib-file :: $(EXP_UNSHARED_LIB_FILE)
-@@ -413,7 +407,7 @@ $(EXP_UNSHARED_LIB_FILE): $(OFILES)
- expect-shared-lib-file :: $(EXP_SHARED_LIB_FILE)
- $(EXP_SHARED_LIB_FILE): $(OFILES)
- 	-rm -f $(EXP_SHARED_LIB_FILE)
--	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+	${LIBTOOL} --mode=link @CC@ -rpath ${PREFIX}/lib -o $(EXP_SHARED_LIB_FILE) $(OFILES:.o=.lo) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@ -version-info 1:0
- 
- .PHONY: install-info install info
- install-info:
-@@ -451,7 +445,7 @@ install-libraries:
- 	${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
-@@ -460,7 +454,7 @@ install-doc:
- 	${srcdir}/mkinstalldirs $(man1dir) $(man3dir)
- # install Expectk man page if present
- 	-if [ -s expectk_installed ] ; then \
--	  $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
-+	  $(BSD_INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
- 	else true; fi
- # install Expect man page
- 	$(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1
-@@ -468,7 +462,7 @@ install-doc:
- 	$(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3
- 	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
- 	  if [ -f $(srcdir)/example/$$i.man ] ; then \
--	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(man1dir)/$$i.1 ; \
-+	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(bindir_arch_indep)/$$i.1 ; \
- 	  else true; fi ; \
- 	done
- 
diff --git a/lang/tcl-expect/patches/patch-ab b/lang/tcl-expect/patches/patch-ab
deleted file mode 100644
index 7ab8c9c2f6f..00000000000
--- a/lang/tcl-expect/patches/patch-ab
+++ /dev/null
@@ -1,9 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2000/09/05 16:20:30 jwise Exp $
---- pkgIndex.in.orig	Fri Sep  1 22:24:40 2000
-+++ pkgIndex.in	Fri Sep  1 22:24:53 2000
-@@ -7,4 +7,4 @@
- # script is sourced, the variable $dir must contain the
- # full path name of this file's directory.
- 
--package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
-+package ifneeded Expect @EXP_VERSION_FULL@ [list load [file join $dir ../.. @EXP_SHARED_LIB_FILE@]]
diff --git a/lang/tcl-expect/patches/patch-ac b/lang/tcl-expect/patches/patch-ac
deleted file mode 100644
index e0502ce4bff..00000000000
--- a/lang/tcl-expect/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2005/04/08 11:54:05 adam Exp $
-
---- exp_command.c.orig	2004-08-20 17:18:01.000000000 +0000
-+++ exp_command.c
-@@ -790,7 +790,7 @@ when trapping, see below in child half o
- 	 * process "-open $channel"
- 	 */
- 	int mode;
--	int rfd, wfd;
-+	long rfd, wfd;
- 	ClientData rfdc, wfdc;
- 	
- 	if (echo) {
diff --git a/lang/tcl-expect/patches/patch-ad b/lang/tcl-expect/patches/patch-ad
deleted file mode 100644
index 12aa68c9eab..00000000000
--- a/lang/tcl-expect/patches/patch-ad
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2002/01/03 13:47:58 wiz Exp $
-
---- configure.orig	Tue Oct  2 00:33:45 2001
-+++ configure
-@@ -589,21 +589,6 @@
-   echo "$ac_t""no" 1>&6
- fi
- 
--echo $ac_n "checking configure up to date""... $ac_c" 1>&6
--echo "configure:594: checking configure up to date" >&5
--for i in `ls -tr ${srcdir}/configure ${srcdir}/configure.in ${srcdir}/Makefile.in` ; do
--  newest=$i
--done
--if test "$srcdir/configure" = "$newest" ; then
--  echo "$ac_t""yes" 1>&6
--else
--  echo "$ac_t""no" 1>&6
--fi
--if test $found = "no" -a "$newest" != "$srcdir/configure" ; then
--  echo "configure: warning: $srcdir/configure appears to be old ($srcdir/configure.in and/or $srcdir/Makefile.in are newer) and the autoconf program to fix this situation was not found.  If you've no idea what this means, enter the command \"touch $srcdir/configure\" and restart $srcdir/configure." 1>&2
--  exit
--fi
--
- ac_aux_dir=
- for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
-   if test -f $ac_dir/install-sh; then
diff --git a/lang/tcl-expect/patches/patch-ae b/lang/tcl-expect/patches/patch-ae
deleted file mode 100644
index 76632942ffe..00000000000
--- a/lang/tcl-expect/patches/patch-ae
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2004/11/30 20:30:19 adam Exp $
-
---- configure.orig	Tue Nov 30 20:26:40 2004
-+++ configure
-@@ -6367,7 +6367,7 @@ echo $ac_n "checking for type of library
- echo "configure:6383: 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${EXP_MAJOR_VERSION}${EXP_MINOR_VERSION}.la"
-   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
diff --git a/lang/tcl-expect/patches/patch-configure b/lang/tcl-expect/patches/patch-configure
new file mode 100644
index 00000000000..196e432f342
--- /dev/null
+++ b/lang/tcl-expect/patches/patch-configure
@@ -0,0 +1,84 @@
+$NetBSD: patch-configure,v 1.1 2012/08/21 21:33:58 marino Exp $
+
+New configure patch, no libtool
+
+--- configure.orig	2010-09-16 20:46:47.000000000 +0000
++++ configure
+@@ -8007,7 +8007,7 @@ fi
+ fi
+ 
+ 	    ;;
+-	OpenBSD-*)
++	OpenBSD-*|MirBSD-*)
+ 	    SHLIB_CFLAGS="-fPIC"
+ 	    SHLIB_LD='${CC} -shared ${SHLIB_CFLAGS}'
+ 	    SHLIB_SUFFIX=".so"
+@@ -8099,11 +8099,11 @@ fi
+ 		;;
+ 	    esac
+ 	    ;;
+-	FreeBSD-*)
++	FreeBSD-*|DragonFly-*)
+ 	    # 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
+@@ -8899,7 +8899,7 @@ fi
+ 	    BSD/OS*) ;;
+ 	    CYGWIN_*) ;;
+ 	    IRIX*) ;;
+-	    NetBSD-*|FreeBSD-*|OpenBSD-*) ;;
++	    NetBSD-*|FreeBSD-*|OpenBSD-*|DragonFly-*|MirBSD-*) ;;
+ 	    Darwin-*) ;;
+ 	    SCO_SV-3.2*) ;;
+ 	    windows) ;;
+@@ -15948,14 +15948,7 @@ fi
+ 
+ PACKAGE_VERSION_NODOTS="`echo $PACKAGE_VERSION | sed -e 's/\.//g'`"
+ 
+-if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-    EXP_LIB_VERSION=$PACKAGE_VERSION
+-else
+-    EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
+-fi
+-if test $iunix -eq 1 ; then
+     EXP_LIB_VERSION=$PACKAGE_VERSION_NODOTS
+-fi
+ 
+ # also remove dots on systems that don't support filenames > 14
+ # (are there systems which support shared libs and restrict filename lengths!?)
+@@ -16021,11 +16014,7 @@ if test "$FRAMEWORK_BUILD" = "1" ; then
+ _ACEOF
+ 
+ else
+-    if test "${TCL_LIB_VERSIONS_OK}" = "ok"; then
+-        EXP_LIB_FLAG="-lexpect${EXP_LIB_VERSION}"
+-    else
+-        EXP_LIB_FLAG="-lexpect`echo ${EXP_LIB_VERSION} | tr -d .`"
+-    fi
++    EXP_LIB_FLAG="-lexpect`echo ${EXP_LIB_VERSION} | tr -d .`"
+     EXP_BUILD_LIB_SPEC="-L`pwd` ${EXP_LIB_FLAG}"
+     EXP_LIB_SPEC="-L${libdir} ${EXP_LIB_FLAG}"
+ fi
+@@ -16341,6 +16330,9 @@ rm -f conftest*
+     # substituted. (@@@ Might not be necessary anymore)
+     #--------------------------------------------------------------------
+ 
++    PVNODOTS=`echo ${PACKAGE_VERSION} | tr -d .`
++    SHARED_LIB_SUFFIX=${PVNODOTS}.so
++    UNSHARED_LIB_SUFFIX=${PVNODOTS}.a
+     if test "${TEA_PLATFORM}" = "windows" ; then
+ 	if test "${SHARED_BUILD}" = "1" ; then
+ 	    # We force the unresolved linking of symbols that are really in
+@@ -17176,6 +17170,7 @@ s,@VC_MANIFEST_EMBED_EXE@,$VC_MANIFEST_E
+ s,@TCLSH_PROG@,$TCLSH_PROG,;t t
+ s,@LIBOBJS@,$LIBOBJS,;t t
+ s,@LTLIBOBJS@,$LTLIBOBJS,;t t
++s,@SHLIB_VERSION@,$SHLIB_VERSION,;t t
+ CEOF
+ 
+ _ACEOF