From 5c158f51939869bf83c9d6423218885bad8170b5 Mon Sep 17 00:00:00 2001
From: Ingo Weinhold <ingo_weinhold@gmx.de>
Date: Tue, 23 Apr 2013 20:52:36 +0200
Subject: [PATCH] Make p7zip 9.13 an 9.20.1 recipes actual recipes

Remove 9.04 recipe and patch.
---
 app-arch/p7zip/p7zip-9.04.recipe        |  25 -----
 app-arch/p7zip/p7zip-9.13.recipe        |  41 ++++---
 app-arch/p7zip/p7zip-9.20.1.recipe      |  41 ++++---
 app-arch/p7zip/patches/p7zip-9.04.patch | 137 ------------------------
 4 files changed, 58 insertions(+), 186 deletions(-)
 delete mode 100644 app-arch/p7zip/p7zip-9.04.recipe
 delete mode 100644 app-arch/p7zip/patches/p7zip-9.04.patch

diff --git a/app-arch/p7zip/p7zip-9.04.recipe b/app-arch/p7zip/p7zip-9.04.recipe
deleted file mode 100644
index f679f10b0..000000000
--- a/app-arch/p7zip/p7zip-9.04.recipe
+++ /dev/null
@@ -1,25 +0,0 @@
-DESCRIPTION="p7zip"
-HOMEPAGE="http://p7zip.sourceforge.net"
-SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.04/p7zip_9.04_src_all.tar.bz2?use_mirror=cdnetworks-us-2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
-CHECKSUM_MD5="9194ebf9a2b3735d236aed001de5f6f8"
-BUILD()
-{
-	cd p7zip_9.04
-	cp makefile.beos makefile.machine
-	make
-}
-
-INSTALL()
-{
-	cd p7zip_9.04
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make install DEST_DIR=${DESTDIR} \
-		DEST_HOME=`finddir B_COMMON_DIRECTORY` \
-		DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
-		DEST_MAN=$COMMON_DOCS/man
-}
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2009 7-Zip Igor Pavlov."
diff --git a/app-arch/p7zip/p7zip-9.13.recipe b/app-arch/p7zip/p7zip-9.13.recipe
index 7fc9cdc99..89d854d39 100644
--- a/app-arch/p7zip/p7zip-9.13.recipe
+++ b/app-arch/p7zip/p7zip-9.13.recipe
@@ -1,24 +1,41 @@
-DESCRIPTION="p7zip"
+SUMMARY="7-zip file compression program"
+DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.13/p7zip_9.13_src_all.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="8ddb5053db3b1f2696407d01be145779"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="1999-2010 7-Zip Igor Pavlov."
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="p7zip-9.13.patch"
+
+PROVIDES="
+	p7zip = $portVersion
+	cmd:7za = $portVersion compat >= 9
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="p7zip_9.13"
+
 BUILD()
 {
-	cd p7zip_9.13
 	cp makefile.haiku makefile.machine
 	make
 }
 
 INSTALL()
 {
-	cd p7zip_9.13
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
-		DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
-		DEST_MAN=$COMMON_DOCS/man
+	make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
+		DEST_MAN=$manDir
 }
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2010 7-Zip Igor Pavlov."
diff --git a/app-arch/p7zip/p7zip-9.20.1.recipe b/app-arch/p7zip/p7zip-9.20.1.recipe
index 2c45ea1fb..eff191d12 100644
--- a/app-arch/p7zip/p7zip-9.20.1.recipe
+++ b/app-arch/p7zip/p7zip-9.20.1.recipe
@@ -1,24 +1,41 @@
-DESCRIPTION="p7zip"
+SUMMARY="7-zip file compression program"
+DESCRIPTION="p7zip is a port of 7za.exe for POSIX systems like Unix (Linux, Solaris, OpenBSD, FreeBSD, Cygwin, AIX, ...), MacOS X and also for BeOS and Amiga."
 HOMEPAGE="http://p7zip.sourceforge.net"
 SRC_URI="http://downloads.sourceforge.net/project/p7zip/p7zip/9.20.1/p7zip_9.20.1_src_all.tar.bz2"
