From owner-ports-jp@jp.freebsd.org  Sat Feb 15 00:53:15 1997
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) id AAA16232
	Sat, 15 Feb 1997 00:53:15 +0900 (JST)
Received: by jaz.jp.freebsd.org (8.8.5+2.7Wbeta5/8.7.3) with ESMTP id AAA16227
	for <ports-jp@jp.freebsd.org>; Sat, 15 Feb 1997 00:53:13 +0900 (JST)
Received: from kiri.toba-cmt.ac.jp (localhost.toba-cmt.ac.jp [127.0.0.1])
	by kiri.toba-cmt.ac.jp (8.8.5/8.8.5) with ESMTP id AAA15382;
	Sat, 15 Feb 1997 00:53:57 +0900 (JST)
Message-Id: <199702141553.AAA15382@kiri.toba-cmt.ac.jp>
To: ports-jp@jp.freebsd.org, taguchi@tohoku.iij.ad.jp
From: =?ISO-2022-JP?B?GyRCNk07M09CSScbKEI=?= <kiri@kiri.toba-cmt.ac.jp>
In-Reply-To: Your message of "Wed, 12 Feb 1997 18:16:02 +0900"
References: <199702120916.SAA09635@hirose.tohoku.iij.ad.jp>
X-Mailer: Mew version 1.54 on Emacs 19.28.1, Mule 2.3
Mime-Version: 1.0
Content-Type: Text/Plain; charset=iso-2022-jp
Content-Transfer-Encoding: 7bit
Date: Sat, 15 Feb 1997 00:53:57 +0900
Reply-To: ports-jp@jp.freebsd.org
Precedence: bulk
X-Distribute: distribute [version 2.1 (Alpha) patchlevel=19]
X-Sequence: ports-jp 622
Subject: [ports-jp 622] Re: JP-Tcl7.6p2/Tk4.2p2 ports
Errors-To: owner-ports-jp@jp.freebsd.org
Sender: owner-ports-jp@jp.freebsd.org

