From cefe6b44970d68514b9df408e9265d7e3a6e513e Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@gmail.com>
Date: Fri, 21 Feb 2014 17:04:44 +0100
Subject: [PATCH] p7zip: downgrade revision for now (broken).

---
 srcpkgs/p7zip/template | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/p7zip/template b/srcpkgs/p7zip/template
index 7d20c93f53f..fd0308d45ca 100644
--- a/srcpkgs/p7zip/template
+++ b/srcpkgs/p7zip/template
@@ -2,7 +2,7 @@
 pkgname=p7zip
 version=9.20.1
 wrksrc=${pkgname}_${version}
-revision=3
+revision=2
 hostmakedepends="yasm nasm"
 short_desc="Command-line version of the 7zip compressed file archive"
 homepage="http://p7zip.sourceforge.net/"
@@ -12,14 +12,14 @@ distfiles="${SOURCEFORGE_SITE}/${pkgname}/${pkgname}_${version}_src_all.tar.bz2"
 checksum=49557e7ffca08100f9fc687f4dfc5aea703ca207640c76d9dee7b66f03cb4782
 
 do_build() {
-	if [ "$XBPS_TARGET_MACHINE" = "x86_64" ]; then
-		cp makefile.linux_amd64_asm makefile.machine
-	else
-		cp makefile.linux_x86_asm_gcc_4.X makefile.machine
-	fi
+	case "$XBPS_TARGET_MACHINE" in
+		i686*) cp makefile.linux_x86_asm_gcc_4.X makefile.machine;;
+		x86_64*) cp makefile.linux_amd64_asm makefile.machine;;
+		*) cp makefile.linux_any_cpu_gcc_4.X makefile.machine;;
+	esac
 	sed -i "s|usr/local|usr|g" makefile
 
-	make all3 ${makejobs} CXX="$CXX" OPTFLAGS="${CXXFLAGS}"
+	make all4 CXX="$CXX" OPTFLAGS="${CXXFLAGS}" UNICODE=1
 }
 
 do_install() {