From 95150ed1b283bac7c609367d9ff49c776f71672a Mon Sep 17 00:00:00 2001
From: gobo72 <gobo72@364a67c3-989e-7be9-548d-dae8560ea662>
Date: Wed, 12 Sep 2012 02:55:16 +0000
Subject: [PATCH] =?utf8?q?-R=C3=A9trograd=C3=A9=20libdrm=20de=202.4.37=20?=
 =?utf8?q?=C3=A0=202.4.33=20(ne=20trouvait=20pas=20fichier=20nouveau=5Fdev?=
 =?utf8?q?ice.h).=20-Mise=20=C3=A0=20jour=20WindowMaker-0.95.3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 config/packages-list   |  4 ++--
 stage4/hv-install-1    |  3 ++-
 stage4/packages-update |  2 +-
 stage4/pkg/WindowMaker | 14 +++-----------
 4 files changed, 8 insertions(+), 15 deletions(-)

diff --git a/config/packages-list b/config/packages-list
index 28aedd4..5b37b54 100644
--- a/config/packages-list
+++ b/config/packages-list
@@ -380,7 +380,7 @@ VTE="vte-0.28.2"
 
 WGET="wget-1.14"
 WHICH="which-2.20"
-WINDOWMAKER="WindowMaker-0.92.0"
+WINDOWMAKER="WindowMaker-0.95.3"
 WINDOWMAKER_EXTRA="WindowMaker-extra-0.1"
 WIRELESS_TOOLS="wireless_tools.29"
 WMNOTIFY="wmnotify-1.0.0"
@@ -399,7 +399,7 @@ XORG_MAKEDEPEND="makedepend-1.0.3"
 LIBXAU="libXau-1.0.7"
 LIBXDMCP="libXdmcp-1.1.1"
 XBITMAPS="xbitmaps-1.1.1"
-LIBDRM="libdrm-2.4.37"
+LIBDRM="libdrm-2.4.33"
 MESALIB="MesaLib-8.0.4"
 XCURSOR_THEMES="xcursor-themes-1.0.3"
 XKEYBOARD_CONFIG="xkeyboard-config-2.6"
diff --git a/stage4/hv-install-1 b/stage4/hv-install-1
index dc3f931..2910382 100755
--- a/stage4/hv-install-1
+++ b/stage4/hv-install-1
@@ -111,7 +111,8 @@ ipkg -s tk ${TK}
 # Re-installing python now that tk is present???
 ipkg ${PYTHON} "--enable-shared"
 
-ipkg -m acnb ${WINDOWMAKER}
+ipkg -m acnb ${WINDOWMAKER} "--with-gnustepdir=/usr/share/GNUstep"
+
 ipkg ${WINDOWMAKER_EXTRA}
 
 write_completed_stage
diff --git a/stage4/packages-update b/stage4/packages-update
index 81394b7..2950c5e 100755
--- a/stage4/packages-update
+++ b/stage4/packages-update
@@ -102,7 +102,7 @@ fpkg -e "tgz" ${XTERM} "ftp://invisible-island.net/xterm"
 fpkg -e "tar.gz" ${T1LIB} "http://www.ibiblio.org/pub/Linux/libs/graphics"
 
 fpkg -m sf -s "tcl" ${TK}
-fpkg ${WINDOWMAKER} ${WMAKER_URL}
+fpkg -e "tar.gz" ${WINDOWMAKER} ${WMAKER_URL}
 fpkg -e "tar.gz" ${WINDOWMAKER_EXTRA} ${WMAKER_URL}
 
 exit $?
diff --git a/stage4/pkg/WindowMaker b/stage4/pkg/WindowMaker
index e6d0632..f986028 100644
--- a/stage4/pkg/WindowMaker
+++ b/stage4/pkg/WindowMaker
@@ -1,15 +1,7 @@
 #!/bin/bash
 
-hvconfig_pre()
+hvbuild_post()
 {
-    cd ${LFS_TMP}/${PACKAGE}
-    aclocal
-    autoheader
-    autoconf
-    libtoolize --force --automake
-    automake -a --gnu --include-deps
-
-    CONFIGURE_OPTS="\
-        ${CONFIGURE_OPTS} \
-        --with-gnustepdir=/usr/share/GNUstep"
+    var_add_path "GNUSTEP_USER_ROOT" /etc/profile "~/.GNUstep"
+    var_export   "GNUSTEP_USER_ROOT" /etc/profile
 }
-- 
2.20.1