ports/66795: Update port: sysutils/testdisk - add WITH_NTFSPROGS and WITH_PROGSREISERFS knobs

[Florent Thoumie]

>Number:         66795
>Category:       ports
>Synopsis:       Update port: sysutils/testdisk - add WITH_NTFSPROGS and WITH_PROGSREISERFS knobs
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue May 18 02:10:17 PDT 2004
>Closed-Date:
>Last-Modified:
>Originator:     Florent Thoumie
>Release:        FreeBSD 4.9-RC i386
>Organization:
Xbsd.org
>Environment:

System: FreeBSD gw 4.9-RC FreeBSD 4.9-RC #4: Sun Oct 5 14:25:09 CEST 2003 rf at gw:/usr/src/sys/compile/GW i386

>Description:

Testdisk has support for ntfsprogs and progsreiserfs.
This patch adds knobs for these 2 filesystems.

>How-To-Repeat:

N/A

>Fix:

--- testdisk-5.2_2.diff begins here. ---

diff -ruN testdisk/Makefile testdisk.new/Makefile
--- testdisk/Makefile	Wed May 12 13:15:26 2004
+++ testdisk.new/Makefile	Tue May 18 10:53:34 2004
@@ -7,7 +7,7 @@
 
 PORTNAME=	testdisk
 PORTVERSION=	5.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 
@@ -16,13 +16,21 @@
 
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
-MAN1=		testdisk.1
+CONFIGURE_TARGET=	--build=${MACHINE_ARCH}-portbld-freebsd${OSREL}
+CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
 
-CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" \
-		LDFLAGS="-L${PREFIX}/lib"
+MAN1=		testdisk.1
 
 .if defined(WITH_E2FSPROGS)
-BUILD_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
+LIB_DEPENDS+=	ext2fs.2:${PORTSDIR}/sysutils/e2fsprogs
+.endif
+
+.if defined(WITH_NTFSPROGS)
+LIB_DEPENDS+=	ntfs.5:${PORTSDIR}/sysutils/ntfsprogs
+.endif
+
+.if defined(WITH_PROGSREISERFS)
+LIB_DEPENDS+=	reiserfs-0.3.0:${PORTSDIR}/sysutils/progsreiserfs
 .endif
 
 .include <bsd.port.pre.mk>
@@ -31,20 +39,24 @@
 IGNORE=		"Requires FreeBSD 5.x, some defines are missing in sys/disk.h before __FreeBSD_version 500040"
 .endif
 
-.if !defined(WITH_E2FSPROGS)
+.if !defined(WITH_E2FSPROGS) || !defined(WITH_NTFSPROGS) || !defined(WITH_PROGSREISERFS)
 pre-everything::
 	@${ECHO_MSG} ""
 	@${ECHO_MSG} "You can define the following for additional features:"
 	@${ECHO_MSG} ""
 .if !defined(WITH_E2FSPROGS)
-	@${ECHO_MSG} "WITH_E2FSPROGS  - Use ext2fs extensions.
+	@${ECHO_MSG} "WITH_E2FSPROGS		- Use ext2fs extensions.
+.endif
+.if !defined(WITH_NTFSPROGS)
+	@${ECHO_MSG} "WITH_NTFSPROGS		- Use ntfs extensions.
+.endif
+.if !defined(WITH_PROGSREISERFS)
+	@${ECHO_MSG} "WITH_PROGSREISERFS	- Use reiserfs extensions.
 .endif
 	@${ECHO_MSG} ""
 .endif
 
 post-patch:
-	${REINPLACE_CMD} -e 's|^transform.*||' ${WRKSRC}/Makefile.in \
-					       ${WRKSRC}/src/Makefile.in
 	${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.post.mk>

--- testdisk-5.2_2.diff begins here. ---
>Release-Note:
>Audit-Trail:
>Unformatted: