- s/malloc.h/stdlib.h/ on some files to fix build on amd64 - 7.x [1]

- change some patches to REINPLACE_CMD [2]

PR:		ports/86638 [1]
Submitted by:	maintainer [1]
Reworked by:	me [2]
Approved by:	maintainer [2]

4 files changed, 7 insertions, 37 deletions

diff --git a/security/tthsum/Makefile b/security/tthsum/Makefile
index 0d222b7e9359..677c53c33360 100644
--- a/security/tthsum/Makefile
+++ b/security/tthsum/Makefile
@@ -25,6 +25,13 @@ MAN1=		tthsum.1
 post-patch:
 	@${REINPLACE_CMD} -E '/^(CC|CFLAGS)/d' \
 		${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,g' \
+		${WRKSRC}/base32.c \
+		${WRKSRC}/read.c \
+		${WRKSRC}/utf8.c
+	@${REINPLACE_CMD} '/stdio.h/H; /stdio\.h/{ p; s/#include <stdio.h>/#define O_LARGEFILE 0/;}' \
+		${WRKSRC}/read.c \
+		${WRKSRC}/thex.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/obj-${ARCH}/${PORTNAME} ${PREFIX}/bin
diff --git a/security/tthsum/files/patch-read.c b/security/tthsum/files/patch-read.c
deleted file mode 100644
index 01fd33e2ce97..000000000000
--- a/security/tthsum/files/patch-read.c
+++ /dev/null
@@ -1,15 +0,0 @@
---- read.c.orig	Tue Jun 28 02:50:50 2005
-+++ read.c	Sun Sep 25 14:21:38 2005
-@@ -38,9 +38,11 @@
- #include <sys/stat.h>
- #include <fcntl.h>
- #include <limits.h>
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- #include <stdio.h>
-+
-+#define O_LARGEFILE 0
- 
- struct readmmap_data {
- #ifdef _WIN32
diff --git a/security/tthsum/files/patch-thex.c b/security/tthsum/files/patch-thex.c
deleted file mode 100644
index 9106e167d994..000000000000
--- a/security/tthsum/files/patch-thex.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- thex.c.orig	Sun Sep 25 14:22:31 2005
-+++ thex.c	Sun Sep 25 14:22:42 2005
-@@ -37,6 +37,8 @@
- #include <string.h>
- #include <stdio.h>
- 
-+#define O_LARGEFILE 0
-+
- int thex_tiger_root(const unsigned char* filename, uint64_t* res,
- 		int use_mmap, unsigned progress_every_mib) {
- 	int ret = 0;
diff --git a/security/tthsum/files/patch-utf8.c b/security/tthsum/files/patch-utf8.c
deleted file mode 100644
index e928daaefd33..000000000000
--- a/security/tthsum/files/patch-utf8.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- utf8.c.orig	Sun Sep 25 14:23:55 2005
-+++ utf8.c	Sun Sep 25 14:24:06 2005
-@@ -24,7 +24,7 @@
- #	define WINDOWS_LEAN_AND_MEAN
- #	include <windows.h>
- #endif /* _WIN32 */
--#include <malloc.h>
-+#include <stdlib.h>
- #include <string.h>
- 
- /*