5 files changed, 112 insertions, 49 deletions

diff --git a/japanese/tkstep80/Makefile b/japanese/tkstep80/Makefile
index cb2d216636af..7bf4ddf0c343 100644
--- a/japanese/tkstep80/Makefile
+++ b/japanese/tkstep80/Makefile
@@ -6,25 +6,26 @@
 #
 
 PORTNAME=	tkstep
-PORTVERSION=	8.0.4
+PORTVERSION=	8.0.5
 CATEGORIES=	japanese tk80
 MASTER_SITES=	ftp://ftp.scriptics.com/pub/tcl/tcl8_0/
 DISTNAME=	tk${PORTVERSION}
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/ \
-		http://www.aaa-int.or.jp/~jfactory/TkStep/dist/
-PATCHFILES=	tk${PORTVERSION}jp1.3.patch.gz tk${PORTVERSION}-Stepnize.gz
+		http://www.aaa-int.or.jp/~jfactory/Factory/TkStep/dist/
+PATCHFILES=	tk${PORTVERSION}jp1.6.patch.gz 2Step-${PORTVERSION}pl1-patch.gz
 
 MAINTAINER=	kiri@pis.toba-cmt.ac.jp
 
 LIB_DEPENDS=	tcl80jp.1:${PORTSDIR}/japanese/tcl80
 
 USE_XLIB=	yes
+USE_XPM=	yes
 USE_AUTOCONF=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-gcc --enable-shared --enable-step \
 		--with-tcl=${PREFIX}/lib/tcl${TCLVERSION}jp \
-		--enable-dnd
+		--enable-dnd --enable-xpm
 WRKSRC=		${TOPDIR}/unix
 .if defined(PATCH_DEBUG)
 PATCH_DIST_ARGS=-d ${TOPDIR} -E ${PATCH_DIST_STRIP}
@@ -41,12 +42,18 @@ PORTDOCDIR=	${PREFIX}/share/doc/tkstep${TCLVERSION}jp
 
 .include <bsd.port.pre.mk>
 