$B6M;3(B $B$G$9!#(B

Message-ID: <199702120916.SAA09635@hirose.tohoku.iij.ad.jp> $B$N5-;v$K$F(B
Taguchi Takeshi <taguchi@tohoku.iij.ad.jp> $B$5$s$O=q$+$l$^$7$?(B :

> $BK\Ev$K$*BT$?$;$7$F$7$^$$$^$7$F?=$7Lu$4$6$$$^$;$s(B_o_

$B$3$A$i$3$=8fBT$?$;$7$^$7$?!#(B

> camltk $B$d(B mmm $B$G$N$4MxMQ$KBQ$($i$l$^$7$?$i!"(Bsend-pr $B$KD)@o$$$?$7$^$9!#(B
> $B!t(B $B2?$+5/$-$=$&$J5$$,$7$F$J$i$J$$$N$G$9!#(B

camltk $B$*$h$S(B mmm $B$N$?$a$K0J2<$NJQ99$r$7$^$7$?!'(B

---8<------8<------8<------8<------8<------8<------8<------8<---
diff -aurN ../../tmp/tk42/Makefile ./Makefile
--- ../../tmp/tk42/Makefile	Wed Feb 12 09:34:09 1997
+++ ./Makefile	Fri Feb 14 23:07:37 1997
@@ -13,7 +13,6 @@
 
 PATCH_SITES=	ftp://ftp.sra.co.jp/pub/lang/tcl/jp/
 PATCHFILES=	tk4.2jp-patch.gz
-PATCH_DEBUG=    true
 
 MAINTAINER=	taguchi@tohoku.iij.ad.jp
 
@@ -33,6 +32,8 @@
 PATCH_ARGS=		-d ${WRKDIR}/${DISTNAME} --forward --quiet -E ${PATCH_STRIP}
 .endif
 
+VERSION=	4.2jp
+
 post-extract:
 	@mv ${WRKDIR}/tk4.2 ${WRKDIR}/${DISTNAME}
 
@@ -43,9 +44,31 @@
 pre-build:
 	cd ${WRKSRC} && ${MAKE} -f Makefile.lib PREFIX=${PREFIX} && rm -f *.o
 
-pre-install:
+post-install: default
 	cd ${WRKSRC} && ${MAKE} -f Makefile.lib install PREFIX=${PREFIX}
 	/sbin/ldconfig -m ${PREFIX}/lib
+	${MKDIR} ${PREFIX}/include/tk${VERSION}/generic
+.for file in default.h ks_names.h tk.h tkCanvas.h tkFileFilter.h \
+	tkInt.h tkPatch.h tkPort.h tkSelect.h tkText.h tkWStr.h
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/generic/${file} \
+		${PREFIX}/include/tk${VERSION}/generic
+.endfor
+	${MKDIR} ${PREFIX}/include/tk${VERSION}/unix
+.for file in tkKinput2.h tkUnixDefault.h tkUnixInt.h tkUnixPort.h
+	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/unix/${file} \
+		${PREFIX}/include/tk${VERSION}/unix
+.endfor
+# the default Makefile can't make two levels of subdirectories, so
+# I patched it to install tk.h and tkWStr.h in include/tk${VERSION}
+	mv ${PREFIX}/include/tk${VERSION}/tk.h ${PREFIX}/include/tk${VERSION}/generic
+	mv ${PREFIX}/include/tk${VERSION}/tkWStr.h ${PREFIX}/include/tk${VERSION}/generic
+
+# Only activated (as dependency of post-install) for default version
+# of tcl/tk
+default:
+	/bin/ln -sf tk${VERSION}/generic/tk.h ${PREFIX}/include
+	/bin/ln -sf tk${VERSION}/generic/tkWStr.h ${PREFIX}/include
+	/bin/ln -sf tk${VERSION}/tkConfig.sh ${PREFIX}/lib
 
 test:
 	cd ${WRKSRC}; make test
diff -aurN ../../tmp/tk42/pkg/PLIST ./pkg/PLIST
--- ../../tmp/tk42/pkg/PLIST	Wed Feb 12 11:21:26 1997
+++ ./pkg/PLIST	Sat Feb 15 00:33:47 1997
@@ -1,6 +1,21 @@
 bin/wish4.2jp
-include/tk4.2jp/tk.h
-include/tk4.2jp/tkWStr.h
+include/tk.h
+include/tkWStr.h
+include/tk4.2jp/generic/default.h
+include/tk4.2jp/generic/ks_names.h
+include/tk4.2jp/generic/tk.h
+include/tk4.2jp/generic/tkCanvas.h
+include/tk4.2jp/generic/tkFileFilter.h
+include/tk4.2jp/generic/tkInt.h
+include/tk4.2jp/generic/tkPatch.h
+include/tk4.2jp/generic/tkPort.h
+include/tk4.2jp/generic/tkSelect.h
+include/tk4.2jp/generic/tkText.h
+include/tk4.2jp/generic/tkWStr.h
+include/tk4.2jp/unix/tkKinput2.h
+include/tk4.2jp/unix/tkUnixDefault.h
+include/tk4.2jp/unix/tkUnixInt.h
+include/tk4.2jp/unix/tkUnixPort.h
 lib/libtk42jp.so.1.0
 @exec /sbin/ldconfig -m %B
 lib/tk4.2jp/tkConfig.sh
@@ -11,7 +26,6 @@
 lib/tk4.2jp/demos/images/flagup.bmp
 lib/tk4.2jp/demos/images/gray25.bmp
 lib/tk4.2jp/demos/images/letters.bmp
-lib/tk4.2jp/demos/images/mickey.gif
 lib/tk4.2jp/demos/images/noletter.bmp
 lib/tk4.2jp/demos/images/pattern.bmp
 lib/tk4.2jp/demos/images/teapot.ppm
---8<------8<------8<------8<------8<------8<------8<------8<------8<---
--- pkg/PLIST~	Wed Feb 12 11:19:10 1997
+++ pkg/PLIST	Fri Feb 14 20:41:07 1997
@@ -1,7 +1,7 @@
 lib/libtcl76jp.so.1.0
 @exec /sbin/ldconfig -m %B
 bin/tclsh7.6jp
-include/tcl7.6jp/tcl7.6jp/tcl.h
+include/tcl7.6jp/tcl.h
 lib/tcl7.6jp/tclConfig.sh
 lib/tcl7.6jp/init.tcl
 lib/tcl7.6jp/ldAout.tcl
---8<------8<------8<------8<------8<------8<------8<------8<------8<---

$B0J>e$NJQ99$G(B camltk $B$*$h$S(B mmm $B$OL5;v%$%s%9%H!<%k$G$-$^$7$?(B^_^

$B$J$*!"(BJP-Tcl7.6p2/Tk4.2p2 $BMQ$KJQ99$7$^$7$?(B camltk $B$*$h$S(B mmm $B$N(B port 
$B$O(B ftp://ports.jp.freebsd.org/pub/.d2/incoming/ports-jp/japanese $B2<$N(B 
port-jp-camltk41-1.0.tar.gz $B$*$h$S(B port-jp-mmm-0.4.tar.gz $B$H$7$F(B put 
$B$7$^$7$?!#(B

> $BNc$N(B mmm $B$,Mn$A$k!"$H$$$&LdBj$O!"$3$NHG$G$R$g$C$H$7$?$i(B fix $B$7$F$k$+$b(B
> $B$7$l$^$;$s!#(B

$B%*%j%8%J%kHG$r:n$i$J$$$H$$$1$^$;$s$M!#(B

$B!t(B $BAa$/$7$J$$$H4V$K9g$o$J$$(B^^;;
------------------------------------------------------------------------
$B6M;3OBI'(B <kiri@kiri.toba-cmt.ac.jp>                 $BD;1)>&A%9bEy@lLg3X9;(B
                                                          $BEE;R5!3#9)3X2J(B
