From 3eaf89b4ddf74db7d7c94737e73cbf56bfd7bd4a Mon Sep 17 00:00:00 2001
From: Alexpux <alexey.pawlow@gmail.com>
Date: Sat, 14 Jun 2014 22:43:38 +0400
Subject: [PATCH] libxml2: Prepare to move system to real /usr

---
 libxml2/PKGBUILD               |  6 ++++--
 libxml2/libxml2-python.install | 22 +++++++++++-----------
 libxml2/libxml2.install        |  6 +++---
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/libxml2/PKGBUILD b/libxml2/PKGBUILD
index 988bfb63..e6112e56 100644
--- a/libxml2/PKGBUILD
+++ b/libxml2/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=('libxml2' 'libxml2-devel' 'libxml2-python')
 pkgver=2.9.1
-pkgrel=4
+pkgrel=5
 pkgdesc="XML parsing library, version 2"
 arch=(i686 x86_64)
 license=('MIT')
@@ -63,9 +63,11 @@ build() {
   cd ${pkgname}-${pkgver}
   ./configure --build=${CHOST} --host=${CHOST} --target=${CHOST} \
     --prefix=/usr \
+    --sysconfdir=/etc \
+    --localstatedir=/var \
     --enable-ipv6 \
     --with-history \
-  --with-python=/usr/bin/python2 \
+    --with-python=/usr/bin/python2 \
     --with-html-dir=/usr/share/doc \
     --with-html-subdir=libxml2/html
   make
diff --git a/libxml2/libxml2-python.install b/libxml2/libxml2-python.install
index aad6f96e..bd16ceec 100644
--- a/libxml2/libxml2-python.install
+++ b/libxml2/libxml2-python.install
@@ -2,19 +2,19 @@ PYTHON_SITELIB=usr/lib/python2.7/site-packages
 PYTHON_LIB=usr/lib/python2.7
 
 python_optimize() {
-	local pyd
+  local pyd
 
-	for pyd in "${@:-${PYTHON_SITELIB}}"
-	do
-		if [ ! -d ${pyd} ]
-		then
-			echo "Error: directory ${pyd} does not exist"
-		fi
+  for pyd in "${@:-${PYTHON_SITELIB}}"
+  do
+    if [ ! -d ${pyd} ]
+    then
+      echo "Error: directory ${pyd} does not exist"
+    fi
 
-		echo "Compiling ${pyd}..."
-		usr/bin/python2 ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${pyd}
-		usr/bin/python2 -OO ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${pyd}
-	done
+    echo "Compiling ${pyd}..."
+    usr/bin/python2 ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${pyd}
+    usr/bin/python2 -OO ${PYTHON_LIB}/compileall.py -f -q -d ${pyd} ${pyd}
+  done
 }
 
 post_install() {
diff --git a/libxml2/libxml2.install b/libxml2/libxml2.install
index 2de9d52d..4c41c311 100644
--- a/libxml2/libxml2.install
+++ b/libxml2/libxml2.install
@@ -1,6 +1,6 @@
 post_install() {
-  if test ! -f usr/etc/xml/catalog; then
-    usr/bin/mkdir -p usr/etc/xml
-    usr/bin/xmlcatalog --noout --create usr/etc/xml/catalog
+  if test ! -f etc/xml/catalog; then
+    usr/bin/mkdir -p etc/xml
+    usr/bin/xmlcatalog --noout --create etc/xml/catalog
   fi
 }