+pre-install:
+	cd ${TOPDIR}/library/demos.jp && ${RM} -f *.orig
+
 post-install:
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${PORTDOCDIR}
-	cd ${TOPDIR}/doc.tkstep; \
-	${INSTALL_DATA} INSTALL.TkSTEPjp NOTES README.TkDND README.TkSTEPjp \
-		README.TkStep README.step changes.TkSTEPjp ${PORTDOCDIR}
+	cd ${TOPDIR}; \
+	${INSTALL_DATA} README.TkStep ${PORTDOCDIR}
+	cd ${TOPDIR}/tkstep; \
+	${INSTALL_DATA} NOTES README.TkDND README.step ${PORTDOCDIR}
+	cd ${TOPDIR}/tkstepjp; \
+	${INSTALL_DATA} changes.TkSTEPjp ${PORTDOCDIR}
 .endif
 	@${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib
 .if exists(${PKGINSTALL})
diff --git a/japanese/tkstep80/distinfo b/japanese/tkstep80/distinfo
index 3b0c29de54cb..52a3c9caef5b 100644
--- a/japanese/tkstep80/distinfo
+++ b/japanese/tkstep80/distinfo
@@ -1,3 +1,3 @@
-MD5 (tk8.0.4.tar.gz) = 8e4c6a20f11cdff76adb5d26423e4ea5
-MD5 (tk8.0.4jp1.3.patch.gz) = adbe811b2ddb4b9e11f478253888eb05
-MD5 (tk8.0.4-Stepnize.gz) = fcb3fa540d0a704ed198de4e2e11ccfc
+MD5 (tk8.0.5.tar.gz) = 3ae92b86c01ec99a1872697294839e64
+MD5 (tk8.0.5jp1.6.patch.gz) = 2677efcf10f00dbbc7d71c0dcfce9581
+MD5 (2Step-8.0.5pl1-patch.gz) = a10dfb8c5d1b486e913e55ade5779f42
diff --git a/japanese/tkstep80/files/patch-aa b/japanese/tkstep80/files/patch-aa
index ee8f5f2dc276..3f1b387133db 100644
--- a/japanese/tkstep80/files/patch-aa
+++ b/japanese/tkstep80/files/patch-aa
@@ -1,14 +1,14 @@
---- configure.in~	Wed Mar 24 22:32:25 1999
-+++ configure.in	Wed Mar 24 22:39:18 1999
+--- configure.in.orig	Wed Sep  6 15:36:32 2000
++++ configure.in	Wed Sep  6 15:39:22 2000
 @@ -10,6 +10,7 @@
  TK_MINOR_VERSION=0
- TK_PATCH_LEVEL=".4"
+ TK_PATCH_LEVEL=".5"
  VERSION=${TK_VERSION}
 +TCL_L10N=jp
  
  if test "${prefix}" = "NONE"; then
      prefix=/usr/local
-@@ -51,8 +52,8 @@
+@@ -68,8 +69,8 @@
  if test ! -d $TCL_BIN_DIR; then
      AC_MSG_ERROR(Tcl directory $TCL_BIN_DIR doesn't exist)
  fi
@@ -19,7 +19,7 @@
  fi
  
  #--------------------------------------------------------------------
-@@ -87,6 +88,8 @@
+@@ -104,6 +105,8 @@
  CFLAGS_OPTIMIZE=$TCL_CFLAGS_OPTIMIZE
  EXTRA_CFLAGS=$TCL_EXTRA_CFLAGS
  
@@ -28,10 +28,10 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -536,7 +539,11 @@
+@@ -586,7 +589,11 @@
      TK_SHARED_BUILD=1
      TK_SHLIB_CFLAGS="${SHLIB_CFLAGS}"
-     TK_LIB_FILE=libtkstep${TCL_SHARED_LIB_SUFFIX}
+     eval "TK_LIB_FILE=libtk${STEP}${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}"
 +    else
@@ -40,7 +40,7 @@
      RANLIB=":"
  else
      TK_SHARED_BUILD=0
-@@ -647,10 +654,12 @@
+@@ -700,10 +707,12 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
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' \
diff --git a/japanese/tkstep80/pkg-plist b/japanese/tkstep80/pkg-plist
index 8a6286c963fb..1bf73822ac26 100644
--- a/japanese/tkstep80/pkg-plist
+++ b/japanese/tkstep80/pkg-plist
@@ -31,6 +31,61 @@ lib/tkstep8.0jp/button.tcl
 lib/tkstep8.0jp/clrpick.tcl
 lib/tkstep8.0jp/comdlg.tcl
 lib/tkstep8.0jp/console.tcl
+lib/tkstep8.0jp/demos.jp/README
+lib/tkstep8.0jp/demos.jp/README.JP
+lib/tkstep8.0jp/demos.jp/arrow.tcl
+lib/tkstep8.0jp/demos.jp/bind.tcl
+lib/tkstep8.0jp/demos.jp/bitmap.tcl
+lib/tkstep8.0jp/demos.jp/browse
+lib/tkstep8.0jp/demos.jp/button.tcl
+lib/tkstep8.0jp/demos.jp/cfont.tcl
+lib/tkstep8.0jp/demos.jp/check.tcl
+lib/tkstep8.0jp/demos.jp/clrpick.tcl
+lib/tkstep8.0jp/demos.jp/colors.tcl
+lib/tkstep8.0jp/demos.jp/cscroll.tcl
+lib/tkstep8.0jp/demos.jp/ctext.tcl
+lib/tkstep8.0jp/demos.jp/dialog1.tcl
+lib/tkstep8.0jp/demos.jp/dialog2.tcl
+lib/tkstep8.0jp/demos.jp/dragtest
+lib/tkstep8.0jp/demos.jp/droptest
+lib/tkstep8.0jp/demos.jp/entry1.tcl
+lib/tkstep8.0jp/demos.jp/entry2.tcl
+lib/tkstep8.0jp/demos.jp/filebox.tcl
+lib/tkstep8.0jp/demos.jp/floor.tcl
+lib/tkstep8.0jp/demos.jp/form.tcl
+lib/tkstep8.0jp/demos.jp/hello
+lib/tkstep8.0jp/demos.jp/hscale.tcl
+lib/tkstep8.0jp/demos.jp/icon.tcl
+lib/tkstep8.0jp/demos.jp/image1.tcl
+lib/tkstep8.0jp/demos.jp/image2.tcl
+lib/tkstep8.0jp/demos.jp/imagedrop
+lib/tkstep8.0jp/demos.jp/items.tcl
+lib/tkstep8.0jp/demos.jp/ixset
+lib/tkstep8.0jp/demos.jp/label.tcl
+lib/tkstep8.0jp/demos.jp/license.terms
+lib/tkstep8.0jp/demos.jp/menu.tcl
+lib/tkstep8.0jp/demos.jp/menubu.tcl
+lib/tkstep8.0jp/demos.jp/msgbox.tcl
+lib/tkstep8.0jp/demos.jp/plot.tcl
+lib/tkstep8.0jp/demos.jp/puzzle.tcl
+lib/tkstep8.0jp/demos.jp/radio.tcl
+lib/tkstep8.0jp/demos.jp/rmt
+lib/tkstep8.0jp/demos.jp/rolodex
+lib/tkstep8.0jp/demos.jp/ruler.tcl
+lib/tkstep8.0jp/demos.jp/sayings.tcl
+lib/tkstep8.0jp/demos.jp/search.tcl
+lib/tkstep8.0jp/demos.jp/square
+lib/tkstep8.0jp/demos.jp/states.tcl
+lib/tkstep8.0jp/demos.jp/style.tcl
+lib/tkstep8.0jp/demos.jp/tclIndex
+lib/tkstep8.0jp/demos.jp/tcolor
+lib/tkstep8.0jp/demos.jp/tcolor2
+lib/tkstep8.0jp/demos.jp/text.tcl
+lib/tkstep8.0jp/demos.jp/tfontsel
+lib/tkstep8.0jp/demos.jp/timer
+lib/tkstep8.0jp/demos.jp/twind.tcl
+lib/tkstep8.0jp/demos.jp/vscale.tcl
+lib/tkstep8.0jp/demos.jp/widget
 lib/tkstep8.0jp/demos/README
 lib/tkstep8.0jp/demos/arrow.tcl
 lib/tkstep8.0jp/demos/bind.tcl
@@ -109,6 +164,7 @@ lib/tkstep8.0jp/images/pwrdLogo175.gif
 lib/tkstep8.0jp/images/pwrdLogo200.gif
 lib/tkstep8.0jp/images/pwrdLogo75.gif
 lib/tkstep8.0jp/kinput.tcl
+lib/tkstep8.0jp/kinsoku.tcl
 lib/tkstep8.0jp/listbox.tcl
 lib/tkstep8.0jp/menu.tcl
 lib/tkstep8.0jp/msgbox.tcl
@@ -124,15 +180,13 @@ lib/tkstep8.0jp/tearoff.tcl
 lib/tkstep8.0jp/text.tcl
 lib/tkstep8.0jp/tk.tcl
 lib/tkstep8.0jp/tkAppInit.c
-lib/tkstep8.0jp/tkStepConfig.sh
 lib/tkstep8.0jp/tkfbox.tcl
 lib/tkstep8.0jp/tkstep.tcl
+lib/tkstep8.0jp/tkstepConfig.sh
 lib/tkstep8.0jp/xim.tcl
 lib/tkstep8.0jp/xmfbox.tcl
-share/doc/tkstep8.0jp/INSTALL.TkSTEPjp
 share/doc/tkstep8.0jp/NOTES
 share/doc/tkstep8.0jp/README.TkDND
-share/doc/tkstep8.0jp/README.TkSTEPjp
 share/doc/tkstep8.0jp/README.TkStep
 share/doc/tkstep8.0jp/README.step
 share/doc/tkstep8.0jp/changes.TkSTEPjp
@@ -141,6 +195,8 @@ share/doc/tkstep8.0jp/changes.TkSTEPjp
 @dirrm include/tkstep8.0jp
 @dirrm lib/tkstep8.0jp/demos/images
 @dirrm lib/tkstep8.0jp/demos
+lib/tkstep8.0jp/demos.jp/images
+@dirrm lib/tkstep8.0jp/demos.jp
 @dirrm lib/tkstep8.0jp/images
 @dirrm lib/tkstep8.0jp
 @dirrm share/doc/tkstep8.0jp