Update the sleuthkit to 4.1.0

New Features:

    Added YAFFS2 support (patch from viaForensics).
    Added Ext4 support (patch from kfairbanks)

4 files changed, 42 insertions, 38 deletions

diff --git a/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index 43c78c5a2366..422d0443cfc6 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pytsk
 DISTVERSION=	2012-11-10
+PORTREVISION=	1
 CATEGORIES=	sysutils security devel python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -13,7 +14,7 @@ COMMENT=	Python bindings for the Sleuthkit
 
 LICENSE=	AL2
 
-LIB_DEPENDS=	tsk3:${PORTSDIR}/sysutils/sleuthkit
+LIB_DEPENDS=	tsk:${PORTSDIR}/sysutils/sleuthkit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
@@ -24,10 +25,12 @@ PYDISTUTILS_PKGVERSION=0.1
 
 post-patch:
 	${REINPLACE_CMD} -e '/socket\.h/ { h; s|socket|types|; G; }' ${WRKSRC}/misc.h
-	${REINPLACE_CMD} -e 's|/usr/include/tsk3/|${LOCALBASE}/include/tsk3/|' \
+	${REINPLACE_CMD} -e 's|/usr/include/tsk3/|${LOCALBASE}/include/tsk/|' \
 		-e "s|LIBRARY_DIRS = \[\]|LIBRARY_DIRS = ['${LOCALBASE}/lib/']|" \
+		-e "s|LIBRARIES = \['tsk3'|LIBRARIES = ['tsk'|" \
 		-e "s|= \[CONFIG\['TSK3_HEADER_LOCATION'\]\]|= ['${LOCALBASE}/include/']|" \
 		${WRKSRC}/setup.py
+	${REINPLACE_CMD} 's|tsk3/libtsk|tsk/libtsk|' ${WRKSRC}/tsk3.h
 
 DOCSDIR=	${PREFIX}/share/doc/py-${PORTNAME}
 PORTDOCS=	LICENSE README
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 62c9fcadd48f..1374e0985975 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sleuthkit
-PORTVERSION=	4.0.2
+PORTVERSION=	4.1.0
 CATEGORIES=	sysutils security
 MASTER_SITES=	SF
 
@@ -17,7 +17,7 @@ CONFLICTS=	ja-ls-[0-9]* icat-[0-9]*
 GNU_CONFIGURE=	yes
 USE_PERL5=	yes
 USE_LDCONFIG=	yes
-DATADIR=	${PREFIX}/share/tsk3
+DATADIR=	${PREFIX}/share/tsk
 CPPFLAGS+=	-I${LOCALBASE}/include
 
 PORTDOCS=	NEWS.txt README.txt
@@ -43,7 +43,7 @@ CONFIGURE_ARGS+=	--without-libewf
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index 512352f9d740..6de06b128607 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.0.2.tar.gz) = 112f80fbc6a868c18c7a924f756b35c79eed9d0cc8923a4f973646f00e546e62
-SIZE (sleuthkit-4.0.2.tar.gz) = 7577570
+SHA256 (sleuthkit-4.1.0.tar.gz) = b410428df2e1b253fa23ce6a299d059d8c2650bf9c602f7b80c0f4ce1368c36a
+SIZE (sleuthkit-4.1.0.tar.gz) = 7974564
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index 7a8a68e09de0..0c624c22c282 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -28,30 +28,31 @@ bin/tsk_comparedir
 bin/tsk_gettimes
 bin/tsk_loaddb
 bin/tsk_recover
-include/tsk3/auto/tsk_auto.h
-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/libtsk.h
-include/tsk3/tsk_incs.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
-lib/libtsk3.a
-lib/libtsk3.la
-lib/libtsk3.so
-lib/libtsk3.so.9
+include/tsk/auto/tsk_auto.h
+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/fs/tsk_yaffs.h
+include/tsk/hashdb/tsk_hashdb.h
+include/tsk/img/tsk_img.h
+include/tsk/libtsk.h
+include/tsk/tsk_incs.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
+lib/libtsk.a
+lib/libtsk.la
+lib/libtsk.so
+lib/libtsk.so.10
 %%DATADIR%%/sorter/default.sort
 %%DATADIR%%/sorter/freebsd.sort
 %%DATADIR%%/sorter/images.sort
@@ -59,12 +60,12 @@ lib/libtsk3.so.9
 %%DATADIR%%/sorter/openbsd.sort
 %%DATADIR%%/sorter/solaris.sort
 %%DATADIR%%/sorter/windows.sort
-@dirrm include/tsk3/vs
-@dirrm include/tsk3/img
-@dirrm include/tsk3/hashdb
-@dirrm include/tsk3/fs
-@dirrm include/tsk3/base
-@dirrm include/tsk3/auto
-@dirrm include/tsk3
+@dirrm include/tsk/vs
+@dirrm include/tsk/img
+@dirrm include/tsk/hashdb
+@dirrm include/tsk/fs
+@dirrm include/tsk/base
+@dirrm include/tsk/auto
+@dirrm include/tsk
 @dirrm %%DATADIR%%/sorter
 @dirrm %%DATADIR%%