1 files changed, 28 insertions, 28 deletions

diff --git a/japanese/tkstep80/files/patch-ab b/japanese/tkstep80/files/patch-ab
index 4bf9a686b339..03d56ec46d0d 100644
--- a/japanese/tkstep80/files/patch-ab
+++ b/japanese/tkstep80/files/patch-ab
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Thu Mar 25 20:41:30 1999
-+++ Makefile.in	Thu Mar 25 20:57:00 1999
+--- Makefile.in.orig	Wed Sep  6 16:29:30 2000
++++ Makefile.in	Wed Sep  6 17:04:19 2000
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -21,16 +21,16 @@
  # The directory containing the Tcl sources and headers appropriate
  # for this version of Tk ("srcdir" will be replaced or has already
  # been replaced by the configure script):
-@@ -112,7 +117,7 @@
+@@ -113,7 +118,7 @@
  
  # Libraries to use when linking.  This definition is determined by the
  # configure script.
 -LIBS = @TCL_BUILD_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ @EXTRA_LIBS@
 +LIBS = @TCL_LIB_SPEC@ @LIBS@ $(X11_LIB_SWITCHES) @DL_LIBS@ @MATH_LIBS@ @EXTRA_LIBS@
  
- CFLAGS = @CFLAGS@ @WITH_OPT@ @ENABLE_XPM@ @ENABLE_TIFF@ @ENABLE_DND@ @ENABLE_STEP@
- 
-@@ -150,7 +155,7 @@
+ # To turn off the security checks that disallow incoming sends when
+ # the X server appears to be insecure, reverse the comments on the
+@@ -149,7 +154,7 @@
  # "install" around;  better to use the install-sh script that comes
  # with the distribution, which is slower but guaranteed to work.
  
@@ -39,7 +39,7 @@
  INSTALL_PROGRAM =	${INSTALL}
  INSTALL_DATA =		${INSTALL} -m 644
  
-@@ -163,6 +168,8 @@
+@@ -162,6 +167,8 @@
  TK_SHLIB_CFLAGS = @TK_SHLIB_CFLAGS@
  
  TK_LIB_FILE = @TK_LIB_FILE@
@@ -48,7 +48,7 @@
  #TK_LIB_FILE = libtk.a
  
  TK_LIB_FLAG = @TK_LIB_FLAG@
-@@ -334,6 +341,14 @@
+@@ -335,6 +342,14 @@
  	rm -f ${TK_LIB_FILE}
  	@MAKE_LIB@
  	$(RANLIB) ${TK_LIB_FILE}
@@ -63,23 +63,23 @@
  
  # 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
-@@ -383,13 +398,13 @@
+@@ -384,13 +399,13 @@
  	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
  	./tktest
  
--install: install-binaries install-libraries install-demos install-man
-+install: install-binaries install-libraries install-demos
+-install: install-binaries install-libraries install-demos install-demosjp install-man
++install: install-binaries install-libraries install-demos install-demosjp
  
  # Note: before running ranlib below, must cd to target directory because
  # some ranlibs write to current directory, and this might not always be
  # possible (e.g. if installing as root).
  
--install-binaries: $(TK_LIB_FILE) wishstep
-+install-binaries: $(TK_LIB_FILE) $(TK_STATIC_LIB_FILE) wishstep
+-install-binaries: $(TK_LIB_FILE) wish@STEP@
++install-binaries: $(TK_LIB_FILE) $(TK_STATIC_LIB_FILE) wish@STEP@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -403,13 +418,22 @@
+@@ -404,13 +419,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)
@@ -90,12 +90,12 @@
 +	@$(INSTALL_DATA) $(TK_STATIC_LIB_FILE) $(LIB_INSTALL_DIR)/$(TK_STATIC_LIB_FILE)
 +	@(cd $(LIB_INSTALL_DIR); $(RANLIB) $(TK_STATIC_LIB_FILE))
 +	@chmod 555 $(LIB_INSTALL_DIR)/$(TK_STATIC_LIB_FILE)
- 	@echo "Installing wishstep"
- 	@$(INSTALL_PROGRAM) wishstep $(BIN_INSTALL_DIR)/wishstep$(VERSION)
- 	@echo "Installing tkStepConfig.sh"
--	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkStepConfig.sh
-+	@mkdir -p $(LIB_INSTALL_DIR)/tkstep$(VERSION)
-+	@$(INSTALL_DATA) tkConfig.sh $(LIB_INSTALL_DIR)/tkstep$(VERSION)/tkStepConfig.sh
+ 	@echo "Installing wish@STEP@"
+ 	@$(INSTALL_PROGRAM) wish@STEP@ $(BIN_INSTALL_DIR)/wish@STEP@$(VERSION)
+ 	@echo "Installing tk@STEP@Config.sh"
+-	@$(INSTALL_DATA) tk@STEP@Config.sh $(LIB_INSTALL_DIR)/tk@STEP@Config.sh
++	@mkdir -p $(SCRIPT_INSTALL_DIR)
++	@$(INSTALL_DATA) tk@STEP@Config.sh $(SCRIPT_INSTALL_DIR)/tk@STEP@Config.sh
  
  install-libraries:
  	@for i in $(INSTALL_ROOT)$(prefix)/lib $(INCLUDE_INSTALL_DIR) \
@@ -103,12 +103,12 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -419,9 +443,19 @@
+@@ -420,9 +444,19 @@
  		else true; \
  		fi; \
  	    done;
--	@echo "Installing tkstep.h"
--	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tkstep.h
+-	@echo "Installing tk@STEP@.h"
+-	@$(INSTALL_DATA) $(GENERIC_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk@STEP@.h
 -	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/*.xbm $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
 +	@echo "Installing headers"
 +	@for i in $(GENERIC_DIR)/*.h ; \
@@ -121,12 +121,12 @@
 +	    echo "Installing $$i"; \
 +	    $(INSTALL_DATA) $$i $(UNIX_INCLUDE_INSTALL_DIR); \
 +	    done;
-+	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tkstep.h
++	@ln -sf $(GENERIC_INCLUDE_INSTALL_DIR)/tk.h $(INCLUDE_INSTALL_DIR)/tk@STEP@.h
 +	for i in $(SRC_DIR)/library/*.tcl $(SRC_DIR)/library/tclIndex $(SRC_DIR)/library/prolog.ps $(UNIX_DIR)/tkAppInit.c; \
  	    do \
  	    echo "Installing $$i"; \
  	    $(INSTALL_DATA) $$i $(SCRIPT_INSTALL_DIR); \
-@@ -446,7 +480,7 @@
+@@ -447,7 +481,7 @@
  		else true; \
  		fi; \
  	    done;
@@ -135,7 +135,7 @@
  	    do \
  	    if [ -f $$i ] ; then \
  		echo "Installing $$i"; \
-@@ -458,7 +492,7 @@
+@@ -459,7 +493,7 @@
  	    do \
  	    chmod 755 $(SCRIPT_INSTALL_DIR)/demos/$$i; \
  	    done;
@@ -144,7 +144,7 @@
  	    do \
  	    if [ -f $$i ] ; then \
  		echo "Installing $$i"; \
-@@ -479,10 +513,10 @@
+@@ -507,10 +541,10 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -158,7 +158,7 @@
  	    done;
  	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(SRC_DIR)/doc; for i in *.3; \
-@@ -490,19 +524,26 @@
+@@ -518,19 +552,26 @@
  	    echo "Installing doc/$$i"; \
  	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \