Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 21 Jul 1998 15:04:20 +0900
From:      Taguchi Takeshi <taguchi@tohoku.iij.ad.jp>
To:        ports@FreeBSD.ORG
Subject:   Re: ports/7342: update ja-tk-8.0.2 
Message-ID:  <19980721150420J.taguchi@tohoku.iij.ad.jp>
In-Reply-To: Your message of "Mon, 20 Jul 1998 18:39:57 -0700 (PDT)" <199807210139.SAA12142@hub.freebsd.org>
References:  <199807210139.SAA12142@hub.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
Sorry, I should fix pkg/PLIST file ...

> >Number:         7342

> >Fix:
> please apply following patch to ${PORTSDIR}/japanese/tk80.
> 
> BEGIN>---8<cut here>8---
> diff -urN tk80.old/Makefile tk80/Makefile
> --- tk80.old/Makefile   Sun Jul  5 04:14:03 1998

Would you like to apply following patch too?

BEGIN>---8<cut here>8---
diff -urN tk80.old/patches/patch-aa tk80/patches/patch-aa
--- tk80.old/patches/patch-aa	Sun May 10 17:11:44 1998
+++ tk80/patches/patch-aa	Tue Jul 21 14:37:59 1998
@@ -1,5 +1,5 @@
---- configure.in.ORIG	Tue Jan  6 13:23:19 1998
-+++ configure.in	Tue Jan  6 13:24:45 1998
+--- configure.in.ORIG	Tue Jul 21 14:06:45 1998
++++ configure.in	Tue Jul 21 14:08:04 1998
 @@ -9,6 +9,7 @@
  TK_MINOR_VERSION=0
  TK_PATCH_LEVEL="p2"
@@ -28,7 +28,7 @@
  LIB_RUNTIME_DIR='${LIB_RUNTIME_DIR}'
  
  # If Tcl and Tk are installed in different places, adjust the library
-@@ -387,8 +390,10 @@
+@@ -492,8 +495,10 @@
  AC_SUBST(SHLIB_VERSION)
  AC_SUBST(TCL_BIN_DIR)
  AC_SUBST(TCL_BUILD_LIB_SPEC)
diff -urN tk80.old/patches/patch-ab tk80/patches/patch-ab
--- tk80.old/patches/patch-ab	Sun May 10 17:11:44 1998
+++ tk80/patches/patch-ab	Tue Jul 21 12:17:55 1998
@@ -1,5 +1,5 @@
---- Makefile.in.ORIG	Tue Jan  6 13:23:29 1998
-+++ Makefile.in	Tue Jan  6 13:25:40 1998
+--- Makefile.in.ORIG	Tue Jul 21 12:02:50 1998
++++ Makefile.in	Tue Jul 21 12:07:26 1998
 @@ -56,7 +56,9 @@
  BIN_DIR =		$(exec_prefix)/bin
  
@@ -48,7 +48,7 @@
  #TK_LIB_FILE = libtk.a
  
  # The symbol below provides support for dynamic loading and shared
-@@ -300,6 +307,10 @@
+@@ -293,6 +300,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
-@@ -309,6 +320,11 @@
+@@ -302,6 +313,11 @@
  	@MAKE_LIB@
  	$(RANLIB) @TK_LIB_FILE@
  
@@ -71,7 +71,21 @@
  # 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
  # extensions.  used for the Tcl Plugin.  -- dl
-@@ -353,13 +369,13 @@
+@@ -332,7 +348,7 @@
+ test: tktest
+ 	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
+ 	export LD_LIBRARY_PATH; \
+-	TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
++	TCL_LIBRARY=@TCL_BIN_DIR@; export TCL_LIBRARY; \
+ 	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
+ 	( echo cd $(TOP_DIR)/tests\; source all\; exit ) \
+ 	| ./tktest -geometry +0+0
+@@ -342,17 +358,17 @@
+ runtest:
+ 	LD_LIBRARY_PATH=`pwd`:${TCL_BIN_DIR}:${LD_LIBRARY_PATH}; \
+ 	export LD_LIBRARY_PATH; \
+-	TCL_LIBRARY=@TCL_SRC_DIR@/library; export TCL_LIBRARY; \
++	TCL_LIBRARY=@TCL_BIN_DIR@; export TCL_LIBRARY; \
  	TK_LIBRARY=$(TOP_DIR)/library; export TK_LIBRARY; \
  	./tktest
  
@@ -87,7 +101,7 @@
  	@for i in $(LIB_INSTALL_DIR) $(BIN_INSTALL_DIR) ; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -373,13 +389,19 @@
+@@ -366,13 +382,19 @@
  	@$(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)
@@ -108,7 +122,7 @@
  		$(SCRIPT_INSTALL_DIR) $(SCRIPT_INSTALL_DIR)/images; \
  	    do \
  	    if [ ! -d $$i ] ; then \
-@@ -389,8 +411,18 @@
+@@ -382,8 +404,18 @@
  		else true; \
  		fi; \
  	    done;
@@ -129,7 +143,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"; \
-@@ -449,10 +481,10 @@
+@@ -442,10 +474,10 @@
  	@cd $(SRC_DIR)/doc; for i in *.1; \
  	    do \
  	    echo "Installing doc/$$i"; \
@@ -143,7 +157,7 @@
  	    done;
  	$(UNIX_DIR)/mkLinks $(MAN1_INSTALL_DIR)
  	@cd $(SRC_DIR)/doc; for i in *.3; \
-@@ -460,19 +492,26 @@
+@@ -453,19 +485,26 @@
  	    echo "Installing doc/$$i"; \
  	    rm -f $(MAN3_INSTALL_DIR)/$$i; \
  	    sed -e '/man\.macros/r man.macros' -e '/man\.macros/d' \
diff -urN tk80.old/pkg/PLIST tk80/pkg/PLIST
--- tk80.old/pkg/PLIST	Sun Jul  5 04:14:07 1998
+++ tk80/pkg/PLIST	Tue Jul 21 14:10:01 1998
@@ -47,6 +47,7 @@
 lib/tk8.0jp/text.tcl
 lib/tk8.0jp/tk.tcl
 lib/tk8.0jp/tkfbox.tcl
+lib/tk8.0jp/xim.tcl
 lib/tk8.0jp/xmfbox.tcl
 lib/tk8.0jp/tclIndex
 lib/tk8.0jp/prolog.ps
END>---8< cut here>8---

Thanks,
Taguchi Takeshi

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?19980721150420J.taguchi>