From f8d442b449f15072f335292484f33befd3366141 Mon Sep 17 00:00:00 2001
From: Danny Rawlins <monster.romster@gmail.com>
Date: Wed, 10 Aug 2016 21:16:53 +1000
Subject: [PATCH] p7zip: 9.20.1 -> 16.02

---
 p7zip/.footprint | 21 +++++++++++++--------
 p7zip/.md5sum    |  2 +-
 p7zip/Pkgfile    | 19 +++++++++----------
 3 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/p7zip/.footprint b/p7zip/.footprint
index 31c0eda75..c3ffa0fdb 100644
--- a/p7zip/.footprint
+++ b/p7zip/.footprint
@@ -1,15 +1,20 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
-lrwxrwxrwx	root/root	usr/bin/7z -> /usr/lib/p7zip/7za
-lrwxrwxrwx	root/root	usr/bin/7za -> /usr/lib/p7zip/7za
-lrwxrwxrwx	root/root	usr/bin/7zr -> /usr/lib/p7zip/7zr
+-rwxr-xr-x	root/root	usr/bin/7z
+-rwxr-xr-x	root/root	usr/bin/7za
+-rwxr-xr-x	root/root	usr/bin/7zr
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/p7zip/
+-rwxr-xr-x	root/root	usr/lib/p7zip/7z
+-rwxr-xr-x	root/root	usr/lib/p7zip/7z.so
 -rwxr-xr-x	root/root	usr/lib/p7zip/7zCon.sfx
 -rwxr-xr-x	root/root	usr/lib/p7zip/7za
 -rwxr-xr-x	root/root	usr/lib/p7zip/7zr
-drwxr-xr-x	root/root	usr/man/
-drwxr-xr-x	root/root	usr/man/man1/
--rw-r--r--	root/root	usr/man/man1/7z.1.gz
--rw-r--r--	root/root	usr/man/man1/7za.1.gz
--rw-r--r--	root/root	usr/man/man1/7zr.1.gz
+drwxr-xr-x	root/root	usr/lib/p7zip/Codecs/
+-rwxr-xr-x	root/root	usr/lib/p7zip/Codecs/Rar.so
+drwxr-xr-x	root/root	usr/share/
+drwxr-xr-x	root/root	usr/share/man/
+drwxr-xr-x	root/root	usr/share/man/man1/
+-rw-r--r--	root/root	usr/share/man/man1/7z.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/7za.1.gz
+-rw-r--r--	root/root	usr/share/man/man1/7zr.1.gz
diff --git a/p7zip/.md5sum b/p7zip/.md5sum
index 3adad997b..424dcc62d 100644
--- a/p7zip/.md5sum
+++ b/p7zip/.md5sum
@@ -1 +1 @@
-bd6caaea567dc0d995c990c5cc883c89  p7zip_9.20.1_src_all.tar.bz2
+a0128d661cfe7cc8c121e73519c54fbf  p7zip_16.02_src_all.tar.bz2
diff --git a/p7zip/Pkgfile b/p7zip/Pkgfile
index 4d6c70bbb..f032e566f 100644
--- a/p7zip/Pkgfile
+++ b/p7zip/Pkgfile
@@ -2,25 +2,24 @@
 # URL: http://p7zip.sourceforge.net/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Matt Housh, jaeger at crux dot nu
+# Depends on: yasm
 
 name=p7zip
-version=9.20.1
+version=16.02
 release=1
 source=(http://downloads.sourceforge.net/project/$name/$name/$version/${name}_${version}_src_all.tar.bz2)
 
 build() {
 	cd ${name}_$version
 
-	sed -i -e "s/OPTFLAGS=.*/OPTFLAGS=$CFLAGS/" makefile.machine
+	cp makefile.linux_amd64_asm makefile.machine
 
-	make 7zr 7za sfx
-	sh install.sh usr/bin usr/lib/p7zip usr/man usr/share/doc/p7zip $PKG/
+	make all3 OPTFLAGS="$CFLAGS"
 
-	rm $PKG/usr/bin/7za $PKG/usr/bin/7zr
+	make install \
+		DEST_DIR="$PKG" \
+		DEST_HOME=/usr \
+		DEST_MAN=/usr/share/man
 
-	ln -s /usr/lib/p7zip/7za $PKG/usr/bin/7z
-	ln -s /usr/lib/p7zip/7za $PKG/usr/bin/7za
-	ln -s /usr/lib/p7zip/7zr $PKG/usr/bin/7zr
-	rm -r $PKG/usr/share
-	chmod -vR u+w $PKG
+	rm -r $PKG/usr/share/doc
 }