git: e855ba6850d2 - main - sysutils/testdisk: Update to 7.2

From: Nuno Teixeira <eduardo_at_FreeBSD.org>
Date: Sat, 03 Feb 2024 08:46:28 UTC
The branch main has been updated by eduardo:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e855ba6850d2a0525f0bd005588bd742e853bf56

commit e855ba6850d2a0525f0bd005588bd742e853bf56
Author:     Nuno Teixeira <eduardo@FreeBSD.org>
AuthorDate: 2024-02-03 07:48:40 +0000
Commit:     Nuno Teixeira <eduardo@FreeBSD.org>
CommitDate: 2024-02-03 08:46:01 +0000

    sysutils/testdisk: Update to 7.2
    
    - Move manpages to PREFIX/share
    - Move PLIST_FILES to pkg-plist
    - Take maintainership
    
    ChangeLog: https://www.cgsecurity.org/wiki/TestDisk_7.2_Release
---
 sysutils/testdisk/Makefile                   | 20 ++++++++------------
 sysutils/testdisk/distinfo                   |  6 +++---
 sysutils/testdisk/files/patch-src_ntfs__io.c | 11 -----------
 sysutils/testdisk/pkg-plist                  |  9 +++++++++
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index 4324e7e6f9a7..ba15123a2a14 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -1,10 +1,9 @@
 PORTNAME=	testdisk
-DISTVERSION=	7.1
-PORTREVISION=	1
+DISTVERSION=	7.2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	eduardo@FreeBSD.org
 COMMENT=	Tool to check and undelete partitions
 WWW=		https://www.cgsecurity.org/wiki/TestDisk
 
@@ -13,17 +12,14 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		jpeg localbase:ldflags ncurses tar:bzip2
 
-GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--disable-qt --without-ewf
-
-PLIST_FILES=	bin/fidentify bin/photorec bin/testdisk \
-		man/man8/fidentify.8.gz man/man8/photorec.8.gz \
-		man/man8/testdisk.8.gz man/zh_CN/man8/fidentify.8.gz \
-		man/zh_CN/man8/photorec.8.gz man/zh_CN/man8/testdisk.8.gz
+GNU_CONFIGURE=			yes
+GNU_CONFIGURE_MANPREFIX=	${PREFIX}/share
+CONFIGURE_ARGS=			--disable-qt \
+				--without-ewf
 
 PORTDOCS=	*
 
-OPTIONS_DEFINE=	ICONV PROGSREISERFS NTFS DOCS
+OPTIONS_DEFINE=		DOCS ICONV NTFS PROGSREISERFS
 OPTIONS_DEFAULT=	ICONV
 
 NTFS_DESC=		Support NTFS via fuse-ntfs extensions
@@ -35,7 +31,7 @@ ICONV_CONFIGURE_OFF=	--without-iconv
 NTFS_LIB_DEPENDS=	libntfs-3g.so:sysutils/fusefs-ntfs
 NTFS_CONFIGURE_OFF=	--without-ntfs3g
 
-PROGSREISERFS_LIB_DEPENDS=	libreiserfs.so:sysutils/progsreiserfs
+PROGSREISERFS_LIB_DEPENDS=	libreiserfs-0.3.so:sysutils/progsreiserfs
 PROGSREISERFS_CONFIGURE_OFF=	--without-reiserfs
 
 .include <bsd.port.mk>
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
index 6576faeeb9a0..d2cd25c126c9 100644
--- a/sysutils/testdisk/distinfo
+++ b/sysutils/testdisk/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1566613026
-SHA256 (testdisk-7.1.tar.bz2) = 1413c47569e48c5b22653b943d48136cb228abcbd6f03da109c4df63382190fe
-SIZE (testdisk-7.1.tar.bz2) = 742006
+TIMESTAMP = 1706943784
+SHA256 (testdisk-7.2.tar.bz2) = f8343be20cb4001c5d91a2e3bcd918398f00ae6d8310894a5a9f2feb813c283f
+SIZE (testdisk-7.2.tar.bz2) = 855781
diff --git a/sysutils/testdisk/files/patch-src_ntfs__io.c b/sysutils/testdisk/files/patch-src_ntfs__io.c
deleted file mode 100644
index d7d05472edb5..000000000000
--- a/sysutils/testdisk/files/patch-src_ntfs__io.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/ntfs_io.c.orig	2023-08-08 15:12:08 UTC
-+++ src/ntfs_io.c
-@@ -154,7 +154,7 @@ static int ntfs_device_testdisk_io_stat(struct ntfs_de
- 	return -1;
- }
- 
--static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, int request,
-+static int ntfs_device_testdisk_io_ioctl(struct ntfs_device *dev, unsigned long request,
- 		void *argp)
- {
- 	log_warning( "ntfs_device_testdisk_io_ioctl() unimplemented\n");
diff --git a/sysutils/testdisk/pkg-plist b/sysutils/testdisk/pkg-plist
new file mode 100644
index 000000000000..b8fefaa2131e
--- /dev/null
+++ b/sysutils/testdisk/pkg-plist
@@ -0,0 +1,9 @@
+bin/fidentify
+bin/photorec
+bin/testdisk
+share/man/man8/fidentify.8.gz
+share/man/man8/photorec.8.gz
+share/man/man8/testdisk.8.gz
+share/man/zh_CN/man8/fidentify.8.gz
+share/man/zh_CN/man8/photorec.8.gz
+share/man/zh_CN/man8/testdisk.8.gz