Make this work again after lang/expect upgrade.

PR:		4786 (first patch)
Submitted by:	taguchi@tohoku.iij.ad.jp

8 files changed, 169 insertions, 187 deletions

diff --git a/japanese/expect/Makefile b/japanese/expect/Makefile
index 0099eaa5f9dc..6a37d1a60a40 100644
--- a/japanese/expect/Makefile
+++ b/japanese/expect/Makefile
@@ -1,17 +1,18 @@
 # New ports collection makefile for:	expect
-# Version required:	5.22.0
-# Date created:		10 March 1997
+# Version required:	5.25
+# Date created:		17 Oct 1997
 # Whom:			taguchi
 #
-# $Id: Makefile,v 1.2 1997/03/25 08:01:45 obrien Exp $
+# $Id: Makefile,v 1.3 1997/09/14 21:34:35 max Exp $
 #
 
 FILESDIR=	${.CURDIR}/../../lang/expect/files
 
+NO_MAN_INSTALL=	yes
 .include "${.CURDIR}/../../lang/expect/Makefile"
 
-PKGNAME=	ja-expect-5.22.0
-CATEGORIES=	japanese
+PKGNAME=	ja-expect-5.25
+CATEGORIES=	japanese lang
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -22,3 +23,6 @@ CONFIGURE_ARGS=	--enable-shared --with-tclconfig=${PREFIX}/lib/tcl7.6jp \
 		--with-tkconfig=${PREFIX}/lib/tk4.2jp \
 		--with-tclinclude=${PREFIX}/include/tcl7.6jp \
 		--with-tkinclude=${PREFIX}/include/tk4.2jp
+
+test:
+	@(cd ${WRKSRC}; make test)
diff --git a/japanese/expect/files/patch-aa b/japanese/expect/files/patch-aa
index 459a2bb7bd52..47b884b5a8d4 100644
--- a/japanese/expect/files/patch-aa
+++ b/japanese/expect/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.ORIG	Mon Mar 10 18:12:08 1997
-+++ Makefile.in	Mon Mar 10 18:15:58 1997
-@@ -29,7 +29,7 @@
+--- Makefile.in.ORIG	Fri Oct 17 10:44:20 1997
++++ Makefile.in	Fri Oct 17 10:45:10 1997
+@@ -30,7 +30,7 @@
  TCL_LIBRARY = @TCL_LIBRARY@
  
  # Tcl library uninstalled.  Should be something like -ltcl or ../tcl/libtcl.a
@@ -9,7 +9,7 @@
  # Tcl library installed.  Should be something like -ltcl or ../tcl/libtcl.a
  TCLLIB_INSTALLED = @TCL_LIB_SPEC@
  
-@@ -37,7 +37,7 @@
+@@ -38,7 +38,7 @@
  # Tk include files
  TKHDIRDASHI = @TKHDIRDASHI@
  # Tk library
@@ -18,16 +18,16 @@
  TKLIB_INSTALLED = @TK_LIB_SPEC@
  # X11 include files and other flags to compiler
  X11_CFLAGS = @TK_XINCLUDES@
-@@ -172,7 +172,7 @@
+@@ -174,7 +174,7 @@
  man1dir = $(mandir)/man1
  man3dir = $(mandir)/man3
  infodir = @infodir@
 -includedir = @includedir@
-+includedir = @includedir@/expect$(SHORT_VERSION)
++includedir = @includedir@/expect5.25jp
  
  # Expect's utility script directories - arch-independent and arch-non-
  # independent.  These correspond to the variables "exp_library" and
-@@ -184,12 +184,13 @@
+@@ -186,12 +186,13 @@
  
  INSTALL = @INSTALL@
  INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -42,7 +42,7 @@
  
  # These definitions are used by the "subdirs_do" target to pass
  # the compile flags down recursively.
-@@ -200,6 +201,7 @@
+@@ -202,6 +203,7 @@
  	"HDEFS=$(HDEFS)" \
  	"INSTALL=$(INSTALL)" \
  	"INSTALL_DATA=$(INSTALL_DATA)" \
@@ -50,7 +50,7 @@
  	"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
  	"LDFLAGS=$(LDFLAGS)" \
  	"RUNTEST=$(RUNTEST)" \
