11 files changed, 0 insertions, 453 deletions

diff --git a/japanese/Makefile b/japanese/Makefile
index b1dbf6ea31f4..842f78d447fe 100644
--- a/japanese/Makefile
+++ b/japanese/Makefile
@@ -71,7 +71,6 @@
     SUBDIR += eterm
     SUBDIR += ewipe
     SUBDIR += exmh2
-    SUBDIR += expect
     SUBDIR += flex-sdk
     SUBDIR += flower-fpw
     SUBDIR += foldoc-fpw
diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
deleted file mode 100644
index bbc620d8534b..000000000000
--- a/japanese/expect/Makefile
+++ /dev/null
@@ -1,44 +0,0 @@
-# New ports collection makefile for:	expect
-# Date created:		17 Oct 1997
-# Whom:			taguchi
-#
-# $FreeBSD$
-#
-
-PORTNAME=	expect
-PORTVERSION=	5.30
-PORTREVISION=	2
-CATEGORIES=	japanese lang tk
-MASTER_SITES=	ftp://ftp.nist.gov/mel/div826/subject/expect/old/
-
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	A sophisticated scripter based on Japanized tcl/tk
-
-LIB_DEPENDS=	tk80jp.1:${PORTSDIR}/japanese/tk80
-
-BROKEN=		does not build
-DEPRECATED=	has been broken for 3 months
-EXPIRATION_DATE=2010-01-08
-
-USE_AUTOTOOLS=	autoconf:213
-CONFIGURE_ENV=	INSTALL_SCRIPT="${INSTALL_SCRIPT}" \
-    		CFLAGS="-I${LOCALBASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib"
-CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl8.0jp \
-		--with-tkconfig=${PREFIX}/lib/tk8.0jp \
-		--with-tclinclude=${PREFIX}/include/tcl8.0jp \
-		--with-tkinclude=${PREFIX}/include/tk8.0jp
-
-NO_MAN_INSTALL=	yes
-USE_LDCONFIG=	yes
-
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64"
-BROKEN=		Incomplete pkg-plist
-.endif
-
-test:
-	cd ${WRKSRC} && ${MAKE} test
-
-.include <bsd.port.post.mk>
diff --git a/japanese/expect/distinfo b/japanese/expect/distinfo
deleted file mode 100644
index 41764d680398..000000000000
--- a/japanese/expect/distinfo
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 (expect-5.30.tar.gz) = 73bf1f347dde3c2b2cd04b344c6769df
-SHA256 (expect-5.30.tar.gz) = 0d4b33e83c09ee3912d36017cd6f33578f40293f148e1dd62bf47e54cb646f80
-SIZE (expect-5.30.tar.gz) = 462787
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa
deleted file mode 100644
index 43b5317456dc..000000000000
--- a/japanese/expect/files/patch-aa
+++ /dev/null
@@ -1,275 +0,0 @@
---- Makefile.in.orig	Wed Aug 18 18:52:07 1999
-+++ Makefile.in	Sat Jan 27 01:48:56 2007
-@@ -24,7 +24,7 @@
- TCL_LIBRARY = @TCL_LIBRARY@
- 
- # Tcl library uninstalled.  Should be something like -ltcl or ../tcl/libtcl.a
--TCLLIB = @TCL_BUILD_LIB_SPEC@
-+TCLLIB = @TCL_LIB_SPEC@
- # Tcl library installed.  Should be something like -ltcl or ../tcl/libtcl.a
- TCLLIB_INSTALLED = @TCL_LIB_SPEC@
- 
-@@ -32,7 +32,7 @@
- # Tk include files
- TKHDIRDASHI = @TKHDIRDASHI@
- # Tk library
--TKLIB = @TK_BUILD_LIB_SPEC@
-+TKLIB = @TK_LIB_SPEC@
- TKLIB_INSTALLED = @TK_LIB_SPEC@
- # X11 include files and other flags to compiler
- X11_CFLAGS = @TK_XINCLUDES@
-@@ -57,7 +57,7 @@
- # 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@ -DKANJI -DKINPUT2
- #XCFLAGS = @CFLAGS@ @EXP_CFLAGS@ @EXP_SHLIB_CFLAGS@ 
- XCFLAGS = @CFLAGS@ @EXP_CFLAGS@
- 
-@@ -179,7 +179,7 @@
- man1dir = $(mandir)/man1
- man3dir = $(mandir)/man3
- infodir = $(INSTALL_ROOT)@infodir@
--includedir = $(INSTALL_ROOT)@includedir@
-+includedir = $(INSTALL_ROOT)@includedir@/expect$(VERSION)
- 
- # Expect's utility script directories - arch-independent and arch-non-
- # independent.  These correspond to the variables "exp_library" and
-@@ -191,12 +191,13 @@
- 
- INSTALL = @INSTALL@
- INSTALL_PROGRAM = @INSTALL_PROGRAM@
-+INSTALL_SCRIPT = @INSTALL_SCRIPT@
- INSTALL_DATA = @INSTALL_DATA@
- 
- AR = ar
- ARFLAGS = cr
- 
--LOCAL_EXPECT=LD_LIBRARY_PATH=.:@TCL_EXEC_PREFIX@/lib:$(tcl_libdir):$$LD_LIBRARY_PATH ./expect
-+LOCAL_EXPECT=LD_LIBRARY_PATH=.:@TCL_EXEC_PREFIX@/lib:$(tcl_libdir):$$LD_LIBRARY_PATH ./expectjp
- 
- # These definitions are used by the "subdirs_do" target to pass
- # the compile flags down recursively.
-@@ -207,6 +208,7 @@
- 	"HDEFS=$(HDEFS)" \
- 	"INSTALL=$(INSTALL)" \
- 	"INSTALL_DATA=$(INSTALL_DATA)" \
-+	"INSTALL_SCRIPT=$(INSTALL_SCRIPT)" \
- 	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
- 	"LDFLAGS=$(LDFLAGS)" \
- 	"RUNTEST=$(RUNTEST)" \
-@@ -222,9 +224,9 @@
- # These let the DejaGnu test suite run when DejaGnu isn't 
- # installed yet, so run it from the srcdir and objdir.
- EXPECT = ` \
--  if [ -f $${rootme}/expect ] ; then \
--    echo $${rootme}/expect ; \
--  else echo expect ; fi`
-+  if [ -f $${rootme}/expectjp ] ; then \
-+    echo $${rootme}/expectjp ; \
-+  else echo expectjp ; fi`
- 
- RUNTESTFLAGS =
- RUNTEST = ` \
-@@ -324,7 +326,7 @@
- 	   $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \
- 	fi
- 
--all: expect $(EXP_LIB_FILES) ${X11_PROGS}
-+all: expectjp $(EXP_LIB_FILES) ${X11_PROGS}
- 	@$(MAKE) subdir_do DO=$@  $(FLAGS_TO_PASS)
- 
- info:
-@@ -332,9 +334,9 @@
- 
- # 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)
--	$(SETUID) expect
-+expectjp:	exp_main_exp.o $(EXP_UNSHARED_LIB_FILE)
-+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectjp exp_main_exp.o $(EXP_UNSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
-+	$(SETUID) expectjp
- 
- # install Expect library
- # This is done before the install target because the libraries have to be
-@@ -347,21 +349,23 @@
- #   Local copy is pkgIndex rather than pkgIndex.tcl because pkgIndex.tcl.in
- #   is too long for some filesystems, sigh.
- install_shared_lib: $(EXP_LIB_FILES)
-+	${srcdir}/mkinstalldirs $(tcl_libdir)
- 	${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) ; \
-+	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(UNSHARED_RANLIB) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(INSTALL_DATA) $(EXP_UNSHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_UNSHARED_LIB_FILE) ; \
-+	  $(UNSHARED_RANLIB) $(LIB_INSTALL_DIR)/$(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 ; \
-+	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(LIB_INSTALL_DIR)/$(EXP_SHARED_LIB_FILE) ; \
-+	  (cd $(LIB_INSTALL_DIR) ; ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`) ; \
-+	  $(INSTALL_SCRIPT) pkgIndex $(libdir)/pkgIndex.tcl ; \
- 	else true; fi
- 
--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)
--	$(SETUID) expect_installed
-+expectjp_installed:	exp_main_exp.o $(EXP_LIB_FILE) install_shared_lib
-+	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectjp_installed exp_main_exp.o @EXP_LIB_SPEC@ $(TCLLIB_INSTALLED) $(EXP_AND_TCL_LIBS)
-+	$(SETUID) expectjp_installed
- 
- # Build Expect with TestCenter
- expect.tc: exp_main_exp.o $(OFILES) 
-@@ -375,13 +379,13 @@
- # together.  I could fix it by testing all the libraries (again, in Expect's
- # 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) 
--	$(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) 
--	$(SETUID) expectk_installed
-+expectkjp: exp_main_tk.o $(EXP_UNSHARED_LIB_FILE)
-+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectkjp exp_main_tk.o $(EXP_UNSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	$(SETUID) expectkjp
-+
-+expectkjp_installed: exp_main_tk.o $(EXP_LIB_FILE)
-+	$(CC) $(XCFLAGS) @EXP_SHLIB_CFLAGS@ @TCL_LD_FLAGS@ -o expectkjp_installed exp_main_tk.o @EXP_LIB_SPEC@ $(TKLIB_INSTALLED) $(TCLLIB_INSTALLED) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
-+	$(SETUID) expectkjp_installed
- 
- # Build Expectk with TestCenter
- expectk.tc: exp_main_tk.o $(OFILES) 
-@@ -401,24 +405,24 @@
- 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@
-+	@TCL_SHLIB_LD@ -o $(EXP_SHARED_LIB_FILE) -Wl,-soname,$(EXP_SHARED_LIB_FILE) $(SHARED_OFILES) @EXP_LD_SEARCH_FLAGS@ @EXP_SHLIB_LD_LIBS@
-+	ln -sf $(EXP_SHARED_LIB_FILE) `echo $(EXP_SHARED_LIB_FILE) | sed 's/\.so.*$$/.so/'`
- 
- .PHONY: install-info install info
- install-info:
- 
--install:	expect expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS)
--	${srcdir}/mkinstalldirs $(man1dir) $(man3dir) $(bindir) $(tcl_libdir) $(includedir)
-+install:	expectjp expectjp_installed ${X11_PROGS_INSTALLED} $(SCRIPTS)
-+	${srcdir}/mkinstalldirs $(bindir) $(tcl_libdir) $(includedir)
- # install Expect
--	$(INSTALL_PROGRAM) expect_installed $(bindir)/expect
-+	$(INSTALL_PROGRAM) expectjp_installed $(bindir)/expectjp
- # install Expectk (and man page) if present
--	-if [ -s expectk_installed ] ; then \
--	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectk ; \
--	  $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
-+	-if [ -s expectkjp_installed ] ; then \
-+	  $(INSTALL_PROGRAM) expectkjp_installed $(bindir)/expectkjp ; \
- 	else true; fi
- # install Expect man page
--	$(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1
-+#	$(INSTALL_DATA) $(srcdir)/expect.man $(man1dir)/expect.1
- # install man page for Expect and Expectk libraries
--	$(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3
-+#	$(INSTALL_DATA) $(srcdir)/libexpect.man $(man3dir)/libexpect.3
- # install Expect's public include files
- #	$(INSTALL_DATA) expect_cf.h $(includedir)
- 	$(INSTALL_DATA) $(srcdir)/expect.h $(includedir)
-@@ -433,21 +437,16 @@
- 	TCL_LIBRARY=$(TCL_LIBRARY) ; \
- 	export TCL_LIBRARY ; \
- 	   if $(LOCAL_EXPECT) $(srcdir)/fixcat ; then \
--	      $(INSTALL_DATA) $(srcdir)/fixcat $(EXECSCRIPTDIR)/cat-buffers ; \
-+	      $(INSTALL_DATA) $(srcdir)/fixcat $(EXECSCRIPTDIR)/cat-buffers-jp ; \
- 	   else true; fi
- # install standalone scripts and their man pages, if requested
- 	${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-jp ; \
- 	    rm -f $$i ; \
- 	  else true; fi ; \
- 	done
--	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
--	  if [ -f $(srcdir)/example/$$i.man ] ; then \
--	    $(INSTALL_DATA) $(srcdir)/example/$$i.man $(man1dir)/$$i.1 ; \
--	  else true; fi ; \
--	done
- 
- $(SCRIPT_LIST):
- 	TCL_LIBRARY=$(TCL_LIBRARY) ; \
-@@ -457,27 +456,21 @@
- # Delete all the installed files that the `install' target creates
- # (but not the noninstalled files such as `make all' creates)
- uninstall:
--	-rm -f  $(bindir)/expectk \
--		$(man1dir)/expect.1 \
--		$(man1dir)/expectk.1 \
-+	-rm -f  $(bindir)/expectkjp \
- 		$(libdir)/$(EXP_SHARED_LIB_FILE) \
- 		$(tcl_libdir)/$(EXP_SHARED_LIB_FILE) \
- 		$(libdir)/$(EXP_UNSHARED_LIB_FILE) \
- 		$(tcl_libdir)/$(EXP_UNSHARED_LIB_FILE) \
- 		$(libdir)/pkgIndex.tcl \
--		$(man3dir)/libexpect.3 \
- 		$(includedir)/expect_cf.h \
- 		$(includedir)/expect.h \
- 		$(includedir)/expect_tcl.h \
- 		$(includedir)/expect_comm.h \
--		$(EXECSCRIPTDIR)/cat-buffers
-+		$(EXECSCRIPTDIR)/cat-buffers-jp
- # debugger is not removed, since other things could depend on it
- # remove standalone scripts and man pages
- 	-for i in $(SCRIPT_LIST) ; do \
--	  rm -f $(bindir_arch_indep)/$$i ; \
--	done
--	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
--	  rm -f $(man1dir)/$$i.1 ; \
-+	  rm -f $(bindir_arch_indep)/$$i-jp ; \
- 	done
- 
- ###################################
-@@ -528,7 +521,7 @@
- # delete all files from current directory that are created by "make"
- clean:
- 	-rm -rf *~ *.o shared core \
--		expect expect_installed expectk expectk_installed \
-+		expectjp expectjp_installed expectkjp expectkjp_installed \
- 		dumb exho devtty \
- 		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
- 		$(SCRIPT_LIST)
-@@ -544,7 +537,7 @@
- # because most people don't have to worry about them
- mostlyclean:
- 	-rm -rf *~ *.o shared core \
--		expect expect_installed expectk expectk_installed \
-+		expectjp expectjp_installed expectkjp expectkjp_installed \
- 		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
- 	@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)
- 
-@@ -685,7 +678,7 @@
- expect-$(VERSION).tar.gz:	expect-$(VERSION).tar
- 	gzip -fc expect-$(VERSION).tar > $@
- 
--test:   expect
-+test:   expectjp
- 	rm -f .tmp
- 	echo "set objdir" `pwd` > .tmp
- 	if [ "$(srcdir)" = "." ] ; then \
-@@ -695,7 +688,7 @@
- 	echo "source all" >> .tmp
- 	rootme=`pwd`; export rootme; \
- 	srcdir=${srcdir} ; export srcdir ; \
--	if [ -f ./expect ] ; then  \
-+	if [ -f ./expectjp ] ; then  \
- 	   TCL_LIBRARY=$(TCL_LIBRARY) ; \
- 	   export TCL_LIBRARY ; fi ; \
- 	$(LOCAL_EXPECT) -f .tmp
diff --git a/japanese/expect/files/patch-ab b/japanese/expect/files/patch-ab
deleted file mode 100644
index 0e057891689d..000000000000
--- a/japanese/expect/files/patch-ab
+++ /dev/null
@@ -1,52 +0,0 @@
---- configure.in.orig	Fri Oct  8 06:49:57 1999
-+++ configure.in	Fri Dec 10 16:25:19 1999
-@@ -10,11 +10,14 @@
- # note when updating version numbers here, also update pkgIndex.in (see
- # comments in Makefile)
- EXP_MAJOR_VERSION=5
--EXP_MINOR_VERSION=30
-+EXP_MINOR_VERSION_PREFIX=30
-+EXP_MINOR_VERSION_L10N=jp
-+EXP_MINOR_VERSION=$EXP_MINOR_VERSION_PREFIX$EXP_MINOR_VERSION_L10N
- EXP_MICRO_VERSION=1
- EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
- EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION
- EXP_VERSION_FULL=$EXP_VERSION.$EXP_MICRO_VERSION
-+EXP_VERSION_PKG=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION_PREFIX.$EXP_MICRO_VERSION
- # Tcl's handling of shared_lib_suffix requires this symbol exist
- VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
- 
-@@ -24,7 +27,6 @@
- 
- dnl AC_CONFIG_AUX_DIR(`cd $srcdir;pwd`/..)
- AC_CANONICAL_SYSTEM
--
- AC_CONFIG_HEADER(expect_cf.h)
- 
- # /bin/sh on some systems is too deficient (in particular, Ultrix 4.3
-@@ -1042,9 +1044,9 @@
- if test x"$no_tk" != x"true" ; then
- # libexpectk no longer exists
- #  X_PROGS="expectk \$(LIBEXPECTK)"
--  X_PROGS=expectk
-+  X_PROGS=expectkjp
- # should really generate following symbol, but I'm hitting configure's limit on substs.
--  X_PROGS_INSTALLED=expectk_installed
-+  X_PROGS_INSTALLED=expectkjp_installed
- else
-   X_PROGS="# no X support on this system"
-   AC_MSG_WARN([No X based programs will be built])
-@@ -1183,6 +1185,7 @@
- AC_SUBST(EXP_MINOR_VERSION)
- AC_SUBST(EXP_MICRO_VERSION)
- AC_SUBST(EXP_VERSION_FULL)
-+AC_SUBST(EXP_VERSION_PKG)
- AC_SUBST(EXP_VERSION)
- AC_SUBST(CC)
- AC_SUBST(EXP_CONFIG_SHELL)
-@@ -1206,4 +1209,5 @@
- AC_SUBST(SETUID)
- AC_SUBST(UNSHARED_RANLIB)
- AC_SUBST(DEFAULT_STTY_ARGS)
-+AC_SUBST(INSTALL_SCRIPT)
- AC_OUTPUT(Makefile pkgIndex)
diff --git a/japanese/expect/files/patch-ac b/japanese/expect/files/patch-ac
deleted file mode 100644
index 3c336da4b9ac..000000000000
--- a/japanese/expect/files/patch-ac
+++ /dev/null
@@ -1,8 +0,0 @@
---- fixcat.ORIG	Fri Oct 17 10:08:26 1997
-+++ fixcat	Fri Oct 17 10:08:38 1997
-@@ -1,4 +1,4 @@
--#!expect --
-+#!expectjp --
- # Synopsis: fixcat
- # Author: Don Libes
- 
diff --git a/japanese/expect/files/patch-ad b/japanese/expect/files/patch-ad
deleted file mode 100644
index 06aa1f4407c6..000000000000
--- a/japanese/expect/files/patch-ad
+++ /dev/null
@@ -1,8 +0,0 @@
---- fixline1.ORIG	Fri Oct 17 10:10:12 1997
-+++ fixline1	Fri Oct 17 10:10:41 1997
-@@ -1,4 +1,4 @@
--#!expect --
-+#!expectjp --
- # Synopsis: fixline1 newpath < input > output
- # Author: Don Libes
- 
diff --git a/japanese/expect/files/patch-ae b/japanese/expect/files/patch-ae
deleted file mode 100644
index e2803e353029..000000000000
--- a/japanese/expect/files/patch-ae
+++ /dev/null
@@ -1,8 +0,0 @@
---- pkgIndex.in.ORIG	Wed Jul  8 09:44:14 1998
-+++ pkgIndex.in	Wed Jul  8 09:49:02 1998
-@@ -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_PKG@ [list load [file join $dir .. @EXP_SHARED_LIB_FILE@]]
diff --git a/japanese/expect/files/patch-af b/japanese/expect/files/patch-af
deleted file mode 100644
index 9e228b4ef354..000000000000
--- a/japanese/expect/files/patch-af
+++ /dev/null
@@ -1,11 +0,0 @@
---- aclocal.m4.ORIG	Tue Jul 21 09:53:21 1998
-+++ aclocal.m4	Tue Jul 21 09:55:25 1998
-@@ -149,7 +149,7 @@
-     # this hack is cause the TCLHDIR won't print if there is a "-I" in it.
-     TCLHDIR="${ac_cv_c_tclh}"
-     TCLHDIRDASHI="-I${ac_cv_c_tclh}"
--    TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`library
-+    TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/include/lib/' | sed -e s/generic//'`
-   fi
- fi
- 
diff --git a/japanese/expect/pkg-descr b/japanese/expect/pkg-descr
deleted file mode 100644
index 751627f26edc..000000000000
--- a/japanese/expect/pkg-descr
+++ /dev/null
@@ -1,10 +0,0 @@
-Expect is a program that performs programmed dialogue with other
-interactive programs.  It is briefly described by its man page, expect(1).
-
-This version is based on Japanized Tcl/Tk, so it has 'kanji' command.
-
-It uses pseudo-tty's to control the child processes, so it is not affected
-by programs that refuse to read from stdin or pipes. (eg: passwd(1) etc).
-
-WWW: http://expect.nist.gov/
-FAQ: http://expect.nist.gov/FAQ.html
diff --git a/japanese/expect/pkg-plist b/japanese/expect/pkg-plist
deleted file mode 100644
index ce3751914cf1..000000000000
--- a/japanese/expect/pkg-plist
+++ /dev/null
@@ -1,33 +0,0 @@
-bin/expectjp
-bin/expectkjp
-bin/autoexpect-jp
-bin/autopasswd-jp
-bin/cryptdir-jp
-bin/decryptdir-jp
-bin/dislocate-jp
-bin/ftp-rfc-jp
-bin/kibitz-jp
-bin/lpunlock-jp
-bin/mkpasswd-jp
-bin/passmass-jp
-bin/rftp-jp
-bin/rlogin-cwd-jp
-bin/timed-read-jp
-bin/timed-run-jp
-bin/tknewsbiff-jp
-bin/tkpasswd-jp
-bin/unbuffer-jp
-bin/weather-jp
-bin/xkibitz-jp
-bin/xpstat-jp
-include/expect5.30jp/tclRegexp.h
-include/expect5.30jp/expect.h
-include/expect5.30jp/expect_comm.h
-include/expect5.30jp/expect_tcl.h
-include/expect5.30jp/tcldbg.h
-@dirrm include/expect5.30jp
-lib/expect5.30jp/pkgIndex.tcl
-@dirrm lib/expect5.30jp
-lib/libexpect530jp.a
-lib/libexpect530jp.so.1
-lib/libexpect530jp.so