- Update to version 1.73, which features many bugfixes and UFS2 support

- Teach about FreeBSD 6.X (and thus unbreak)
- Honor CC and CFLAGS
- Tidy up Makefile and pkg-plist (use DOCSDIR macro)
- Do not build file(1) since it's the base already (and the same version)

Approved by:	maintainer timeout

4 files changed, 64 insertions, 38 deletions

diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 7dae0ab5129b..8dddf92cc005 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	sleuthkit
-PORTVERSION=	1.64
+PORTVERSION=	1.73
 CATEGORIES=	sysutils security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -15,27 +15,36 @@ MAINTAINER=	opr@bsdaemon.be
 COMMENT=	The @stake Sleuth Kit for forensic analysis
 
 USE_PERL5=	yes
-DOCS=		README docs/* tct.docs/*
-MAN1=		dcalc.1 dcat.1 dls.1 dstat.1 ffind.1 \
-		fls.1 fsstat.1 hfind.1 icat.1 ifind.1 \
-		ils.1 istat.1 mactime.1 mmls.1 sorter.1
+USE_REINPLACE=	yes
 
-.include <bsd.port.pre.mk>
+PROGS=		dcalc dcat diskstat dls dstat ffind fls fsstat \
+		hfind icat ifind ils istat jcat jls md5 mmls sha1 \
+		sigfind sstrings
+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
 
-.if ${OSVERSION} >= 600000
-BROKEN=		"Does not build on FreeBSD >= 6.x"
-.endif
+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
+	@${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
 
 do-install:
 .if !defined(NOPORTDOCS)
-	${MKDIR} ${PREFIX}/share/doc/sleuthkit
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${PREFIX}/share/doc/sleuthkit
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/mactime ${PREFIX}/bin
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/sorter ${PREFIX}/bin
-	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} dcalc dcat dls dstat ffind \
-		fls fsstat hfind icat ifind ils \
-		istat sha1 mmls file md5 ${PREFIX}/bin
+	cd ${WRKSRC}/bin && ${INSTALL_PROGRAM} ${PROGS} ${PREFIX}/bin
+	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} ${SCRIPTS} ${PREFIX}/bin
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index ff057b8e862c..7480a753cc97 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,2 +1,2 @@
-MD5 (sleuthkit-1.64.tar.gz) = 12e01373f06ec3dcf73283fca64b30d4
-SIZE (sleuthkit-1.64.tar.gz) = 517652
+MD5 (sleuthkit-1.73.tar.gz) = 773c48dd05caa0262d72015498fd92ce
+SIZE (sleuthkit-1.73.tar.gz) = 727263
diff --git a/sysutils/sleuthkit/files/patch-src::makedefs b/sysutils/sleuthkit/files/patch-src::makedefs
new file mode 100644
index 000000000000..b3cd7382775f
--- /dev/null
+++ b/sysutils/sleuthkit/files/patch-src::makedefs
@@ -0,0 +1,11 @@
+--- src/makedefs.orig	Wed Jan 19 16:16:07 2005
++++ src/makedefs	Wed Jan 19 16:16:17 2005
+@@ -10,6 +10,8 @@
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
+                 ;;
++  FreeBSD.6*)   DEFS="-DFREEBSD6"
++                ;;
+   NetBSD.1.6*)   DEFS="-DNETBSD16"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index dbe6ddb51c20..38dc584ad664 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -1,31 +1,37 @@
-bin/md5
-bin/file
-bin/mactime
 bin/dcalc
 bin/dcat
+bin/diskstat
 bin/dls
 bin/dstat
 bin/ffind
-bin/icat
 bin/fls
 bin/fsstat
+bin/hfind
+bin/icat
 bin/ifind
 bin/ils
 bin/istat
-bin/sha1
+bin/jcat
+bin/jls
+bin/mactime
+bin/md5
 bin/mmls
+bin/sha1
+bin/sigfind
 bin/sorter
-bin/hfind
-%%PORTDOCS%%share/doc/sleuthkit/README
-%%PORTDOCS%%share/doc/sleuthkit/CHANGES.FROM.TCT
-%%PORTDOCS%%share/doc/sleuthkit/README.FIRST
-%%PORTDOCS%%share/doc/sleuthkit/additional-resources
-%%PORTDOCS%%share/doc/sleuthkit/bibliography
-%%PORTDOCS%%share/doc/sleuthkit/help-recovering-file
-%%PORTDOCS%%share/doc/sleuthkit/help-when-broken-into
-%%PORTDOCS%%share/doc/sleuthkit/other.txt
-%%PORTDOCS%%share/doc/sleuthkit/ref_fs.txt
-%%PORTDOCS%%share/doc/sleuthkit/ref_timeline.txt
-%%PORTDOCS%%share/doc/sleuthkit/skins_fat.txt
-%%PORTDOCS%%share/doc/sleuthkit/skins_ntfs.txt
-%%PORTDOCS%%@dirrm share/doc/sleuthkit
+bin/sstrings
+%%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
+%%PORTDOCS%%%%DOCSDIR%%/ref_timeline.txt
+%%PORTDOCS%%%%DOCSDIR%%/skins_fat.txt
+%%PORTDOCS%%%%DOCSDIR%%/skins_ntfs.txt
+%%PORTDOCS%%@dirrm %%DOCSDIR%%