-REVISION="1"
-STATUS_HAIKU="stable"
-DEPEND=""
 CHECKSUM_MD5="bd6caaea567dc0d995c990c5cc883c89"
+LICENSE="GNU LGPL v2.1"
+COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
+REVISION="2"
+ARCHITECTURES="x86_gcc2 ?x86"
+
+PATCHES="p7zip-9.20.1.patch"
+
+PROVIDES="
+	p7zip = $portVersion
+	cmd:7za = $portVersion compat >= 9
+	"
+REQUIRES="
+	haiku >= $haikuVersion
+	"
+BUILD_REQUIRES="
+	cmd:gcc
+	cmd:ld
+	cmd:make
+	"
+BUILD_PREREQUIRES="
+	haiku_devel >= $haikuVersion
+	"
+
+SOURCE_DIR="p7zip_9.20.1"
+
 BUILD()
 {
-	cd p7zip_9.20.1
 	cp makefile.haiku makefile.machine
 	make
 }
 
 INSTALL()
 {
-	cd p7zip_9.20.1
-	COMMON_DOCS=`finddir B_COMMON_DOCUMENTATION_DIRECTORY`
-	make install DEST_DIR=${DESTDIR} DEST_HOME=`finddir B_COMMON_DIRECTORY` \
-		DEST_SHARE_DOC=$COMMON_DOCS/doc/p7zip \
-		DEST_MAN=$COMMON_DOCS/man
+	make install DEST_DIR=$prefix DEST_HOME=$prefix DEST_SHARE_DOC=$docDir \
+		DEST_MAN=$manDir
 }
