From 6499090256a66eebeb449d5e889674da78075bde Mon Sep 17 00:00:00 2001
From: Christian Wiese <morfoh@opensde.org>
Date: Tue, 16 Oct 2007 04:15:42 +0300
Subject: [PATCH] Fixed xproto to handle new multilib support

---
 xorg/xproto/xproto.conf | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/xorg/xproto/xproto.conf b/xorg/xproto/xproto.conf
index 18e4153c1..c94022d6c 100644
--- a/xorg/xproto/xproto.conf
+++ b/xorg/xproto/xproto.conf
@@ -13,32 +13,32 @@
 # --- T2-COPYRIGHT-NOTE-END ---
 
 x_dirtree() {
+	lib=lib
 	ln -sfnv X11R7 $root/usr/X11
 	
+	if [ "$SDECFG_MULTILIB" = 1 ]; then
+		case $arch_machine in
+			powerpc64|sparc64|x86_64|mips64)
+				lib=lib64
+				# symlink lib -> lib64
+				ln -sfnv $lib $root/usr/X11/lib
+				;;
+		esac
+	fi
+
 	mkdir -p $root/etc/X11/app-defaults
-	mkdir -p $root/usr/X11/lib/X11
+	#mkdir -p $root/usr/X11/lib/X11
 
 	# FIXME maybe link to /usr/share/fonts?
 	mkdir -p $root/usr/X11/share/fonts
+	ln -sfnv ../../share/fonts $root/usr/X11/$lib/X11/fonts
 
 	ln -sfnv ../X11/bin $root/usr/bin/X11
 	ln -sfnv ../X11/include/X11 $root/usr/include/X11
-	ln -sfnv ../X11/lib $root/usr/lib/X11
-
-	ln -sfnv ../../share/fonts $root/usr/X11/lib/X11/fonts
-	ln -sfv /etc/X11/app-defaults $root/usr/X11/lib/X11/
+	ln -sfnv ../X11/$lib $root/usr/$lib/X11
 
-	if [[ $libdir = *lib64 ]]; then
-		mkdir -p $root/usr/X11/lib64/X11
+	ln -sfv /etc/X11/app-defaults $root/usr/X11/$lib/X11/
 
-		ln -sfnv ../../share/fonts $root/usr/X11/lib64/X11/fonts
-		ln -sfnv ../X11/lib64 $root/usr/lib64/X11
-		ln -sfv /etc/X11/app-defaults $root/usr/X11/lib64/X11/
-
-		# CHECK: this compat link seems to be needed, or somebody
-		# finds the file to patch inside the imake template files
-		ln -sfnv ../../lib64/X11/config $root/usr/X11/lib/X11/config
-	fi
 }
 
 hook_add postmake 5 x_dirtree