Bug 66795 - Update port: sysutils/testdisk - add WITH_NTFSPROGS and WITH_PROGSREISERFS knobs
Summary: Update port: sysutils/testdisk - add WITH_NTFSPROGS and WITH_PROGSREISERFS knobs
Status: Closed FIXED
Alias: None
Product: Ports & Packages
Classification: Unclassified
Component: Individual Port(s) (show other bugs)
Version: Latest
Hardware: Any Any
: Normal Affects Only Me
Assignee: freebsd-ports-bugs (Nobody)
URL:
Keywords:
Depends on:
Blocks:
 
Reported: 2004-05-18 10:10 UTC by Florent Thoumie
Modified: 2004-05-18 10:28 UTC (History)
0 users

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Florent Thoumie 2004-05-18 10:10:17 UTC
Testdisk has support for ntfsprogs and progsreiserfs.
This patch adds knobs for these 2 filesystems.

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



--- testdisk-5.2_2.diff begins here. -----21JlSI4bq7wBrYLNaTJPCStGGXEiW43bUCZWEgQ0QKxEoYe0
Content-Type: text/plain; name="file.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="file.diff"

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>
How-To-Repeat: 
N/A
Comment 1 Kirill Ponomarev freebsd_committer 2004-05-18 10:28:32 UTC
State Changed
From-To: open->closed

Committed, thanks!