From 4e39d7ed548a6d1752bd361ea512b05e0e960ece Mon Sep 17 00:00:00 2001
From: Steve Price <steve@FreeBSD.org>
Date: Sat, 11 Jul 1998 17:48:17 +0000
Subject: Fix a pkgIndex-related bug.

PR:		7204
Submitted by:	maintainer
---
 japanese/expect/files/patch-ab | 27 +++++++++++++++++++++------
 japanese/expect/files/patch-ae |  8 ++++++++
 2 files changed, 29 insertions(+), 6 deletions(-)
 create mode 100644 japanese/expect/files/patch-ae

(limited to 'japanese/expect')

diff --git a/japanese/expect/files/patch-ab b/japanese/expect/files/patch-ab
index 5f6c66c3b314..d6071219d6cd 100644
--- a/japanese/expect/files/patch-ab
+++ b/japanese/expect/files/patch-ab
@@ -1,15 +1,22 @@
---- configure.in.orig	Tue May 19 07:21:57 1998
-+++ configure.in	Mon Jun 29 10:38:49 1998
-@@ -10,7 +10,7 @@
+--- configure.in.ORIG	Wed Jul  8 09:44:06 1998
++++ configure.in	Wed Jul  8 09:49:30 1998
+@@ -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=26
-+EXP_MINOR_VERSION=26jp
++EXP_MINOR_VERSION_PREFIX=26
++EXP_MINOR_VERSION_L10N=jp
++EXP_MINOR_VERSION=$EXP_MINOR_VERSION_PREFIX$EXP_MINOR_VERSION_L10N
  EXP_MICRO_VERSION=0
  EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION
  EXP_VERSION_NODOTS=$EXP_MAJOR_VERSION$EXP_MINOR_VERSION
-@@ -1002,9 +1002,9 @@
+ 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
+ 
+@@ -1002,9 +1005,9 @@
  if test x"$no_tk" != x"true" ; then
  # libexpectk no longer exists
  #  X_PROGS="expectk \$(LIBEXPECTK)"
@@ -21,7 +28,15 @@
  else
    X_PROGS="# no X support on this system"
    AC_MSG_WARN([No X based programs will be built])
-@@ -1148,4 +1148,5 @@
+@@ -1125,6 +1128,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)
+@@ -1148,4 +1152,5 @@
  AC_SUBST(SETUID)
  AC_SUBST(UNSHARED_RANLIB)
  AC_SUBST(DEFAULT_STTY_ARGS)
diff --git a/japanese/expect/files/patch-ae b/japanese/expect/files/patch-ae
new file mode 100644
index 000000000000..e2803e353029
--- /dev/null
+++ b/japanese/expect/files/patch-ae
@@ -0,0 +1,8 @@
+--- 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@]]
-- 
cgit v1.2.3