Update to patchlevel 1.7 and fix some XIM-related problems.

PR:		15349
Submitted by:	maintainer

5 files changed, 20 insertions, 18 deletions

diff --git a/japanese/tk80/Makefile b/japanese/tk80/Makefile
index dd8d366c626a..18013c9adcd8 100644
--- a/japanese/tk80/Makefile
+++ b/japanese/tk80/Makefile
@@ -12,7 +12,7 @@ CATEGORIES=	japanese x11-toolkits tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
-PATCHFILES=	tk8.0.5jp1.6a.patch.gz
+PATCHFILES=	tk8.0.5jp1.7.patch.gz
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -30,6 +30,7 @@ USE_AUTOCONF=	yes
 USE_XLIB=	yes
 CONFIGURE_ARGS=	--enable-shared --with-tcl=${PREFIX}/lib/tcl${VERSION}jp \
 	--enable-xlibHack --enable-onTheSpot
+RANLIB=		ranlib
 
 .include <bsd.port.pre.mk>
 
@@ -54,6 +55,7 @@ post-install:
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if ${PORTOBJFORMAT} == "aout"
 	${LN} -sf libtk80jp.so.1.5 ${PREFIX}/lib/libtk80jp.so
+	${RANLIB} ${PREFIX}/lib/libtk80jp.so
 .endif
 	@${CAT}	${PKGDIR}/MESSAGE
 
diff --git a/japanese/tk80/distinfo b/japanese/tk80/distinfo
index 7efbce470bc5..9c80c44b53a2 100644
--- a/japanese/tk80/distinfo
+++ b/japanese/tk80/distinfo
@@ -1,2 +1,2 @@
 MD5 (tk8.0.5.tar.gz) = 3ae92b86c01ec99a1872697294839e64
-MD5 (tk8.0.5jp1.6a.patch.gz) = 813d87180fee2ccd305f7f4f9401a0fd
+MD5 (tk8.0.5jp1.7.patch.gz) = 7b6415b8f7729054ab179b9f829b86c7
diff --git a/japanese/tk80/files/patch-aa b/japanese/tk80/files/patch-aa
index 5a27e8c4910e..5da086adba38 100644
--- a/japanese/tk80/files/patch-aa
+++ b/japanese/tk80/files/patch-aa
@@ -1,5 +1,5 @@
---- configure.in.ORIG	Wed Mar 24 11:32:28 1999
-+++ configure.in	Wed Mar 24 11:32:37 1999
+--- configure.in.ORIG	Wed Dec  8 12:06:07 1999
++++ configure.in	Wed Dec  8 12:07:38 1999
 @@ -10,6 +10,7 @@
  TK_MINOR_VERSION=0
  TK_PATCH_LEVEL=".5"
@@ -28,19 +28,19 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -564,7 +567,11 @@
+@@ -575,7 +578,11 @@
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
      TK_LIB_FILE=libtk${TCL_SHARED_LIB_SUFFIX}
 +    if test "X$PORTOBJFORMAT" = "Xelf"; then
-+    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-soname,\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
++    MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} -Wl,-S,-soname=\${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
 +    else
      MAKE_LIB="\${SHLIB_LD} -o \${TK_LIB_FILE} \${OBJS} \$(TK_LD_SEARCH_FLAGS) ${SHLIB_LD_LIBS}"
 +    fi
      RANLIB=":"
  else
      TK_SHARED_BUILD=0
-@@ -606,10 +613,12 @@
+@@ -617,10 +624,12 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
diff --git a/japanese/tk80/files/patch-ab b/japanese/tk80/files/patch-ab
index 91ea25858a7b..90df6fc779c2 100644
--- a/japanese/tk80/files/patch-ab
+++ b/japanese/tk80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG	Fri May  7 06:28:28 1999
-+++ Makefile.in	Fri May  7 06:32:11 1999
+--- Makefile.in.ORIG	Wed Dec  8 12:06:17 1999
++++ Makefile.in	Wed Dec  8 12:47:57 1999
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -48,7 +48,7 @@
  #TK_LIB_FILE = libtk.a
  
  TK_LIB_FLAG = @TK_LIB_FLAG@
-@@ -321,6 +328,10 @@
+@@ -318,6 +325,10 @@
  
  DEMOPROGS = browse hello ixset rmt rolodex square tcolor timer widget
  
@@ -59,7 +59,7 @@
  all: wish
  
  # The following target is configured by autoconf to generate either
-@@ -329,6 +340,14 @@
+@@ -326,6 +337,14 @@
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TK_LIB_FILE}
@@ -74,7 +74,7 @@
  
  # Make target which outputs the list of the .o contained in the Tk lib
  # usefull to build a single big shared library containing Tcl/Tk and other
-@@ -378,13 +397,13 @@
+@@ -375,13 +394,13 @@
  	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
  	./tktest
  
@@ -90,7 +90,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -398,13 +417,22 @@
+@@ -395,13 +414,22 @@
  	@$(INSTALL_DATA) $(TK_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
  	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_LIB_FILE))
  	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_LIB_FILE)
@@ -114,7 +114,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -414,8 +442,18 @@
+@@ -411,8 +439,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -135,7 +135,7 @@
  	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
-@@ -485,6 +523,7 @@
+@@ -482,6 +520,7 @@
  	    chmod 755 $(SCRIPT_INSTALL_DIR)/demos.jp/$$i; \
  	    done;
  	(cd $(SCRIPT_INSTALL_DIR)/demos.jp; \
@@ -143,7 +143,7 @@
  	    rm -rf images; \
  	    ln -s $(SCRIPT_INSTALL_DIR)/demos/images .)
  
-@@ -501,10 +540,10 @@
+@@ -498,10 +537,10 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -157,7 +157,7 @@
  	    done;
  	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(SRC_DIR)/doc; for i in *.3; \
-@@ -512,19 +551,26 @@
+@@ -509,19 +548,26 @@
  	    echo "Installing doc/$$i"; \
  	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
diff --git a/japanese/tk80/pkg-plist b/japanese/tk80/pkg-plist
index 45be233817ac..44caebd5aaa5 100644
--- a/japanese/tk80/pkg-plist
+++ b/japanese/tk80/pkg-plist
@@ -1,6 +1,6 @@
 bin/wish8.0jp
 lib/libtk80jp.a
-lib/libtk80jp.so.1.4
+lib/libtk80jp.so.1.5
 lib/libtk80jp.so
 @exec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -m %B
 @unexec /usr/bin/env OBJFORMAT=%%PORTOBJFORMAT%% /sbin/ldconfig -R