-LICENSE="GNU LGPL v2.1"
-COPYRIGHT="1999-2011 7-Zip Igor Pavlov."
diff --git a/app-arch/p7zip/patches/p7zip-9.04.patch b/app-arch/p7zip/patches/p7zip-9.04.patch
deleted file mode 100644
index 7fb6cac22..000000000
--- a/app-arch/p7zip/patches/p7zip-9.04.patch
+++ /dev/null
@@ -1,137 +0,0 @@
-diff -up p7zip_9.04/install.sh.orig p7zip_9.04/install.sh
---- p7zip_9.04/install.sh.orig	2010-04-23 23:59:47.153092096 -0600
-+++ p7zip_9.04/install.sh	2010-04-24 00:00:57.560201728 -0600
-@@ -56,10 +56,10 @@ then
-     cp bin/7za "${DEST_DIR}${DEST_SHARE}/7za"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7za"
-     strip     "${DEST_DIR}${DEST_SHARE}/7za"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7za"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7za"
-     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7za"
-     echo "\"${DEST_SHARE}/7za\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7za"
--    chmod 555 "${DEST_DIR}${DEST_BIN}/7za"
-+    chmod 755 "${DEST_DIR}${DEST_BIN}/7za"
-   fi
- 
-   if [ -x bin/7zr ]
-@@ -68,10 +68,10 @@ then
-     cp bin/7zr "${DEST_DIR}${DEST_SHARE}/7zr"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7zr"
-     strip     "${DEST_DIR}${DEST_SHARE}/7zr"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7zr"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7zr"
-     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7zr"
-     echo "\"${DEST_SHARE}/7zr\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7zr"
--    chmod 555 "${DEST_DIR}${DEST_BIN}/7zr"
-+    chmod 755 "${DEST_DIR}${DEST_BIN}/7zr"
-   fi
- 
-   if [ -x bin/7zCon.sfx ]
-@@ -80,7 +80,7 @@ then
-     cp bin/7zCon.sfx "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-     strip     "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7zCon.sfx"
-   fi
- 
-   if [ -x bin/7z ]
-@@ -89,14 +89,14 @@ then
-     cp bin/7z "${DEST_DIR}${DEST_SHARE}/7z"
-     chmod 777 "${DEST_DIR}${DEST_SHARE}/7z"
-     strip     "${DEST_DIR}${DEST_SHARE}/7z"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7z"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7z"
-     cp -r bin/Codecs "${DEST_DIR}${DEST_SHARE}/"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}"/*/*
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}"/*/*
-     cp bin/7z.so "${DEST_DIR}${DEST_SHARE}/7z.so"
--    chmod 555 "${DEST_DIR}${DEST_SHARE}/7z.so"
-+    chmod 755 "${DEST_DIR}${DEST_SHARE}/7z.so"
-     echo "#! /bin/sh" > "${DEST_DIR}${DEST_BIN}/7z"
-     echo "\"${DEST_SHARE}/7z\" \"\$@\"" >> "${DEST_DIR}${DEST_BIN}/7z"
--    chmod 555 "${DEST_DIR}${DEST_BIN}/7z"
-+    chmod 755 "${DEST_DIR}${DEST_BIN}/7z"
-   fi
- 
- else
-@@ -105,7 +105,7 @@ else
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7za"
-     mkdir -p "${DEST_DIR}${DEST_BIN}"
-     cp bin/7za "${DEST_DIR}${DEST_BIN}/7za"
--    chmod 555  "${DEST_DIR}${DEST_BIN}/7za"
-+    chmod 755  "${DEST_DIR}${DEST_BIN}/7za"
-   fi
- 
-   if [ -x bin/7zr ]
-@@ -113,7 +113,7 @@ else
-     echo "- installing ${DEST_DIR}${DEST_BIN}/7zr"
-     mkdir -p "${DEST_DIR}${DEST_BIN}"
-     cp bin/7zr "${DEST_DIR}${DEST_BIN}/7zr"
--    chmod 555  "${DEST_DIR}${DEST_BIN}/7zr"
-+    chmod 755  "${DEST_DIR}${DEST_BIN}/7zr"
-   fi
- fi
- 
-@@ -122,27 +122,27 @@ if [ -d DOCS ]
- then
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-    sed -e s?"{DEST_SHARE_DOC}"?"${DEST_SHARE_DOC}/DOCS"?g man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- else
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7z.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7z.1 > "${DEST_DIR}${DEST_MAN}/man1/7z.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7z.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7za.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7za.1 > "${DEST_DIR}${DEST_MAN}/man1/7za.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7za.1"
- 
-    echo "- installing ${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-    grep -v "{DEST_SHARE_DOC}" man1/7zr.1 > "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
--   chmod 444 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
-+   chmod 644 "${DEST_DIR}${DEST_MAN}/man1/7zr.1"
- fi
- 
- if [ -f README ]
-@@ -150,7 +150,7 @@ then
-   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/README"
-   mkdir -p  "${DEST_DIR}${DEST_SHARE_DOC}"
-   cp README "${DEST_DIR}${DEST_SHARE_DOC}/README"
--  chmod 444 "${DEST_DIR}${DEST_SHARE_DOC}/README"
-+  chmod 644 "${DEST_DIR}${DEST_SHARE_DOC}/README"
- fi
- 
- if [ -f ChangeLog ]
-@@ -158,7 +158,7 @@ then
-   echo "- installing ${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
-   mkdir -p     "${DEST_DIR}${DEST_SHARE_DOC}"
-   cp ChangeLog "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
--  chmod 444    "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
-+  chmod 644    "${DEST_DIR}${DEST_SHARE_DOC}/ChangeLog"
- fi
- 
- if [ -d DOCS ]
-@@ -166,7 +166,7 @@ then
-   echo "- installing HTML help in ${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
-   mkdir -p "${DEST_DIR}${DEST_SHARE_DOC}"
-   cp -r DOCS "${DEST_DIR}${DEST_SHARE_DOC}/DOCS"
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 555 {} \;
--  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 444 {} \;
-+  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type d -exec chmod 755 {} \;
-+  find "${DEST_DIR}${DEST_SHARE_DOC}/DOCS" -type f -exec chmod 644 {} \;
- fi
-