Fatsort: update to current version

Part of #10333

sys-fs/fatsort/fatsort-1.6.5.recipe

@@ -6,8 +6,9 @@ HOMEPAGE="http://fatsort.sourceforge.net/"
 COPYRIGHT="2004-2014 Boris Leidner"
 LICENSE="GNU GPL v2"
 REVISION="1"
-SOURCE_URI="https://sf.net/projects/fatsort/files/fatsort-1.3.365.tar.gz"
-CHECKSUM_SHA256="77acc374b189e80e3d75d3508f3c0ca559f8030f1c220f7cfde719a4adb03f3d"
+SOURCE_URI="https://sf.net/projects/fatsort/files/fatsort-1.6.5.640.tar.xz"
+SOURCE_DIR="fatsort-1.6.5.640"
+CHECKSUM_SHA256="630ece56d9eb3a55524af0aec3aade7854360eba949172a6cfb4768cb8fbe42e"
 PATCHES="fatsort-$portVersion.patchset"
 
 ARCHITECTURES="all !x86_gcc2"
@@ -34,7 +35,7 @@ BUILD_PREREQUIRES="
 
 BUILD()
 {
-	make LDFLAGS=-ltextencoding
+	make LDFLAGS=-liconv
 }
 
 INSTALL()

sys-fs/fatsort/patches/fatsort-1.3.365.patchset

@@ -1,84 +0,0 @@
-From ef1e258751d98564f94120f7f188d1f234ff1b88 Mon Sep 17 00:00:00 2001
-From: begasus <begasus@gmail.com>
-Date: Wed, 10 May 2017 21:57:25 +0200
-Subject: fix stdint.h references
-
-
-diff --git a/src/FAT_fs.h b/src/FAT_fs.h
-index 27b0746..6fb9413 100644
---- a/src/FAT_fs.h
-+++ b/src/FAT_fs.h
-@@ -66,6 +66,10 @@
- #include <sys/types.h>
- #include <iconv.h>
- 
-+#if defined (__HAIKU__)
-+#include <stdint.h>
-+#endif
-+
- #include "platform.h"
- 
- // Directory entry structures
-diff --git a/src/clusterchain.h b/src/clusterchain.h
-index deb3c17..3c68661 100644
---- a/src/clusterchain.h
-+++ b/src/clusterchain.h
-@@ -29,6 +29,10 @@
- 
- #include <sys/types.h>
- 
-+#if defined (__HAIKU__)
-+#include <stdint.h>
-+#endif
-+
- #include "platform.h"
- 
- struct sClusterChain {
-diff --git a/src/fileio.h b/src/fileio.h
-index badd5a3..1b45234 100644
---- a/src/fileio.h
-+++ b/src/fileio.h
-@@ -28,6 +28,10 @@
- #include <sys/types.h>
- #include "platform.h"
- 
-+#if defined (__HAIKU__)
-+#include <stdint.h>
-+#endif
-+
- int fs_seek(FILE *stream, off_t offset, int whence);
- off_t fs_read(void *ptr, u_int32_t size, u_int32_t n, FILE *stream);
- off_t fs_write(const void *ptr, u_int32_t size, u_int32_t n, FILE *stream);
-diff --git a/src/natstrcmp.h b/src/natstrcmp.h
-index a2f4463..f092c37 100644
---- a/src/natstrcmp.h
-+++ b/src/natstrcmp.h
-@@ -26,6 +26,10 @@
- 
- #include <sys/types.h>
- 
-+#if defined (__HAIKU__)
-+#include <stdint.h>
-+#endif
-+
- // natural order comparison
- int32_t natstrcmp(const char *str1, const char *str2);
- 
-diff --git a/src/stringlist.h b/src/stringlist.h
-index 52943fb..c0b4082 100644
---- a/src/stringlist.h
-+++ b/src/stringlist.h
-@@ -28,6 +28,10 @@
- #include "platform.h"
- #include "FAT_fs.h"
- 
-+#if defined (__HAIKU__)
-+#include <stdint.h>
-+#endif
-+
- struct sStringList {
- 	char *str;
- 	struct sStringList *next;
--- 
-2.7.0
-

sys-fs/fatsort/patches/fatsort-1.6.5.patchset

@@ -0,0 +1,53 @@
+From 52bfe076a93aff5f76059529ff66efcf811672b3 Mon Sep 17 00:00:00 2001
+From: PulkoMandy <pulkomandy@pulkomandy.tk>
+Date: Tue, 13 Aug 2024 21:21:52 +0200
+Subject: Fix build for Haiku
+
+
+diff --git a/src/deviceio.c b/src/deviceio.c
+index 46369d3..67c6170 100644
+--- a/src/deviceio.c
++++ b/src/deviceio.c
+@@ -24,7 +24,7 @@
+ 
+ #include "deviceio.h"
+ 
+-#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
++#if defined __LINUX__ || defined __BSD__ || defined __OSX__ || defined __HAIKU__
+ 
+ #include <sys/types.h>
+ #include <sys/stat.h>
+@@ -59,7 +59,7 @@ typedef struct _STORAGE_ACCESS_ALIGNMENT_DESCRIPTOR {
+ #include "mallocv.h"
+ #include "errors.h"
+ 
+-#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
++#if defined __LINUX__ || defined __BSD__ || defined __OSX__ || defined __HAIKU__
+ 
+ DEVICE *device_open(const char *path) {
+ 
+@@ -88,7 +88,7 @@ int64_t device_seekset(DEVICE *device, int64_t offset) {
+   assert(device != NULL);
+   assert(offset >= 0);
+ 
+-#if defined __BSD__ || defined __OSX__ 
++#if defined __BSD__ || defined __OSX__ || defined __HAIKU__
+   return lseek(device->fd, (off_t) offset, SEEK_SET);
+ #else
+   return lseek64(device->fd, (off64_t) offset, SEEK_SET);
+diff --git a/src/deviceio.h b/src/deviceio.h
+index 691cfba..adc4f01 100644
+--- a/src/deviceio.h
++++ b/src/deviceio.h
+@@ -27,7 +27,7 @@
+ 
+ #include <stdint.h>
+ 
+-#if defined __LINUX__ || defined __BSD__ || defined __OSX__ 
++#if defined __LINUX__ || defined __BSD__ || defined __OSX__ || defined __HAIKU__
+ 
+ #define DIRECTORY_SEPARATOR '/'
+ 
+-- 
+2.45.2
+