- Update to version 2.51

- Use SF macro

6 files changed, 58 insertions, 234 deletions

diff --git a/sysutils/sleuthkit/Makefile b/sysutils/sleuthkit/Makefile
index 089fb4abe5c3..7a4258a17bdf 100644
--- a/sysutils/sleuthkit/Makefile
+++ b/sysutils/sleuthkit/Makefile
@@ -6,10 +6,9 @@
 #
 
 PORTNAME=	sleuthkit
-PORTVERSION=	2.10
+PORTVERSION=	2.51
 CATEGORIES=	sysutils security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	The @stake Sleuth Kit for forensic analysis
@@ -18,7 +17,9 @@ 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
 
 .include <bsd.port.pre.mk>
 
@@ -26,41 +27,22 @@ USE_PERL5=	yes
 BROKEN=		Does not build on pre-GEOM versions of FreeBSD
 .endif
 
-PROGS=		dcalc dcat disk_sreset disk_stat dls dstat ffind \
-		fls fsstat hfind icat ifind ils img_cat img_stat istat \
-		jcat jls md5 mmls mmstat sha1 sigfind srch_strings
-SCRIPTS=	mactime sorter
-DOCS=		CHANGES.txt README.txt docs/*.txt docs/api-doc/*
-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_cat.1 img_stat.1 istat.1 jcat.1 jls.1 mactime.1 \
-		mmls.1 sigfind.1 sorter.1
+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
 
-post-patch:
-	@${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/imgtools/Makefile \
-		${WRKSRC}/src/auxtools/Makefile \
-		${WRKSRC}/src/mmtools/Makefile \
-		${WRKSRC}/src/srchtools/Makefile
-	@${REINPLACE_CMD} -e 's/$${BIN_DIR}file/\/usr\/bin\/file/' \
-		${WRKSRC}/src/sorter/sorter.base
+post-extract:
+# 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
 
-do-install:
+post-install:
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}/api-doc
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS:M*.txt} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS:N*.txt} ${DOCSDIR}/api-doc
+	@${MKDIR} ${DOCSDIR}
+	cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR}
 .endif
-	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>
diff --git a/sysutils/sleuthkit/distinfo b/sysutils/sleuthkit/distinfo
index aff8e472515f..7525e89f3264 100644
--- a/sysutils/sleuthkit/distinfo
+++ b/sysutils/sleuthkit/distinfo
@@ -1,3 +1,3 @@
-MD5 (sleuthkit-2.10.tar.gz) = 51fac95bdb8733015818e67e23746039
-SHA256 (sleuthkit-2.10.tar.gz) = d0475a69f0b653ebef62ea327334f4d8368b8d383f84f8b4e63766779939d2ef
-SIZE (sleuthkit-2.10.tar.gz) = 3178527
+MD5 (sleuthkit-2.51.tar.gz) = 14deefc44bc31787fc99fc239124f70b
+SHA256 (sleuthkit-2.51.tar.gz) = 95908a714855c7fdfbfb26fd3016f5e6978f1730f003d9cebdeecee66bc7fedc
+SIZE (sleuthkit-2.51.tar.gz) = 817416
diff --git a/sysutils/sleuthkit/files/patch-src::makedefs b/sysutils/sleuthkit/files/patch-src::makedefs
deleted file mode 100644
index 6b9fab022d70..000000000000
--- a/sysutils/sleuthkit/files/patch-src::makedefs
+++ /dev/null
@@ -1,13 +0,0 @@
---- src/makedefs.orig	Wed Jan 19 16:16:07 2005
-+++ src/makedefs	Wed Jan 19 16:16:17 2005
-@@ -10,9 +10,7 @@
-                   ;;
-     FreeBSD.4*)   DEFS="-DFREEBSD4"
-                   ;;
--    FreeBSD.5*)   DEFS="-DFREEBSD5"
--                  ;;
--    FreeBSD.6*)   DEFS="-DFREEBSD5"
-+    FreeBSD.[5-8]*)   DEFS="-DFREEBSD5"
-                   ;;
-    NetBSD.[1-2]*)   DEFS="-DNETBSD16"
-                   ;;
diff --git a/sysutils/sleuthkit/files/patch-src::sorter::install b/sysutils/sleuthkit/files/patch-src::sorter::install
deleted file mode 100644
index c09196830f62..000000000000
--- a/sysutils/sleuthkit/files/patch-src::sorter::install
+++ /dev/null
@@ -1,20 +0,0 @@
---- src/sorter/install.orig	Mon Sep  8 04:18:36 2003
-+++ src/sorter/install	Mon Sep  8 04:19:01 2003
-@@ -6,7 +6,7 @@
- 
- 
- # Directories to search in
--dirs='/usr/local/bin/ /usr/bin/ /usr/ccs/bin/ /bin/ /usr/ucb/bin/ /sbin/ /usr/sbin/ /usr/local/sbin/ /usr/pkg/bin/'
-+dirs="${LOCALBASE}/bin/ /usr/bin/ /usr/ccs/bin/ /bin/ /usr/ucb/bin/ /sbin/ /usr/sbin/ ${LOCALBASE}/sbin/ /usr/pkg/bin/"
- 
- # Find Perl
- found=0;
-@@ -58,7 +58,7 @@
-   done
- fi
- 
--echo "my \$SK_DIR=\"`cd ../..; pwd`/\";" >> $BIN_DIR$PROG;
-+echo "my \$SK_DIR=\"${PREFIX}\";" >> $BIN_DIR$PROG;
- 
- # Print the current version
- echo "my \$VER = \"`cat ../../patchlevel`\";" >> $BIN_DIR$PROG;
diff --git a/sysutils/sleuthkit/files/patch-src::timeline::config-perl b/sysutils/sleuthkit/files/patch-src::timeline::config-perl
deleted file mode 100644
index adeeab0a5631..000000000000
--- a/sysutils/sleuthkit/files/patch-src::timeline::config-perl
+++ /dev/null
@@ -1,27 +0,0 @@
---- src/timeline/config-perl.orig	Mon Sep  8 04:19:18 2003
-+++ src/timeline/config-perl	Mon Sep  8 04:19:36 2003
-@@ -6,7 +6,7 @@
- 
- 
- # Directories to search in
--dirs='/usr/local/bin/ /usr/bin/ /usr/ccs/bin/ /bin/ /usr/ucb/bin/ /sbin/ /usr/sbin/ /usr/local/sbin/ /usr/pkg/bin/'
-+dirs="${LOCALBASE}/bin/ /usr/bin/ /usr/ccs/bin/ /bin/ /usr/ucb/bin/ /sbin/ /usr/sbin/ ${LOCALBASE}/sbin/ /usr/pkg/bin/"
- 
- # Find Perl
- found=0;
-@@ -57,15 +57,6 @@
-       echo "file not found";
-     fi
-   done
--fi
--
--
--# Print the installed location of the lib directory
--# This is not the best fix, but it works
--if (test -z "`echo "$PWD" | awk '/\/src\/timeline/ {print $0}'`") then
--  echo "use lib '$PWD/$LIB_DIR_NORM';" >> $BIN_DIR$PROG;
--else
--  echo "use lib '$PWD/$LIB_DIR_BACK';" >> $BIN_DIR$PROG;
- fi
- 
- 
diff --git a/sysutils/sleuthkit/pkg-plist b/sysutils/sleuthkit/pkg-plist
index 096712e04bc6..1432764fefd8 100644
--- a/sysutils/sleuthkit/pkg-plist
+++ b/sysutils/sleuthkit/pkg-plist
@@ -17,148 +17,51 @@ bin/istat
 bin/jcat
 bin/jls
 bin/mactime
-bin/md5
 bin/mmls
 bin/mmstat
-bin/sha1
 bin/sigfind
 bin/sorter
 bin/srch_strings
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/XGetopt_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/aff_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/aff_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/annotated.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/aux__tools_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/bsd_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/data__buf_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dcat__lib_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_000000.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_000001.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_000002.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_000003.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_000004.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_000005.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_051c45120da5e1b4245ae822964aa1a2.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_15ca2eee0316b138f740b1bae32c2978.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_2328469a5e465f20677a6e752a51effc.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_46c0e0e6ed86711e5e38b706d7cb710a.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_5e6370c840131e02554b27565e4201a5.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_73aa6487887b603f03e0e371114b3010.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_95152e013a0b8ec6ee731be47a6d465d.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_9f9ddfa1f65e349495a0403dc74b2c46.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_b35cab3ebf819a9c057a0846d587983f.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_b565774f45cfdb3d6481e7eca9165f6e.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_ea8a5e11dde5fb5258d39568ec6f0887.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dir_ec72098eea973d4b88807c3a6e8b34b6.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dirs.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/dos_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/doxygen.css
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/doxygen.png
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ewf_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ewf_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ext2fs_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ext2fs_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ext2fs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ext2fs__dent_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fatfs_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fatfs_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fatfs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fatfs__dent_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ffs_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ffs_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ffs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ffs__dent_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/files.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__data_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__inode_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__io_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__open_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__tools_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__tools_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__tools__i_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__tools__i_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/fs__types_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/functions.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/functions_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x66.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x68.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x69.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x6d.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x6e.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x70.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x72.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x73.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_0x74.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_defs.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_enum.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_eval.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_func.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/globals_vars.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/gpt_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hashdb__tools_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hashdb__tools_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hashdb__tools__i_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hashdb__tools__i_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hfind_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hfs_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hfs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/hk__index_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/idxonly__index_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ils__lib_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/img__open_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/img__tools_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/img__tools_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/index.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/iso9660_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/iso9660_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/iso9660_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/iso9660__dent_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/mac_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/md5sum__index_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/mm__open_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/mm__tools_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/mm__tools_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/nsrl__index_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ntfs_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ntfs_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ntfs_8h.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/ntfs__dent_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/raw_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/raw_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/rawfs_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/split_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/split_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__DATA.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__DATA__RUN.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__DENT-members.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__DENT.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__INFO-members.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__INFO.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__INODE-members.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__INODE.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__INODE__NAME__LIST.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__NAME-members.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__FS__NAME.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__HDB__INFO-members.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__HDB__INFO.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__IMG__INFO.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structTSK__MM__PART.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structiso9660__inode.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structiso9660__susp__ce.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/structiso9660__susp__sp.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/sun_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/swapfs_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tab_b.gif
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tab_l.gif
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tab_r.gif
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tabs.css
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tm__lookup_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tsk__error_8c.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tsk__os_8h-source.html
-%%PORTDOCS%%%%DOCSDIR%%/api-doc/tsk__parse_8c.html
+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.1.1
+%%DATADIR%%/sorter/default.sort
+%%DATADIR%%/sorter/freebsd.sort
+%%DATADIR%%/sorter/images.sort
+%%DATADIR%%/sorter/linux.sort
+%%DATADIR%%/sorter/openbsd.sort
+%%DATADIR%%/sorter/solaris.sort
+%%DATADIR%%/sorter/windows.sort
+@dirrm %%DATADIR%%/sorter
+@dirrm %%DATADIR%%
 %%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
@@ -167,5 +70,4 @@ bin/srch_strings
 %%PORTDOCS%%%%DOCSDIR%%/skins_iso9660.txt
 %%PORTDOCS%%%%DOCSDIR%%/skins_ntfs.txt
 %%PORTDOCS%%%%DOCSDIR%%/skins_windows.txt
-%%PORTDOCS%%@dirrm %%DOCSDIR%%/api-doc
 %%PORTDOCS%%@dirrm %%DOCSDIR%%