-@@ -215,9 +217,9 @@
+@@ -217,9 +219,9 @@
  # These let the DejaGnu test suite run when DejaGnu isn't 
  # installed yet, so run it from the srcdir and objdir.
  EXPECT = ` \
@@ -63,76 +63,91 @@
  
  RUNTESTFLAGS =
  RUNTEST = ` \
-@@ -317,16 +319,16 @@
+@@ -319,16 +321,16 @@
  	   $(CC) -c $(CFLAGS_INT) @EXP_SHLIB_CFLAGS@ $(STTY) $(HDEFS) $< -o shared/$@ ; \
  	fi
  
--all: expect $(EXP_LIB_FILES) ${X11_PROGS} pkgIndex.tcl
-+all: expectjp $(EXP_LIB_FILES) ${X11_PROGS} pkgIndex.tcl
+-all: expect $(EXP_LIB_FILES) ${X11_PROGS}
++all: expectjp $(EXP_LIB_FILES) ${X11_PROGS}
  	@$(MAKE) subdir_do DO=$@  $(FLAGS_TO_PASS)
  
  info:
  dvi:
  
  # build expect binary that does not depend on Expect's shared libs
--expect:	exp_main_exp.o $(EXP_NONSHARED_LIB_FILE)
--	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expect exp_main_exp.o $(EXP_NONSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
+-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_NONSHARED_LIB_FILE)
-+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectjp exp_main_exp.o $(EXP_NONSHARED_LIB_FILE) $(TCLLIB) $(EXP_AND_TCL_LIBS)
++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
-@@ -356,9 +358,9 @@
+@@ -350,12 +352,12 @@
+ 	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
+-	$(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) 
+@@ -368,13 +370,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_NONSHARED_LIB_FILE)
--	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectk exp_main_tk.o $(EXP_NONSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
+-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
-+expectkjp: exp_main_tk.o $(EXP_NONSHARED_LIB_FILE)
-+	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectkjp exp_main_tk.o $(EXP_NONSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
+-
+-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
  
- 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) 
-@@ -385,7 +387,7 @@
- # 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 \
-+	-rm -f  $(bindir)/expectkjp \
- 		$(man1dir)/expect.1 \
- 		$(man1dir)/expectk.1 \
- 		$(libdir)/$(EXP_SHARED_LIB_FILE) \
-@@ -400,7 +402,7 @@
- # 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 ; \
-+	  rm -f $(bindir_arch_indep)/$$i-jp ; \
- 	done
- 	-for i in $(SCRIPT_MANPAGE_LIST) ; do \
- 	  rm -f $(man1dir)/$$i.1 ; \
-@@ -409,13 +411,13 @@
+ # Build Expectk with TestCenter
+ expectk.tc: exp_main_tk.o $(OFILES) 
+@@ -397,19 +399,14 @@
  .PHONY: install-info install info
  install-info:
  
--install:	expect expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) pkgIndex.tcl
-+install:	expectjp expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) pkgIndex.tcl
- 	${srcdir}/mkinstalldirs $(man1dir) $(man3dir) $(bindir) $(libdir) $(includedir)
+-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) expect_installed $(bindir)/expectjp
++	$(INSTALL_PROGRAM) expectjp_installed $(bindir)/expectjp
  # install Expectk (and man page) if present
- 	-if [ -s expectk_installed ] ; then \
+-	-if [ -s expectk_installed ] ; then \
 -	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectk ; \
