From 9542a59b334c65b30539cf76426d2a7f48ca5d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Revol?= <revol@free.fr>
Date: Tue, 29 Jul 2014 18:41:41 +0200
Subject: [PATCH] Fix xcb_proto recipe

Again python stuff...
---
 x11-proto/xcb_proto/xcb_proto-1.6.recipe | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/x11-proto/xcb_proto/xcb_proto-1.6.recipe b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
index eb46c5ccf..b3b56a07e 100644
--- a/x11-proto/xcb_proto/xcb_proto-1.6.recipe
+++ b/x11-proto/xcb_proto/xcb_proto-1.6.recipe
@@ -21,11 +21,11 @@ REQUIRES="
 	"
 
 BUILD_REQUIRES="
+	haiku${secondaryArchSuffix}_devel >= $haikuVersion
+	devel:util_macros$secondaryArchSuffix
 	"
 
 BUILD_PREREQUIRES="
-	haiku${secondaryArchSuffix}_devel >= $haikuVersion
-	devel:util_macros$secondaryArchSuffix
 	cmd:autoconf
 	cmd:libtool
 	cmd:aclocal
@@ -38,20 +38,26 @@ BUILD_PREREQUIRES="
 
 SOURCE_DIR="xcb-proto-$portVersion"
 
-GLOBAL_WRITABLE_FILES="
-	non-packaged/lib/python2.6/site-packages directory keep-old
-	"
-
 BUILD()
 {
 	libtoolize --force --copy --install
 	autoreconf -i
 	runConfigure ./configure
-	make
+	# force python dirs as the autodected one is the non-packaged one.
+	export PATH="$portPackageLinksDir/cmd~python/bin:$PATH"
+	pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3)
+	export pyexecdir=$prefix/lib/python$pythonVersion/vendor-packages
+	export pythondir=$prefix/lib/python$pythonVersion/vendor-packages
+	make pyexecdir=$pyexecdir pythondir=$pythondir
 }
 
 INSTALL()
 {
-	make install DESTDIR=/
+	# force python dirs as the autodected one is the non-packaged one.
+	export PATH="$portPackageLinksDir/cmd~python/bin:$PATH"
+	pythonVersion=$(python --version 2>&1 | sed 's/Python //' | head -c3)
+	export pyexecdir=$prefix/lib/python$pythonVersion/vendor-packages
+	export pythondir=$prefix/lib/python$pythonVersion/vendor-packages
+	make install DESTDIR=/ pyexecdir=$pyexecdir pythondir=$pythondir
 	fixPkgconfig
 }