Update to 2.00.

Major Updates:
- Support for split and disk images
- File system type can be detected (-f no longer required)
- New file system type names (for -f)
- Updated internal design
- New 'img_stat' tool to display details about the image file format
- New 'mmls' flag (-b) to print sizes in bytes
- New 'mmstat' tool to give details about the volume (media
  management) system
- Non-printable charactors in UFS/ExtX names are replaced with '.'
- New Linux 'disk_sreset' tool to reset HPA on an ATA disk
- Renamed 'diskstat' to 'disk_stat' and 'sstrings' to 'srch_strings'
  to make names less cryptic

Minor Bug Fixes:
- NTFS could go into an infinite loop if attribute list entry was
  reallocated
- Last block group in ExtX fsstat output had incorrect percentage
  of free blocks
- FreeBSD 5.x would produce incorrect 'icat' output for Ext2/3 and
  UFS1 images because it used a 64-bit on-disk address

Approved by:	maintainer timeout

3 files changed, 21 insertions, 23 deletions

diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 8f180c4f3f83..000fb20c8fdd 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sleuthkit
-PORTVERSION=	1.73
+PORTVERSION=	2.00
 CATEGORIES=	sysutils security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -17,26 +17,27 @@ COMMENT=	The @stake Sleuth Kit for forensic analysis
 USE_PERL5=	yes
 USE_REINPLACE=	yes
 
-PROGS=		dcalc dcat diskstat dls dstat ffind fls fsstat \
-		hfind icat ifind ils istat jcat jls md5 mmls sha1 \
-		sigfind sstrings
+PROGS=		dcalc dcat disk_sreset disk_stat dls dstat ffind \
+		fls fsstat hfind icat ifind ils img_stat istat \
+		jcat jls md5 mmls mmstat sha1 sigfind srch_strings
 SCRIPTS=	mactime sorter
-DOCS=		README.txt docs/* tct.docs/*
-MAN1=		dcalc.1 dcat.1 diskstat.1 dls.1 dstat.1 ffind.1 \
-		fls.1 fsstat.1 hfind.1 icat.1 ifind.1 ils.1 istat.1 \
-		jcat.1 jls.1 mactime.1 mmls.1 sigfind.1 sorter.1
+DOCS=		CHANGES.txt README.txt docs/*
+MAN1=		dcalc.1 dcat.1 disk_sreset.1 disk_stat.1 dls.1 \
+		dstat.1 ffind.1 fls.1 fsstat.1 hfind.1 icat.1 ifind.1 \
+		ils.1 img_stat.1 istat.1 jcat.1 jls.1 mactime.1 mmls.1 \
+		sigfind.1 sorter.1
 
 post-patch:
 	@${REINPLACE_CMD} -e 's/BSD5)$$/BSD5) || defined(FREEBSD6)/' \
-		${WRKSRC}/src/fstools/fs_os.h ${WRKSRC}/src/mmtools/mm_tools.h \
-		${WRKSRC}/src/srchtools/srch_os.h
+		${WRKSRC}/src/misc/tsk_os.h
 	@${REINPLACE_CMD} -E -e 's/^CC[[:space:]]*=/CC \?=/' \
 		-e 's/[[:space:]]+file test[[:space:]]*$$//' ${WRKSRC}/Makefile
 	@${REINPLACE_CMD} -e '/^CC[[:space:]]*=/d' -e 's/\$$(OPT) \$$(DEBUG)//' \
 		-e 's/^CFLAGS[[:space:]]*=/CFLAGS \+=/' \
 		${WRKSRC}/src/disktools/Makefile ${WRKSRC}/src/fstools/Makefile \
-		${WRKSRC}/src/hashtools/Makefile ${WRKSRC}/src/misc/Makefile \
-		${WRKSRC}/src/mmtools/Makefile ${WRKSRC}/src/srchtools/Makefile
+		${WRKSRC}/src/hashtools/Makefile ${WRKSRC}/src/imgtools/Makefile \
+		${WRKSRC}/src/misc/Makefile ${WRKSRC}/src/mmtools/Makefile \
+		${WRKSRC}/src/srchtools/Makefile
 
 do-install:
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index 7480a753cc97..0e4827e7b2be 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,2 +1,2 @@
-MD5 (sleuthkit-1.73.tar.gz) = 773c48dd05caa0262d72015498fd92ce
-SIZE (sleuthkit-1.73.tar.gz) = 727263
+MD5 (sleuthkit-2.00.tar.gz) = 757f76f245493ebff2d0daeb64f37b5d
+SIZE (sleuthkit-2.00.tar.gz) = 766498
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index 38dc584ad664..71a6978112b7 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -1,6 +1,7 @@
 bin/dcalc
 bin/dcat
-bin/diskstat
+bin/disk_sreset
+bin/disk_stat
 bin/dls
 bin/dstat
 bin/ffind
@@ -10,24 +11,20 @@ bin/hfind
 bin/icat
 bin/ifind
 bin/ils
+bin/img_stat
 bin/istat
 bin/jcat
 bin/jls
 bin/mactime
 bin/md5
 bin/mmls
+bin/mmstat
 bin/sha1
 bin/sigfind
 bin/sorter
-bin/sstrings
+bin/srch_strings
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES.FROM.TCT
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
-%%PORTDOCS%%%%DOCSDIR%%/additional-resources
-%%PORTDOCS%%%%DOCSDIR%%/bibliography
-%%PORTDOCS%%%%DOCSDIR%%/help-recovering-file
-%%PORTDOCS%%%%DOCSDIR%%/help-when-broken-into
 %%PORTDOCS%%%%DOCSDIR%%/nsrl.txt
 %%PORTDOCS%%%%DOCSDIR%%/other.txt
 %%PORTDOCS%%%%DOCSDIR%%/ref_fs.txt