3 files changed, 44 insertions, 49 deletions

diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 6c3edbbd3ee9..9eb49d0a9c1d 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -6,32 +6,27 @@
 #
 
 PORTNAME=	sleuthkit
-PORTVERSION=	2.52
+PORTVERSION=	3.0.1
 CATEGORIES=	sysutils security
 MASTER_SITES=	SF
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	The @stake Sleuth Kit for forensic analysis
 
-RUN_DEPENDS=	${SITE_PERL}/Date/Manip.pm:${PORTSDIR}/devel/p5-Date-Manip
-
 CONFLICTS=	ja-ls-[0-9]*
 
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
-DATADIR=	${PREFIX}/share/tsk
+USE_LDCONFIG=	yes
+DATADIR=	${PREFIX}/share/tsk3
 
 DOCS=		CHANGES.txt README.txt docs/*.txt
-MAN1=		disk_sreset.1 disk_stat.1 dls.1 dstat.1 fls.1 fsstat.1 \
-		hfind.1 icat.1 ifind.1 img_cat.1 img_stat.1 istat.1 jcat.1 \
-		mactime.1 mmls.1 sigfind.1 mmstat.1 sorter.1 dcalc.1 dcat.1 \
-		ffind.1 ils.1 jls.1
+MAN1=		blkcalc.1 blkcat.1 disk_sreset.1 disk_stat.1 blkls.1 \
+		blkstat.1 ffind.1 fls.1 fsstat.1 hfind.1 icat.1 ifind.1 \
+		ils.1 img_cat.1 img_stat.1 istat.1 jcat.1 jls.1 mactime.1 \
+		mmls.1 mmstat.1 mmcat.1 sigfind.1 sorter.1
 
 post-patch:
-# Do not install own Date::Manip, use system-wide one
-	@${REINPLACE_CMD} -e 's,[[:graph:]]*Date[[:graph:]]*,,g' \
-		${WRKSRC}/Makefile.in
-	@${REINPLACE_CMD} '/use lib/d' ${WRKSRC}/tools/timeline/Makefile.in
 	@${REINPLACE_CMD} -e 's|echo aout|echo elf|' ${WRKSRC}/configure
 
 post-install:
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index b41f5c6dfba3..95473fa2517e 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (sleuthkit-2.52.tar.gz) = 3f93bc77901ef40b8b3f2a7e482214a5
-SHA256 (sleuthkit-2.52.tar.gz) = d8944bb0053a301eaa33906c6bacc724014b3cb78dbcfe722efe8aaf1014029e
-SIZE (sleuthkit-2.52.tar.gz) = 819357
+MD5 (sleuthkit-3.0.1.tar.gz) = 55956dd3bbfa6c9e2ebcc685c2a9569d
+SHA256 (sleuthkit-3.0.1.tar.gz) = 70fac54c39f8631a6ecedc44b39395ddb3d17f9236d71d50bcbfabf5e8b60ddd
+SIZE (sleuthkit-3.0.1.tar.gz) = 814032
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index 6107010b094e..4fc1862262f0 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -1,9 +1,9 @@
-bin/dcalc
-bin/dcat
+bin/blkcalc
+bin/blkcat
+bin/blkls
+bin/blkstat
 bin/disk_sreset
 bin/disk_stat
-bin/dls
-bin/dstat
 bin/ffind
 bin/fls
 bin/fsstat
@@ -17,40 +17,41 @@ bin/istat
 bin/jcat
 bin/jls
 bin/mactime
+bin/mmcat
 bin/mmls
 bin/mmstat
 bin/sigfind
 bin/sorter
 bin/srch_strings
-include/tsk/base/tsk_base.h
-include/tsk/base/tsk_os.h
-include/tsk/fs/tsk_ext2fs.h
-include/tsk/fs/tsk_fatfs.h
-include/tsk/fs/tsk_ffs.h
-include/tsk/fs/tsk_fs.h
-include/tsk/fs/tsk_hfs.h
-include/tsk/fs/tsk_iso9660.h
-include/tsk/fs/tsk_ntfs.h
-include/tsk/hashdb/tsk_hashdb.h
-include/tsk/img/tsk_img.h
-include/tsk/vs/tsk_bsd.h
-include/tsk/vs/tsk_dos.h
-include/tsk/vs/tsk_gpt.h
-include/tsk/vs/tsk_mac.h
-include/tsk/vs/tsk_sun.h
-include/tsk/vs/tsk_vs.h
-include/tsk/libtsk.h
-include/tsk/tsk_incs.h
-@dirrm include/tsk/vs
-@dirrm include/tsk/img
-@dirrm include/tsk/hashdb
-@dirrm include/tsk/fs
-@dirrm include/tsk/base
-@dirrm include/tsk
-lib/libtsk.a
-lib/libtsk.la
-lib/libtsk.so
-lib/libtsk.so.1
+include/tsk3/base/tsk_base.h
+include/tsk3/base/tsk_os.h
+include/tsk3/fs/tsk_ext2fs.h
+include/tsk3/fs/tsk_fatfs.h
+include/tsk3/fs/tsk_ffs.h
+include/tsk3/fs/tsk_fs.h
+include/tsk3/fs/tsk_hfs.h
+include/tsk3/fs/tsk_iso9660.h
+include/tsk3/fs/tsk_ntfs.h
+include/tsk3/hashdb/tsk_hashdb.h
+include/tsk3/img/tsk_img.h
+include/tsk3/vs/tsk_bsd.h
+include/tsk3/vs/tsk_dos.h
+include/tsk3/vs/tsk_gpt.h
+include/tsk3/vs/tsk_mac.h
+include/tsk3/vs/tsk_sun.h
+include/tsk3/vs/tsk_vs.h
+include/tsk3/libtsk.h
+include/tsk3/tsk_incs.h
+@dirrm include/tsk3/vs
+@dirrm include/tsk3/img
+@dirrm include/tsk3/hashdb
+@dirrm include/tsk3/fs
+@dirrm include/tsk3/base
+@dirrm include/tsk3
+lib/libtsk3.a
+lib/libtsk3.la
+lib/libtsk3.so
+lib/libtsk3.so.4
 %%DATADIR%%/sorter/default.sort
 %%DATADIR%%/sorter/freebsd.sort
 %%DATADIR%%/sorter/images.sort
@@ -63,7 +64,6 @@ lib/libtsk.so.1
 %%PORTDOCS%%%%DOCSDIR%%/CHANGES.txt
 %%PORTDOCS%%%%DOCSDIR%%/README.txt
 %%PORTDOCS%%%%DOCSDIR%%/library-api.txt
-%%PORTDOCS%%%%DOCSDIR%%/nsrl.txt
 %%PORTDOCS%%%%DOCSDIR%%/other.txt
 %%PORTDOCS%%%%DOCSDIR%%/ref_fs.txt
 %%PORTDOCS%%%%DOCSDIR%%/ref_timeline.txt