-+	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectkjp ; \
- 	  $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
+-	  $(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
-@@ -442,7 +444,7 @@
+-# install Expect man page
+-	$(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 Expect's public include files
+ #	$(INSTALL_DATA) expect_cf.h $(includedir)
+ 	$(INSTALL_DATA) $(srcdir)/expect.h $(includedir)
+@@ -430,15 +427,10 @@
  	${srcdir}/mkinstalldirs $(bindir_arch_indep) $(man1dir) $(SCRIPTDIR) $(EXECSCRIPTDIR)
  	-for i in $(SCRIPT_LIST) ; do \
  	  if [ -f $$i ] ; then \
@@ -141,21 +156,75 @@
  	    rm -f $$i ; \
  	  else true; fi ; \
  	done
-@@ -539,7 +541,7 @@
+-	-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) ; \
+@@ -448,14 +440,11 @@
+ # 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) \
+-		$(man3dir)/libexpect.3 \
+ 		$(includedir)/expect_cf.h \
+ 		$(includedir)/expect.h \
+ 		$(includedir)/expect_tcl.h \
+@@ -464,10 +453,7 @@
+ # 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
+ 
+ ###################################
+@@ -514,7 +500,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 expect_installed expectkjp expectk_installed \
++		expectjp expectjp_installed expectkjp expectkjp_installed \
  		dumb exho devtty \
- 		$(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
+ 		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
  		$(SCRIPT_LIST)
-@@ -555,7 +557,7 @@
+@@ -530,7 +516,7 @@
  # because most people don't have to worry about them
  mostlyclean:
  	-rm -rf *~ *.o shared core \
 -		expect expect_installed expectk expectk_installed \
-+		expectjp expect_installed expectkjp expectk_installed \
- 		$(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
++		expectjp expectjp_installed expectkjp expectkjp_installed \
+ 		$(EXP_UNSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
  	@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)
  
+@@ -682,7 +668,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 \
+@@ -692,7 +678,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
index 1cc741cff2b4..005ebf3c3b7d 100644
--- a/japanese/expect/files/patch-ab
+++ b/japanese/expect/files/patch-ab
@@ -1,15 +1,15 @@
---- configure.ORIG	Mon Mar 10 18:11:52 1997
-+++ configure	Mon Mar 10 18:15:02 1997
+--- configure.ORIG	Fri Oct 17 10:31:25 1997
++++ configure	Fri Oct 17 10:34:10 1997
 @@ -527,7 +527,7 @@
  # note when updating version numbers here, also update pkgIndex.in (see
  # comments in Makefile)
  EXP_MAJOR_VERSION=5
--EXP_MINOR_VERSION=22
-+EXP_MINOR_VERSION=22jp
+-EXP_MINOR_VERSION=25
++EXP_MINOR_VERSION=25jp
  EXP_MICRO_VERSION=0
  EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
  EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION
-@@ -1161,6 +1161,8 @@
+@@ -1236,6 +1236,8 @@
  # It thinks the first close brace ends the variable substitution.
  test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
  
@@ -18,60 +18,55 @@
  test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
  
  
-@@ -1986,7 +1988,7 @@
+@@ -2094,7 +2096,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/generic//'`library
 +    TCL_LIBRARY=`echo $TCLHDIR | sed -e 's/generic//'`
    fi
  fi
  
-@@ -5630,14 +5632,14 @@
+@@ -5738,14 +5740,14 @@
  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=expectk_installed
++  X_PROGS_INSTALLED=expectkjp_installed
  else
    X_PROGS="# no X support on this system"
    echo "configure: warning: No X based programs will be built" 1>&2
    echo "	WARNING: Can't find Tk headers or library.  You can still"
 -  echo "	build expect, but not expectk.  See Expect's README for"
-+  echo "	build expect, but not expectkjp.  See Expect's README for"
++  echo "	build expectjp, but not expectkjp.  See Expect's README for"
    echo "	information on how to obtain Tk.  If Tk is installed, see"
    echo "	Expect's INSTALL on how to tell configure where Tk is"
    echo "	installed."
-@@ -5728,15 +5730,17 @@
+@@ -5836,13 +5838,15 @@
      EXP_LIB_VERSION=$EXP_VERSION_NODOTS
  fi
  
--EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}"
--EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}"
--EXP_NONSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a
 +VERSION=${EXP_LIB_VERSION}
 +
-+EXP_BUILD_LIB_SPEC="-L`pwd` -lexpectjp${EXP_LIB_VERSION}"
-+EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpectjp${EXP_LIB_VERSION}"
-+eval EXP_NONSHARED_LIB_FILE=libexpectjp${TCL_UNSHARED_LIB_SUFFIX}
+ EXP_BUILD_LIB_SPEC="-L`pwd` -lexpect${EXP_LIB_VERSION}"
+ EXP_LIB_SPEC="-L\${exec_prefix}/lib -lexpect${EXP_LIB_VERSION}"
+ EXP_UNSHARED_LIB_FILE=libexpect${EXP_LIB_VERSION}.a
  
  echo $ac_n "checking for type of library to build""... $ac_c" 1>&6
- echo "configure:5737: checking for type of library to build" >&5
+ echo "configure:5845: checking for type of library to build" >&5
 -if test "$enable_shared" = "yes" && test "x${TCL_SHLIB_SUFFIX}" != "x" ; then
-+if test "$enable_shared" = "yes" -a "x${TCL_SHARED_LIB_SUFFIX}" != "x" ; then
++if test "$enable_shared" = "yes" -a "x${TCL_SHLIB_SUFFIX}" != "x" ; then
    EXP_SHLIB_CFLAGS=$TCL_SHLIB_CFLAGS
--  EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
-+  eval EXP_SHARED_LIB_FILE=libexpectjp${TCL_SHARED_LIB_SUFFIX}
-   EXP_LIB_FILE=$EXP_SHARED_LIB_FILE
-   EXP_LIB_FILES="$EXP_SHARED_LIB_FILE $EXP_NONSHARED_LIB_FILE"
-   echo "$ac_t""both shared and nonshared" 1>&6
-@@ -5908,6 +5912,7 @@
+ #  EXP_SHARED_LIB_FILE=libexpect$EXP_LIB_VERSION$TCL_SHLIB_SUFFIX
+   eval "EXP_SHARED_LIB_FILE=libexpect${TCL_SHARED_LIB_SUFFIX}"
+@@ -6019,6 +6023,7 @@
  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
- s%@CPP@%$CPP%g
diff --git a/japanese/expect/files/patch-ac b/japanese/expect/files/patch-ac
index 89e85a913f45..3c336da4b9ac 100644
--- a/japanese/expect/files/patch-ac
+++ b/japanese/expect/files/patch-ac
@@ -1,5 +1,5 @@
---- fixcat.ORIG	Mon Mar 10 18:13:20 1997
-+++ fixcat	Mon Mar 10 18:15:06 1997
+--- fixcat.ORIG	Fri Oct 17 10:08:26 1997
++++ fixcat	Fri Oct 17 10:08:38 1997
 @@ -1,4 +1,4 @@
 -#!expect --
 +#!expectjp --
diff --git a/japanese/expect/files/patch-ad b/japanese/expect/files/patch-ad
index fcf69131e084..06aa1f4407c6 100644
--- a/japanese/expect/files/patch-ad
+++ b/japanese/expect/files/patch-ad
@@ -1,5 +1,5 @@
---- fixline1.ORIG	Mon Mar 10 18:13:33 1997
-+++ fixline1	Mon Mar 10 18:15:06 1997
+--- fixline1.ORIG	Fri Oct 17 10:10:12 1997
++++ fixline1	Fri Oct 17 10:10:41 1997
 @@ -1,4 +1,4 @@
 -#!expect --
 +#!expectjp --
diff --git a/japanese/expect/files/patch-ae b/japanese/expect/files/patch-ae
deleted file mode 100644
index e19d36a23e1d..000000000000
--- a/japanese/expect/files/patch-ae
+++ /dev/null
@@ -1,11 +0,0 @@
---- pkgIndex.in.ORIG	Mon Mar 10 18:13:53 1997
-+++ pkgIndex.in	Mon Mar 10 18:15:17 1997
-@@ -17,7 +17,7 @@
- }
- 
- package ifneeded Expect @EXP_VERSION_FULL@ [list tclPkgSetup $prefix/lib Expect @EXP_VERSION_FULL@ \
--{{libexpect5.22.so load {debug disconnect exp_close exp_continue exp_debug \
-+{{libexpectjp5.22.so load {debug disconnect exp_close exp_continue exp_debug \
- exp_disconnect exp_exit exp_fork exp_getpid exp_inter_return exp_interact \
- exp_internal exp_interpreter exp_log_file exp_log_user exp_match_max \
- exp_open exp_overlay exp_parity exp_pid exp_remove_nulls exp_send \
diff --git a/japanese/expect/files/patch-af b/japanese/expect/files/patch-af
deleted file mode 100644
index 83d60473814a..000000000000
--- a/japanese/expect/files/patch-af
+++ /dev/null
@@ -1,64 +0,0 @@
---- Makefile.in.ORIG	Mon Mar 10 18:23:39 1997
-+++ Makefile.in	Mon Mar 10 18:26:05 1997
-@@ -343,9 +343,9 @@
- 	  $(INSTALL_PROGRAM) $(EXP_SHARED_LIB_FILE) $(libdir)/$(EXP_SHARED_LIB_FILE) ; \
- 	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) 
-@@ -362,9 +362,9 @@
- 	$(CC) $(XCFLAGS) @TCL_LD_FLAGS@ -o expectkjp exp_main_tk.o $(EXP_NONSHARED_LIB_FILE) $(TKLIB) $(TCLLIB) $(X11_LD_FLAGS) $(EXP_AND_TK_LIBS) 
- 	$(SETUID) expectkjp
- 
--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_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) 
-@@ -411,13 +411,13 @@
- .PHONY: install-info install info
- install-info:
- 
--install:	expectjp expect_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) pkgIndex.tcl
-+install:	expectjp expectjp_installed ${X11_PROGS_INSTALLED} $(SCRIPTS) pkgIndex.tcl
- 	${srcdir}/mkinstalldirs $(man1dir) $(man3dir) $(bindir) $(libdir) $(includedir)
- # install Expect
--	$(INSTALL_PROGRAM) expect_installed $(bindir)/expectjp
-+	$(INSTALL_PROGRAM) expectjp_installed $(bindir)/expectjp
- # install Expectk (and man page) if present
--	-if [ -s expectk_installed ] ; then \
--	  $(INSTALL_PROGRAM) expectk_installed $(bindir)/expectkjp ; \
-+	-if [ -s expectkjp_installed ] ; then \
-+	  $(INSTALL_PROGRAM) expectkjp_installed $(bindir)/expectkjp ; \
- 	  $(INSTALL_DATA) $(srcdir)/expectk.man $(man1dir)/expectk.1 ; \
- 	else true; fi
- # install Expect man page
-@@ -541,7 +541,7 @@
- # delete all files from current directory that are created by "make"
- clean:
- 	-rm -rf *~ *.o shared core \
--		expectjp expect_installed expectkjp expectk_installed \
-+		expectjp expectjp_installed expectkjp expectkjp_installed \
- 		dumb exho devtty \
- 		$(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE) \
- 		$(SCRIPT_LIST)
-@@ -557,7 +557,7 @@
- # because most people don't have to worry about them
- mostlyclean:
- 	-rm -rf *~ *.o shared core \
--		expectjp expect_installed expectkjp expectk_installed \
-+		expectjp expectjp_installed expectkjp expectkjp_installed \
- 		$(EXP_NONSHARED_LIB_FILE) $(EXP_SHARED_LIB_FILE)
- 	@$(MAKE) subdir_do DO=$@ $(FLAGS_TO_PASS)
- 
diff --git a/japanese/expect/pkg-plist b/japanese/expect/pkg-plist
index a0d3d2fc2dea..a1e0b6e1710f 100644
--- a/japanese/expect/pkg-plist
+++ b/japanese/expect/pkg-plist
@@ -20,23 +20,12 @@ bin/unbuffer-jp
 bin/weather-jp
 bin/xkibitz-jp
 bin/xpstat-jp
-include/expect5.22jp/Dbg.h
-include/expect5.22jp/expect.h
-include/expect5.22jp/expect_comm.h
-include/expect5.22jp/expect_tcl.h
-lib/expect5.22jp/pkgIndex.tcl
-lib/libexpect522jp.a
-lib/libexpect522jp.so.1.0
-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/expectk.1.gz
-man/man1/kibitz.1.gz
-man/man1/mkpasswd.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
+include/expect5.25jp/Dbg.h
+include/expect5.25jp/expect.h
+include/expect5.25jp/expect_comm.h
+include/expect5.25jp/expect_tcl.h
+@dirrm include/expect5.25jp
+lib/expect5.25jp/pkgIndex.tcl
+lib/libexpect525jp.a
+lib/libexpect525jp.so.1.0
+@dirrm lib/expect5.25jp