sleuthkit:

- update to 4.1.2
- convert to STAGEDIR

py-pytsk:
- bump PORTREVISION for libtsk update
- convert to STAGEDIR

4 files changed, 37 insertions, 18 deletions

diff --git a/sysutils/py-pytsk/Makefile b/sysutils/py-pytsk/Makefile
index f4d78e78a897..9b848eb9db84 100644
--- a/sysutils/py-pytsk/Makefile
+++ b/sysutils/py-pytsk/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	pytsk
 DISTVERSION=	2013-09-10
+PORTREVISION=	1
 CATEGORIES=	sysutils security devel python
 MASTER_SITES=	GOOGLE_CODE
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -22,7 +23,6 @@ USE_PYDISTUTILS=yes
 PYDISTUTILS_PKGNAME=pytsk3
 PYDISTUTILS_PKGVERSION=0.1
 
-NO_STAGE=	yes
 post-patch:
 	${REINPLACE_CMD} -e '/socket\.h/ { h; s|socket|types|; G; }' ${WRKSRC}/misc.h
 	${REINPLACE_CMD} -e 's|/usr/local/include/tsk/|${LOCALBASE}/include/tsk/|' \
@@ -44,12 +44,12 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 .if ${PORT_OPTIONS:MEXAMPLES}
-	@${MKDIR} ${EXAMPLESDIR}
-	${INSTALL_DATA} ${WRKSRC}/samples/*.py ${EXAMPLESDIR}
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	${INSTALL_DATA} ${WRKSRC}/samples/*.py ${STAGEDIR}${EXAMPLESDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index cde3647f55a1..9d144d983454 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	sleuthkit
-PORTVERSION=	4.1.0
+PORTVERSION=	4.1.2
 CATEGORIES=	sysutils security
 MASTER_SITES=	SF
 
@@ -27,14 +27,8 @@ GNU_CONFIGURE=	yes
 USES=		perl5
 USE_LDCONFIG=	yes
 DATADIR=	${PREFIX}/share/tsk
-CPPFLAGS+=	-I${LOCALBASE}/include
 
 PORTDOCS=	NEWS.txt README.txt
-MAN1=		blkcalc.1 blkcat.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 \
-		tsk_comparedir.1 tsk_gettimes.1 tsk_loaddb.1 tsk_recover.1
 
 OPTIONS_DEFINE=	DOCS LIBEWF
 LIBEWF_DESC=	Build with EWF support
@@ -44,13 +38,12 @@ LIBEWF_LIB_DEPENDS=	libewf.so:${PORTSDIR}/devel/libewf
 LIBEWF_CONFIGURE_ON=	--with-libewf=${LOCALBASE}
 LIBEWF_CONFIGURE_OFF=	--without-libewf
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 .endif
 
 .include <bsd.port.mk>
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index 6de06b128607..59af4b1be85b 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sleuthkit-4.1.0.tar.gz) = b410428df2e1b253fa23ce6a299d059d8c2650bf9c602f7b80c0f4ce1368c36a
-SIZE (sleuthkit-4.1.0.tar.gz) = 7974564
+SHA256 (sleuthkit-4.1.2.tar.gz) = 58253b35c016083558fb581308f4a3baf884229de89eb84ddbfb977ed56600d3
+SIZE (sleuthkit-4.1.2.tar.gz) = 7990136
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index 0c624c22c282..50f121ee44bc 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -52,7 +52,33 @@ include/tsk/vs/tsk_vs.h
 lib/libtsk.a
 lib/libtsk.la
 lib/libtsk.so
-lib/libtsk.so.10
+lib/libtsk.so.11
+man/man1/blkcalc.1.gz
+man/man1/blkcat.1.gz
+man/man1/blkls.1.gz
+man/man1/blkstat.1.gz
+man/man1/ffind.1.gz
+man/man1/fls.1.gz
+man/man1/fsstat.1.gz
+man/man1/hfind.1.gz
+man/man1/icat.1.gz
+man/man1/ifind.1.gz
+man/man1/ils.1.gz
+man/man1/img_cat.1.gz
+man/man1/img_stat.1.gz
+man/man1/istat.1.gz
+man/man1/jcat.1.gz
+man/man1/jls.1.gz
+man/man1/mactime.1.gz
+man/man1/mmcat.1.gz
+man/man1/mmls.1.gz
+man/man1/mmstat.1.gz
+man/man1/sigfind.1.gz
+man/man1/sorter.1.gz
+man/man1/tsk_comparedir.1.gz
+man/man1/tsk_gettimes.1.gz
+man/man1/tsk_loaddb.1.gz
+man/man1/tsk_recover.1.gz
 %%DATADIR%%/sorter/default.sort
 %%DATADIR%%/sorter/freebsd.sort
 %%DATADIR%%/sorter/images.sort