From 67c52a889badf7bd06d05dbf155ae28db0c6a9fc Mon Sep 17 00:00:00 2001
From: Schrijvers Luc <begasus@gmail.com>
Date: Sat, 8 Feb 2020 17:35:03 +0100
Subject: [PATCH] jigit, bump version (#4701)

---
 .../{jigit-1.20.recipe => jigit-1.22.recipe}  | 50 +++++++++++++------
 app-misc/jigit/patches/jigit-1.22.patchset    | 30 +++++++++++
 2 files changed, 65 insertions(+), 15 deletions(-)
 rename app-misc/jigit/{jigit-1.20.recipe => jigit-1.22.recipe} (69%)
 create mode 100644 app-misc/jigit/patches/jigit-1.22.patchset

diff --git a/app-misc/jigit/jigit-1.20.recipe b/app-misc/jigit/jigit-1.22.recipe
similarity index 69%
rename from app-misc/jigit/jigit-1.20.recipe
rename to app-misc/jigit/jigit-1.22.recipe
index b8a2111a8..20b7825f6 100644
--- a/app-misc/jigit/jigit-1.20.recipe
+++ b/app-misc/jigit/jigit-1.22.recipe
@@ -7,13 +7,14 @@ list the missing files that are needed. \
 It is also convenient in case the user has a partially outdated optical media \
 or ISO image containing at least some files which are not outdated."
 HOMEPAGE="https://www.einval.com/~steve/software/JTE/"
-COPYRIGHT="2004-2014 Steve McIntyre
+COPYRIGHT="2004-2019 Steve McIntyre
 	2000-2010 George Danchev, Thomas Schmitt"
 LICENSE="GNU GPL v2
 	GNU LGPL v2.1"
 REVISION="1"
-SOURCE_URI="$HOMEPAGE/download/jigit_$portVersion.orig.tar.gz"
-CHECKSUM_SHA256="459285bd743645381912301578316f2bfafb99ce1c10140a01af2b6cb011f193"
+SOURCE_URI="$HOMEPAGE/download/jigit-$portVersion.tar.xz"
+CHECKSUM_SHA256="8a1da3fb7b817174c6c19d71ede19a4b8d0ae433fc5e967d33abf74b545f9954"
+PATCHES="jigit-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 x86_64"
 SECONDARY_ARCHITECTURES="x86"
@@ -25,16 +26,41 @@ if [ "$targetArchitecture" = x86_gcc2 ]; then
 	commandBinDir=$prefix/bin
 fi
 
+libVersion="2.0.0"
+libVersionCompat="$libVersion compat >= ${libVersion%%.*}"
+
 PROVIDES="
 	jigit$secondaryArchSuffix = $portVersion
+	lib:libjte$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES="
+	haiku$secondaryArchSuffix
+	lib:libbz2$secondaryArchSuffix
+	lib:libz$secondaryArchSuffix
+	"
+
+PROVIDES_devel="
+	jigit${secondaryArchSuffix}_devel = $portVersion
+	devel:libjte$secondaryArchSuffix = $libVersionCompat
+	"
+REQUIRES_devel="
+	jigit$secondaryArchSuffix == $portVersion base
+	"
+
+PROVIDES_tools="
+	jigit${secondaryArchSuffix}_tools = $portVersion
+	cmd:extract_data$commandSuffix = $portVersion
 	cmd:jigdump$commandSuffix = $portVersion
 	cmd:jigit$commandSuffix = $portVersion
 	cmd:jigsum$commandSuffix = $portVersion
+	cmd:jigsum_sha256$commandSuffix = $portVersion
 	cmd:jigit_mkimage$commandSuffix = $portVersion
 	cmd:mkjigsnap$commandSuffix = $portVersion
-	lib:libjte$secondaryArchSuffix = 1.0.0 compat >= 1
+	cmd:parallel_sums$commandSuffix = $portVersion
+	cmd:rsyncsum$commandSuffix = $portVersion
 	"
-REQUIRES="
+REQUIRES_tools="
+	jigit$secondaryArchSuffix == $portVersion base
 	haiku$secondaryArchSuffix
 	cmd:awk
 	cmd:bash
@@ -45,14 +71,6 @@ REQUIRES="
 	lib:libz$secondaryArchSuffix
 	"
 
-PROVIDES_devel="
-	jigit${secondaryArchSuffix}_devel = $portVersion
-	devel:libjte$secondaryArchSuffix = 1.0.0 compat >= 1
-	"
-REQUIRES_devel="
-	jigit$secondaryArchSuffix == $portVersion base
-	"
-
 BUILD_REQUIRES="
 	haiku${secondaryArchSuffix}_devel
 	devel:libbz2$secondaryArchSuffix
@@ -83,8 +101,8 @@ INSTALL()
 {
 	install -m 755 -d "$commandBinDir" "$manDir"/man1 "$manDir"/man8
 	install -m 755 -t "$commandBinDir" \
-		jigdump jigit jigit-mkimage jigsum \
-		mkjigsnap
+		extract-data jigdump jigit jigit-mkimage jigsum jigsum-sha256\
+		mkjigsnap parallel-sums rsyncsum
 	install -m 644 -t "$manDir"/man1 *.1
 	install -m 644 -t "$manDir"/man8 *.8
 
@@ -95,4 +113,6 @@ INSTALL()
 
 	packageEntries devel \
 		$developDir
+	packageEntries tools \
+		$commandBinDir
 }
diff --git a/app-misc/jigit/patches/jigit-1.22.patchset b/app-misc/jigit/patches/jigit-1.22.patchset
new file mode 100644
index 000000000..93feda7ef
--- /dev/null
+++ b/app-misc/jigit/patches/jigit-1.22.patchset
@@ -0,0 +1,30 @@
+From 14b61f317ee3e9d67eb9855d1d3711c39f98cdb4 Mon Sep 17 00:00:00 2001
+From: begasus <begasus@gmail.com>
+Date: Sat, 8 Feb 2020 13:30:55 +0000
+Subject: Remove -pthread from Makefile
+
+
+diff --git a/Makefile b/Makefile
+index e7a448b..965f0bf 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,5 +1,5 @@
+ BINS = jigdump jigit-mkimage jigsum jigsum-sha256 rsyncsum lib extract-data parallel-sums
+-CFLAGS += -g -Wall -I libjte -pthread -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
++CFLAGS += -g -Wall -I libjte -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
+ #CC = gcc
+ 
+ CKSUM_OBJS = libjte/libjte_libjte_la-checksum.o libjte/libjte_libjte_la-md5.o libjte/libjte_libjte_la-sha1.o libjte/libjte_libjte_la-sha256.o libjte/libjte_libjte_la-sha512.o
+@@ -33,7 +33,7 @@ libjte/Makefile:
+ $(CKSUM_OBJS): lib
+ 
+ parallel-sums: parallel-sums.o $(CKSUM_OBJS)
+-	$(CC) -pthread $(LDFLAGS) -o $@ $+ -lpthread
++	$(CC)$(LDFLAGS) -o $@ $+ -lpthread
+ 
+ clean:
+ 	rm -f *.o $(BINS) *~ build-stamp
+-- 
+2.24.1
+
+