Update sysutils/testdisk to testdisk-6.14.

from Leonardo Taccari per PR pkg/48189

Changes:
General Improvements
====================
     * The log file generated by the Windows version (cygwin) reports bad
       sectors in a more readable fashion, example
         ReadFile Data error (cyclic redundancy check).
     * As openssl isn't used, don't link with this cryptographic library
       (Debian tries to avoid mixing GPL code and openssl)

TestDisk
========
Improvements
------------
     * testdisk /list now displays the disk model, serial number, firmware
       version and hpa or dco presence if detected
     * Recover WBFS (Wii Backup File System) partition
     * Make FAT RebuildBS works when there is a single FAT table
     * Interface: Display the partition table type if autodetected
     * Interface: modified warning about mismatching geometry between FAT
       or NTFS boot sector and HD geometry information (Debian #651756)
     * Interface: Remove "Allow partial last cylinder" option

Bug fixes
---------
     * Fix crc in EFI backup GPT
     * Rewrote how TestDisk aligns partition on cylinder or 1MB boundary.
       It avoids to create partition entry where the partition ends after
       the end of the disk.

PhotoRec
========
Improvements
------------
     * Improve Olympus .orf recovery
     * Improve WP Mac/WP5/WP6 Corel Documents .wpd files recovery
     * Fix thumbs.db recovery, avoid some false positive with .doc
     * Interface: if less than 10 file families are enabled, display the
       results even if zero has been found yet

   New file formats:
     * .aep After Effects
     * .axx AxCrypt
     * .dp Designer, a Photobook Designer Software
     * .lzh archive
     * .mmap MindManager
     * .plt Gerber Graphix Advantage
     * .prproj Adobe Premiere project
     * .psb Adobe Photoshop Image
     * .pts PTGui, panoramic stitching software
     * .qcp The QCP File Format and Media Types for Speech Data (RFC3625)
     * .shn Shorten audio file
     * .snt Windows Sticky Notes
     * .ttd TinyTag Data
     * .wallet Armory bitcoin wallet
     * .wim Windows imaging (WIM) image

Bug fixes
---------
     * Fix an endless loop during .caf file recovery
     * Fix tiff recovery including some raw file formats, 64-bit version
       wasn't affected

5 files changed, 31 insertions, 37 deletions

diff --git a/sysutils/testdisk/DESCR b/sysutils/testdisk/DESCR
index d4ccb2bc2e6..d38cc1aeb00 100644
--- a/sysutils/testdisk/DESCR
+++ b/sysutils/testdisk/DESCR
@@ -1,25 +1,17 @@
-Tool to check and undelete partitions.
+Disk is powerful free data recovery software! It was primarily designed
+to help recover lost partitions and/or make non-booting disks bootable
+again when these symptoms are caused by faulty software, certain types of
+viruses or human error (such as accidentally deleting a Partition Table).
+Partition table recovery using TestDisk is really easy.
 
-Supported filesystems:
-- BeFS ( BeOS )
-- BSD disklabel ( FreeBSD/OpenBSD/NetBSD )
-- CramFS (Compressed File System)
-- DOS/Windows FAT12, FAT16 and FAT32
-- Windows exFAT
-- HFS, Hierarchical File System
-- JFS, IBM's Journaled File System
-- Linux Ext2 and Ext3
-- Linux Raid
-- Linux Swap (versions 1 and 2)
-- LVM and LVM2, Linux Logical Volume Manager
-- Netware NSS
-- NTFS ( Windows NT/2K/XP/2003 )
-- ReiserFS 3.5 and 3.6
-- UFS (Sun/BSD/...)
-- XFS, SGI's Journaled File System
-
-Known to work on:
-* DOS/Win9x/NT4/2k/XP/2k3
-* GNU/Linux
-* FreeBSD, NetBSD, OpenBSD
-* Sun Solaris (minimal support)
+TestDisk can
+ * Fix partition table, recover deleted partition
+ * Recover FAT32 boot sector from its backup
+ * Rebuild FAT12/FAT16/FAT32 boot sector
+ * Fix FAT tables
+ * Rebuild NTFS boot sector
+ * Recover NTFS boot sector from its backup
+ * Fix MFT using MFT mirror
+ * Locate ext2/ext3/ext4 Backup SuperBlock
+ * Undelete files from FAT, exFAT, NTFS and ext2 filesystem
+ * Copy files from deleted FAT, exFAT, NTFS and ext2/ext3/ext4 partitions.
diff --git a/sysutils/testdisk/Makefile b/sysutils/testdisk/Makefile
index c2119e9f608..b67be0b88d3 100644
--- a/sysutils/testdisk/Makefile
+++ b/sysutils/testdisk/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2013/05/04 13:16:40 dsainty Exp $
+# $NetBSD: Makefile,v 1.7 2013/09/09 17:45:58 drochner Exp $
 #
 
-DISTNAME=		testdisk-6.13
-PKGREVISION=		2
+DISTNAME=		testdisk-6.14
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.cgsecurity.org/
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/testdisk/PLIST b/sysutils/testdisk/PLIST
index 912aca64255..bbb33d67a5e 100644
--- a/sysutils/testdisk/PLIST
+++ b/sysutils/testdisk/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/07/04 17:58:31 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2013/09/09 17:45:58 drochner Exp $
 bin/fidentify
 bin/photorec
 bin/testdisk
@@ -10,4 +10,4 @@ share/doc/${PKGNAME}/ChangeLog
 share/doc/${PKGNAME}/NEWS
 share/doc/${PKGNAME}/README
 share/doc/${PKGNAME}/THANKS
-@pkgdir share/doc/${PKGNAME}/html
+share/doc/${PKGNAME}/documentation.html
diff --git a/sysutils/testdisk/distinfo b/sysutils/testdisk/distinfo
index 87d6c9ff8c2..d332c26124e 100644
--- a/sysutils/testdisk/distinfo
+++ b/sysutils/testdisk/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1 2012/07/04 17:58:31 drochner Exp $
+$NetBSD: distinfo,v 1.2 2013/09/09 17:45:58 drochner Exp $
 
-SHA1 (testdisk-6.13.tar.bz2) = b08ace0257e3e437b6fc140360d75807ca4d46ae
-RMD160 (testdisk-6.13.tar.bz2) = 9ff09fdcc53a02240b4e22365193eac14a7d5e13
-Size (testdisk-6.13.tar.bz2) = 560696 bytes
-SHA1 (patch-aa) = 05e401608dd426bd780475e3b515e5677ab1ccc5
+SHA1 (testdisk-6.14.tar.bz2) = a2359406db5e3e3f9db81d8e8fce2a125dcc3677
+RMD160 (testdisk-6.14.tar.bz2) = b1ba7d714da496216e16a942045f0f6e32554d8b
+Size (testdisk-6.14.tar.bz2) = 620077 bytes
+SHA1 (patch-aa) = 76105a444a099435f75bf230292742a92fdc6722
diff --git a/sysutils/testdisk/patches/patch-aa b/sysutils/testdisk/patches/patch-aa
index c7a1d2b6beb..2fda49f3a9b 100644
--- a/sysutils/testdisk/patches/patch-aa
+++ b/sysutils/testdisk/patches/patch-aa
@@ -1,6 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2012/07/04 17:58:31 drochner Exp $
+$NetBSD: patch-aa,v 1.2 2013/09/09 17:45:58 drochner Exp $
 
---- src/intrfn.h.orig	2010-10-18 06:25:15.000000000 +0000
+stdarg(3) is required by various functions that can be called with variable
+argument lists.
+
+--- src/intrfn.h.orig	2013-05-17 09:34:03.000000000 +0000
 +++ src/intrfn.h
 @@ -39,6 +39,8 @@ extern "C" {
  #include <curses.h>
@@ -10,4 +13,4 @@ $NetBSD: patch-aa,v 1.1 2012/07/04 17:58:31 drochner Exp $
 +
  void aff_copy(WINDOW *window);
  void aff_copy_short(WINDOW *window);
- void aff_part(WINDOW *window, const unsigned int newline, const disk_t *disk_car, const partition_t *partition);
+ void aff_LBA2CHS(const disk_t *disk_car, const unsigned long int pos_LBA);