From 822598d909b0d0a7eda156e199363a24e51d5958 Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sun, 17 Jan 2021 12:05:58 +0100
Subject: [PATCH] ncompress: enable x86_64

---
 app-arch/ncompress/ncompress-4.2.4.4.recipe   | 10 +++++--
 .../patches/ncompress-4.2.4.4.patchset        | 30 +++++++++++++++++--
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/app-arch/ncompress/ncompress-4.2.4.4.recipe b/app-arch/ncompress/ncompress-4.2.4.4.recipe
index 128b51435..5f5b049a2 100644
--- a/app-arch/ncompress/ncompress-4.2.4.4.recipe
+++ b/app-arch/ncompress/ncompress-4.2.4.4.recipe
@@ -19,13 +19,11 @@ SOURCE_URI="http://sourceforge.net/projects/ncompress/files/ncompress-4.2.4.4.ta
 CHECKSUM_SHA256="b00ba28d3f332b38aa75478a15c1b789957aa6c02d6453471f452c0ec3e6517a"
 PATCHES="ncompress-$portVersion.patchset"
 
-ARCHITECTURES="x86_gcc2"
+ARCHITECTURES="x86_gcc2 x86_64"
 
 PROVIDES="
 	ncompress = $portVersion
 	cmd:compress
-	cmd:zcat
-	cmd:zmore
 	"
 REQUIRES="
 	haiku
@@ -41,6 +39,10 @@ BUILD_PREREQUIRES="
 	cmd:gcc
 	cmd:sh
 	"
+TEST_REQUIRES="
+	cmd:cmp
+	cmd:find
+	"
 
 BUILD()
 {
@@ -49,7 +51,9 @@ BUILD()
 
 INSTALL()
 {
+	mkdir -p $binDir $manDir
 	echo -e "1\n$binDir\n$manDir\n7\n-DNOFUNCDEF=1\ni\n\n\nq"|sh build
+	rm $binDir/z* $binDir/uncompress $manDir/z*
 }
 
 TEST()
diff --git a/app-arch/ncompress/patches/ncompress-4.2.4.4.patchset b/app-arch/ncompress/patches/ncompress-4.2.4.4.patchset
index f53f89552..b19a72b45 100644
--- a/app-arch/ncompress/patches/ncompress-4.2.4.4.patchset
+++ b/app-arch/ncompress/patches/ncompress-4.2.4.4.patchset
@@ -1,4 +1,4 @@
-From a5cc6167a1fc7195f43828613970826658fc35f8 Mon Sep 17 00:00:00 2001
+From a301cb8be4e889b6020972697dde1be115fadf81 Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@gmail.com>
 Date: Tue, 14 Oct 2014 14:42:10 +0200
 Subject: Make build script work on haiku
@@ -109,5 +109,31 @@ index 647373d..d00cbf9 100755
  				:
  			else
 -- 
-1.8.3.4
+2.30.0
+
+
+From a331882984444e1e0d9b3fe73568b592594020b4 Mon Sep 17 00:00:00 2001
+From: Jerome Duval <jerome.duval@gmail.com>
+Date: Sun, 17 Jan 2021 12:01:21 +0100
+Subject: install symbolic links
+
+
+diff --git a/build b/build
+index d00cbf9..b054c59 100755
+--- a/build
++++ b/build
+@@ -711,9 +711,9 @@ do
+ 			cp compress ${BINDIR}/compress || exit 1
+ 			strip ${BINDIR}/compress
+ 			rm -f ${BINDIR}/uncompress || exit 1
+-			ln ${BINDIR}/compress ${BINDIR}/uncompress || exit 1
++			ln -sr ${BINDIR}/compress ${BINDIR}/uncompress || exit 1
+ 			rm -f  ${BINDIR}/zcat || exit 1
+-			ln -f ${BINDIR}/compress ${BINDIR}/zcat || exit 1
++			ln -fsr ${BINDIR}/compress ${BINDIR}/zcat || exit 1
+ 			cp zcmp zdiff zmore ${BINDIR}/. || exit 1
+ 			chmod 0755 ${BINDIR}/compress ${BINDIR}/zcmp ${BINDIR}/zdiff \
+                    	${BINDIR}/zmore || exit 1
+-- 
+2.30.0