From 00e8a130828a360dd654ff76cade992d846fc059 Mon Sep 17 00:00:00 2001
From: hugo <hugo@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Thu, 18 Feb 2010 00:36:09 +0000
Subject: [PATCH] WindowMaker installe OK

---
 packages-list                           |  2 +-
 stage3/cis-tk                           | 37 -------------------------
 {stage3 => stage4}/cis-t1lib            |  0
 stage3/cis-windowmaker => stage4/cis-tk | 15 ++++++----
 stage4/packages-update                  | 10 +++++++
 stage4/stage4-install                   | 10 ++++++-
 6 files changed, 30 insertions(+), 44 deletions(-)
 delete mode 100755 stage3/cis-tk
 rename {stage3 => stage4}/cis-t1lib (100%)
 rename stage3/cis-windowmaker => stage4/cis-tk (52%)

diff --git a/packages-list b/packages-list
index 24c345f..68c5a08 100644
--- a/packages-list
+++ b/packages-list
@@ -404,7 +404,7 @@ TETEX_CM_SUPER="tetex-cm-super"
 TEXINFO="texinfo-4.13a"
 TFTP_HPA="tftp-hpa-0.49"
 TIFF="tiff-3.8.2"
-TK="tk8.5.8"
+TK="tk8.5.8-src"
 TRANSMISSION="transmission-1.34"
 
 UDEV="udev-151"
diff --git a/stage3/cis-tk b/stage3/cis-tk
deleted file mode 100755
index 1ba210e..0000000
--- a/stage3/cis-tk
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/sh
-set -o errexit
-
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
-
-# Applying patches (if any)
-apply_patches ${1}
-
-cd ${LFS_TMP}/${1}
-export VERSION=$(echo ${1} | sed "s!tk\(.*\)!\1!g")
-export V=`echo $VERSION | cut -d "." -f 1,2`
-export DIR=$PWD
-cd unix
-sed -i "s/relid'/relid/" configure
-./configure \
-    --prefix=/usr \
-    --enable-threads
-make
-sed -i -e "s:${DIR}/unix:/usr/lib:" \
-    -e "s:${DIR}:/usr/include/tk${V}:" tkConfig.sh
-
-make install
-install -d /usr/include/tk${V}/unix
-install -m644 *.h /usr/include/tk${V}/unix/
-install -d /usr/include/tk${V}/generic
-install -m644 ../generic/*.h /usr/include/tk${V}/generic/
-rm -f /usr/include/tk${V}/generic/{tk,tkDecls,tkPlatDecls}.h
-ln -nsf ../../include/tk${V} /usr/lib/tk${V}/include
-ln -sf libtk${V}.so /usr/lib/libtk.so
-ln -sf wish${V} /usr/bin/wish
-
-ldconfig
-
-exit $?
diff --git a/stage3/cis-t1lib b/stage4/cis-t1lib
similarity index 100%
rename from stage3/cis-t1lib
rename to stage4/cis-t1lib
diff --git a/stage3/cis-windowmaker b/stage4/cis-tk
similarity index 52%
rename from stage3/cis-windowmaker
rename to stage4/cis-tk
index ca29a5e..251d2c5 100755
--- a/stage3/cis-windowmaker
+++ b/stage4/cis-tk
@@ -1,8 +1,6 @@
 #!/bin/sh
 set -o errexit
 
-# First argument of this script is the package name.
-
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
@@ -12,13 +10,20 @@ source ../packages-list
 apply_patches ${1}
 
 cd ${LFS_TMP}/${1}
-autoreconf
+cd unix
 ./configure \
     --prefix=/usr \
-    --sysconfdir=/etc \
-    --with-gnustepdir=/usr/share/GNUstep
+    --enable-threads \
+    --mandir=/usr/share/man
 make
+sed -i \
+    -e "s@^\(TK_SRC_DIR='\).*@\1/usr/include'@" \
+    -e "/TK_B/s@='\(-L\)\?.*unix@='\1/usr/lib@" \
+    -e "/SEARCH/s/=.*/=''/" \
+    tkConfig.sh
 make install
+make install-private-headers
+ln -v -sf wish8.5 /usr/bin/wish
 ldconfig
 
 exit $?
diff --git a/stage4/packages-update b/stage4/packages-update
index c184a5f..d209fee 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -17,6 +17,8 @@ export RCMD_NO_EXIT=1
 
 update_packages_init
 
+lpkg     3 ${PYTHON}
+
 XORG_MODULES_LIST="${XORG_APP} ${XORG_DATA} ${XORG_DRIVER} ${XORG_FONT} ${XORG_LIB} ${XORG_PROTO} ${XORG_UTIL}"
 
 BLFS_XORG_URL=http://anduin.linuxfromscratch.org/files/BLFS/svn/xorg
@@ -93,4 +95,12 @@ fpkg    ${XORG_SERVER}      ${XORG_URL}/xserver
 ARCH_EXT=tgz fpkg ${XTERM} ftp://invisible-island.net/xterm
 unset ARCH_EXT
 
+fpkg       ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
+
+fpkg_sf    ${TK} tcl
+                                                                 
+fpkg_gnu   ${EMACS}                                                                                                                                                                                                                     
+fpkg       ${WINDOWMAKER}       "http://windowmaker.info/pub/source/release"
+fpkg       ${WINDOWMAKER_EXTRA} "http://windowmaker.info/pub/source/release"
+
 exit $?
diff --git a/stage4/stage4-install b/stage4/stage4-install
index 679368b..ffb51b1 100755
--- a/stage4/stage4-install
+++ b/stage4/stage4-install
@@ -125,7 +125,15 @@ rscr once "Configuring X.org" configure-xorg
 
 ipkg_cust ${XTERM} cis-xterm ${XORG_CONFIG}
 
-exit 1
+ipkg_cust ${T1LIB} cis-t1lib
+
+ipkg_cust ${TK}  cis-tk
+
+# Re-installing python now that tk is present???
+ipkg_ac   ${PYTHON} "--enable-shared"
+
+ipkg_ac   ${WINDOWMAKER} --with-gnustepdir=/usr/share/GNUstep
+ipkg_ac   ${WINDOWMAKER_EXTRA}
 
 #source /etc/profile
 
-- 
2.20.1