ports/158792: sysutils/testdisk update to 6.12

[Jan Henrik Sylvester]

>Number:         158792
>Category:       ports
>Synopsis:       sysutils/testdisk update to 6.12
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 11 06:40:07 UTC 2011
>Closed-Date:
>Last-Modified:
>Originator:     Jan Henrik Sylvester
>Release:        8.2-RELEASE-p2 amd64
>Organization:
>Environment:
>Description:
- update to 6.12
- changes: http://www.cgsecurity.org/wiki/TestDisk_6.12_Release
- sysutils/fusefs-ntfs (WITH_NTFS3G) can be used instead of sysutils/ntfsprogs
- html documentation not installed (tar not available anymore)
- html documentation available online: http://www.cgsecurity.org/wiki/TestDisk
>How-To-Repeat:

>Fix:
- html documentation not available, but share/doc/testdisk/html is still created by install-data-hook target; patch removes it to get a correct automatically generated pkg-plist
- sysutils/fusefs-ntfs is preferred over sysutils/ntfsprogs, if both are present, but this should not happen anyhow, since these ports install conflicting files now
- I have tested all combinations of the NTFS3G and NTFSPROGS options to compile correctly, but no other nondefault options

Patch attached with submission follows:

diff -u sysutils/testdisk/Makefile.orig sysutils/testdisk/Makefile
--- sysutils/testdisk/Makefile.orig	2010-02-05 11:44:15.000000000 +0000
+++ sysutils/testdisk/Makefile	2011-07-10 22:32:54.000000000 +0000
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	testdisk
-PORTVERSION=	6.11
-PORTREVISION=	1
+PORTVERSION=	6.12
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.cgsecurity.org/
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}
@@ -22,20 +21,21 @@
 CONFIGURE_ENV=	CPPFLAGS="-I${PREFIX}/include" LDFLAGS="-L${PREFIX}/lib"
 CONFIGURE_ARGS=	--without-ewf
 
-MAN1=		testdisk.1 photorec.1
-PLIST_FILES=	sbin/testdisk sbin/photorec
+MAN8=		fidentify.8 testdisk.8 photorec.8
+PLIST_FILES=	bin/fidentify bin/testdisk bin/photorec
 PORTDOCS=	*
 
 OPTIONS=	ICONV "Use iconv extensions" on \
-		NTFSPROGS "Use ntfs extensions" off \
+		NTFS3G "Use fusefs-ntfs extensions" off \
+		NTFSPROGS "Use ntfsprogs extensions" off \
 		PROGSREISERFS "Use reiserfs extensions" off
 #		E2FSPROGS "Use ext2fs extensions" off \
 
 .include <bsd.port.pre.mk>
 
-.if !defined(NOPORTDOCS)
-DISTFILES+=	${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}
-.endif
+#.if !defined(NOPORTDOCS)
+#DISTFILES+=	${PORTNAME}-doc-${PORTVERSION}${EXTRACT_SUFX}
+#.endif
 
 .if !defined(WITHOUT_ICONV)
 LIB_DEPENDS+=   iconv.3:${PORTSDIR}/converters/libiconv
@@ -51,7 +51,16 @@
 #CONFIGURE_ARGS+=--without-ext2fs
 #.endif
 
+.if defined(WITH_NTFS3G)
+LIB_DEPENDS+=	ntfs-3g.81:${PORTSDIR}/sysutils/fusefs-ntfs
+.else
+CONFIGURE_ARGS+=--without-ntfs3g
+.endif
+
 .if defined(WITH_NTFSPROGS)
+.if defined(WITH_NTFS3G)
+IGNORE=	WITH_NTFSPROGS does not work if WITH_NTFS3G is defined
+.endif
 LIB_DEPENDS+=	ntfs.10:${PORTSDIR}/sysutils/ntfsprogs
 .else
 CONFIGURE_ARGS+=--without-ntfs
@@ -66,6 +75,7 @@
 post-patch:
 .if !defined(NOPORTDOCS)
 	@${REINPLACE_CMD} -e 's|/doc/.(PACKAGE)-.(VERSION)|/doc/${PORTNAME}|' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e '/doc\/testdisk\/html/d' ${WRKSRC}/Makefile.in
 .else
 	@${REINPLACE_CMD} -e '/\/doc\/$$(PACKAGE)-$$(VERSION)/d' ${WRKSRC}/Makefile.in
 .endif
diff -u sysutils/testdisk/distinfo.orig sysutils/testdisk/distinfo
--- sysutils/testdisk/distinfo.orig	2011-03-19 12:33:27.000000000 +0000
+++ sysutils/testdisk/distinfo	2011-07-10 21:22:33.000000000 +0000
@@ -1,4 +1,2 @@
-SHA256 (testdisk-6.11.tar.bz2) = 1d49183063f811ab968658235252cfc3b623faa6188b8e4d6ff8c20e79564075
-SIZE (testdisk-6.11.tar.bz2) = 1553183
-SHA256 (testdisk-doc-6.11.tar.bz2) = 591f2bce1745f8f3e4f2b2cec0bc78700b2b17e01a9adf4361f873a365906201
-SIZE (testdisk-doc-6.11.tar.bz2) = 2953596
+SHA256 (testdisk-6.12.tar.bz2) = bdfbe679146518a1321d64f512d6ec8980ac3a9f2296ef27a46c7743d0f9ea16
+SIZE (testdisk-6.12.tar.bz2) = 554633


>Release-Note:
>Audit-Trail:
>Unformatted: