tcl: fix headers and tclConfig.sh

2 files changed, 46 insertions, 18 deletions

diff --git a/tcl/.footprint b/tcl/.footprint
index cca99f88e..29c7db5c2 100644
--- a/tcl/.footprint
+++ b/tcl/.footprint
@@ -3,28 +3,53 @@ drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/tclsh -> tclsh8.5
 -rwxr-xr-x	root/root	usr/bin/tclsh8.5
 drwxr-xr-x	root/root	usr/include/
--rw-r--r--	root/root	usr/include/regcustom.h
--rw-r--r--	root/root	usr/include/regerrs.h
--rw-r--r--	root/root	usr/include/regguts.h
 -rw-r--r--	root/root	usr/include/tcl.h
--rw-r--r--	root/root	usr/include/tclCompile.h
+drwxr-xr-x	root/root	usr/include/tcl/
+drwxr-xr-x	root/root	usr/include/tcl/compat/
+-rw-r--r--	root/root	usr/include/tcl/compat/dirent.h
+-rw-r--r--	root/root	usr/include/tcl/compat/dirent2.h
+-rw-r--r--	root/root	usr/include/tcl/compat/dlfcn.h
+-rw-r--r--	root/root	usr/include/tcl/compat/float.h
+-rw-r--r--	root/root	usr/include/tcl/compat/limits.h
+-rw-r--r--	root/root	usr/include/tcl/compat/stdlib.h
+-rw-r--r--	root/root	usr/include/tcl/compat/string.h
+-rw-r--r--	root/root	usr/include/tcl/compat/unistd.h
+drwxr-xr-x	root/root	usr/include/tcl/generic/
+-rw-r--r--	root/root	usr/include/tcl/generic/regcustom.h
+-rw-r--r--	root/root	usr/include/tcl/generic/regerrs.h
+-rw-r--r--	root/root	usr/include/tcl/generic/regex.h
+-rw-r--r--	root/root	usr/include/tcl/generic/regguts.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tcl.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclCompile.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclDecls.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclFileSystem.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclIO.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclInt.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclIntDecls.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclIntPlatDecls.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclPlatDecls.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclPort.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclRegexp.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclTomMath.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclTomMathDecls.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tclTomMathInt.h
+-rw-r--r--	root/root	usr/include/tcl/generic/tommath.h
+drwxr-xr-x	root/root	usr/include/tcl/unix/
+-rw-r--r--	root/root	usr/include/tcl/unix/tclUnixPort.h
+-rw-r--r--	root/root	usr/include/tcl/unix/tclUnixThrd.h
 -rw-r--r--	root/root	usr/include/tclDecls.h
--rw-r--r--	root/root	usr/include/tclFileSystem.h
--rw-r--r--	root/root	usr/include/tclIO.h
 -rw-r--r--	root/root	usr/include/tclInt.h
 -rw-r--r--	root/root	usr/include/tclIntDecls.h
 -rw-r--r--	root/root	usr/include/tclIntPlatDecls.h
 -rw-r--r--	root/root	usr/include/tclPlatDecls.h
 -rw-r--r--	root/root	usr/include/tclPort.h
--rw-r--r--	root/root	usr/include/tclRegexp.h
--rw-r--r--	root/root	usr/include/tclThrd.h
 -rw-r--r--	root/root	usr/include/tclTomMath.h
 -rw-r--r--	root/root	usr/include/tclTomMathDecls.h
--rw-r--r--	root/root	usr/include/tclTomMathInt.h
--rw-r--r--	root/root	usr/include/tommath.h
+-rw-r--r--	root/root	usr/include/tclUnixPort.h
 drwxr-xr-x	root/root	usr/lib/
 lrwxrwxrwx	root/root	usr/lib/libtcl.so -> libtcl8.5.so
 -r-xr-xr-x	root/root	usr/lib/libtcl8.5.so
+lrwxrwxrwx	root/root	usr/lib/libtclstub.a -> libtclstub8.5.a
 -rw-r--r--	root/root	usr/lib/libtclstub8.5.a
 drwxr-xr-x	root/root	usr/lib/tcl8.5/
 -rw-r--r--	root/root	usr/lib/tcl8.5/auto.tcl
diff --git a/tcl/Pkgfile b/tcl/Pkgfile
index 88f0052dc..105f1612c 100644
--- a/tcl/Pkgfile
+++ b/tcl/Pkgfile
@@ -5,7 +5,7 @@
 
 name=tcl
 version=8.5.8
-release=1
+release=2
 source=(http://downloads.sourceforge.net/project/$name/Tcl/$version/$name$version-src.tar.gz)
 
 build() {
@@ -13,19 +13,22 @@ build() {
 
 	./configure --prefix=/usr
 	make
-	make install MKLINKS_FLAGS="-s" INSTALL_ROOT=$PKG
+	make install install-private-headers INSTALL_ROOT=$PKG
 
-	cp ../generic/*.h $PKG/usr/include/
-	cp tclUnixPort.h $PKG/usr/include/tclPort.h
-	cp tclUnixThrd.h $PKG/usr/include/tclThrd.h
+	install -d $PKG/usr/include/tcl/{generic,unix,compat}
+	cp ../generic/*.h $PKG/usr/include/tcl/generic
+	cp ../unix/*.h $PKG/usr/include/tcl/unix
+	cp ../compat/*.h $PKG/usr/include/tcl/compat
 
 	sed -i \
-		-e "s|TCL_SRC_DIR='.*'|TCL_SRC_DIR='/usr/lib'|" \
-		-e "s|$SRC/tcl$version/unix|/usr/lib|" \
+		-e "s|^TCL_BUILD_LIB_SPEC='-L.*/unix|TCL_BUILD_LIB_SPEC='-L/usr/lib|" \
+		-e "s|^TCL_SRC_DIR='.*'|TCL_SRC_DIR='/usr/include/tcl'|" \
+		-e "s|^TCL_BUILD_STUB_LIB_SPEC='-L.*/unix|TCL_BUILD_STUB_LIB_SPEC='-L/usr/lib|" \
+		-e "s|^TCL_BUILD_STUB_LIB_PATH='.*/unix|TCL_BUILD_STUB_LIB_PATH='/usr/lib|" \
 		$PKG/usr/lib/tclConfig.sh
 
-	rm $PKG/usr/include/regex.h
 	ln -s tclsh${version%.*} $PKG/usr/bin/tclsh
 	ln -s libtcl${version%.*}.so $PKG/usr/lib/libtcl.so
+	ln -s libtclstub${version%.*}.a $PKG/usr/lib/libtclstub.a
 	chmod -R u+w $PKG/usr/man
 }