X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=packages%2Fdevel%2Ftcltk%2Ftcltk;h=449adfb665efac348f30424399a39770ed492b3c;hb=19813891fbe232c43c28c601baabc931cfb4d34e;hp=eb18a6e71c639e84e5179d84db8402bee1b1a639;hpb=6ae193981fcc05dcc495b4bde92cb8fd290ee4dd;p=hdw-linux%2Fhdw-linux.git

diff --git a/packages/devel/tcltk/tcltk b/packages/devel/tcltk/tcltk
index eb18a6e..449adfb 100644
--- a/packages/devel/tcltk/tcltk
+++ b/packages/devel/tcltk/tcltk
@@ -2,12 +2,10 @@
 #
 # author: hackbard@hackdaworld.dyndns.org
 #
-# [V] 8.4.6
+# [V] 8.4.11
 # [S] 3-4
-# [D] tk8.4.6-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/
-# [D] tcl8.4.6-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/
-
-bin_ver="8.6"
+# [D] tk8.4.11-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/
+# [D] tcl8.4.11-src.tar.gz http://puzzle.dl.sourceforge.net/sourceforge/tcl/
 
 custmain="1"
 
@@ -17,18 +15,47 @@ custmain()	{
 		tar --use-compress-program=gzip -xvf \
 		$hdw_home_dir/download/devel/tcltk/${i}${ver}-src.tar.gz
 	done &&
+
+	# prepare environment
+	export VERSION=$ver
+	export V=`echo $ver | awk -F. '{ print $1 "." $2 }'`
 	
 	# tcl
-	cd tcl$ver/unix && autoconf && cd dltest && autoconf && cd ..
-	./configure $confopt --enable-gcc --enable-shared
-	make $make_conf && make $install_conf install &&
-	ln -svf tclsh${bin_ver} $prefix/bin/tclsh &&
+	cd tcl$ver
+	export DIR=$PWD
+	cd unix
+	./configure $confopt --enable-threads
+	make $make_conf
+	sed -i "s:${DIR}/unix:$prefix/lib:" tclConfig.sh
+	sed -i "s:${DIR}:$prefix/include/tcl${V}:" tclConfig.sh
+	sed -i "s,^TCL_LIB_FILE='libtcl${V}..TCL_DBGX..so',TCL_LIB_FILE=\"libtcl${V}\$\{TCL_DBGX\}.so\"," tclConfig.sh
+	make $install_conf install
+	install -v -d $prefix/include/tcl${V}/unix
+	install -v -m644 *.h $prefix/include/tcl${V}/unix/
+	install -v -d $prefix/include/tcl${V}/generic
+	install -v -c -m644 ../generic/*.h $prefix/include/tcl${V}/generic/
+	rm -v -f $prefix/include/tcl${V}/generic/{tcl,tclDecls,tclPlatDecls}.h
+	ln -v -nsf ../../include/tcl${V} $prefix/lib/tcl${V}/include
+	ln -v -sf libtcl${V}.so $prefix/lib/libtcl.so
+	ln -v -sf tclsh${V} $prefix/bin/tclsh
 	cd ../..
 	
 	# tk
-	cd tk$ver/unix &&
-	./configure $confopt --enable-gcc --enable-shared
-	make $make_conf && make $install_conf install &&
-	ln -svf wish${bin_ver} $prefix/bin/wish
+	cd tk$ver
+	export DIR=$PWD
+	cd unix
+	./configure $confopt --enable-threads
+	make $make_conf
+	sed -i "s:${DIR}/unix:$prefix/lib:" tkConfig.sh
+	sed -i "s:${DIR}:$prefix/include/tk${V}:" tkConfig.sh
+	make $install_conf install
+	install -v -d $prefix/include/tk${V}/unix
+	install -v -m644 *.h $prefix/include/tk${V}/unix/
+	install -v -d $prefix/include/tk${V}/generic
+	install -v -m644 ../generic/*.h $prefix/include/tk${V}/generic/
+	rm -v -f $prefix/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h
+	ln -v -nsf ../../include/tk${V} $prefix/lib/tk${V}/include
+	ln -v -sf libtk${V}.so $prefix/lib/libtk.so
+	ln -v -sf wish${V} $prefix/bin/wish
 	cd ../..
 		}