4 files changed, 176 insertions, 151 deletions

diff --git a/sysutils/autopsy/Makefile b/sysutils/autopsy/Makefile
index c56c1ab7c67a..e53bd02387f9 100644
--- a/sysutils/autopsy/Makefile
+++ b/sysutils/autopsy/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	autopsy
-PORTVERSION=	1.73
+PORTVERSION=	2.06
 CATEGORIES=	sysutils security
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -14,10 +14,6 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	opr@bsdaemon.be
 COMMENT=	The Autopsy Forensic Browser is a GUI for Sleuthkit
 
-#
-# It should have a BUILD_DEPENDS on something in sysutils/sleuthkit,
-# but I'm not sure which what to do it on.
-#
 BUILD_DEPENDS=	${LOCALBASE}/bin/ifind:${PORTSDIR}/sysutils/sleuthkit
 
 USE_PERL5=	yes
@@ -26,9 +22,6 @@ WEB=		pict/*
 WEBHELP=	help/*
 MAN1=		autopsy.1
 
-do-configure:
-	@echo "Note: use ${LOCALBASE}/ as your Sleuth Kit install directory!"
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/autopsy ${PREFIX}/bin
 	cd ${WRKSRC}/man/man1 && ${INSTALL_MAN} ${MAN1} ${PREFIX}/man/man1
diff --git a/sysutils/autopsy/distinfo b/sysutils/autopsy/distinfo
index 1f759503a996..1b1ba2f6b6f5 100644
--- a/sysutils/autopsy/distinfo
+++ b/sysutils/autopsy/distinfo
@@ -1,2 +1,3 @@
-MD5 (autopsy-1.73.tar.gz) = ea6d78cc494aa7255ef05ccb2006f0e8
-SIZE (autopsy-1.73.tar.gz) = 307299
+MD5 (autopsy-2.06.tar.gz) = 4acb0b5854939748d9c5f58bd28ac2a5
+SHA256 (autopsy-2.06.tar.gz) = d378c47550951bd14a11107033e333b2161be9298fc175f1f33adf2dd5ea9cf9
+SIZE (autopsy-2.06.tar.gz) = 382651
diff --git a/sysutils/autopsy/files/patch-configure b/sysutils/autopsy/files/patch-configure
index a3844306c7ba..3a0b6bff36e9 100644
--- a/sysutils/autopsy/files/patch-configure
+++ b/sysutils/autopsy/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Mon Sep  8 04:13:10 2003
-+++ configure	Mon Sep  8 04:15:15 2003
-@@ -39,7 +39,7 @@
+--- configure.orig	Thu Oct 13 19:03:54 2005
++++ configure	Tue Nov 29 12:41:17 2005
+@@ -45,7 +45,7 @@
  
  
  # Directories to search in
@@ -9,3 +9,22 @@
  
  
  echo ""
+@@ -271,8 +271,9 @@
+ echo '          http://www.sleuthkit.org/sleuthkit/'
+ echo ''
+ echo 'Enter the directory where you installed it:'
++tskdir=${LOCALBASE}
+ while (test 1 -eq 1) 
+-  do read tskdir;
++  do 
+   if (test -x "${tskdir}/bin/icat") then
+     if (test -x "${tskdir}/bin/fls") then
+       echo '  Sleuth Kit bin directory was found';
+@@ -284,6 +285,7 @@
+   else
+     echo 'The Sleuth Kit was not found (try again):';
+   fi;
++  read tskdir;
+ done
+ 
+ 
diff --git a/sysutils/autopsy/pkg-plist b/sysutils/autopsy/pkg-plist
index 6a6cf9233e86..8c54007ec91a 100644
--- a/sysutils/autopsy/pkg-plist
+++ b/sysutils/autopsy/pkg-plist
@@ -1,140 +1,152 @@
 bin/autopsy
 
-share/autopsy/pict/back_pix.jpg
-share/autopsy/pict/but_addnote.jpg
-share/autopsy/pict/but_alloc_list.jpg
-share/autopsy/pict/but_export.jpg
-share/autopsy/pict/but_force.jpg
-share/autopsy/pict/but_indexdb.jpg
-share/autopsy/pict/but_lookup.jpg
-share/autopsy/pict/but_new_name.jpg
-share/autopsy/pict/but_next.jpg
-share/autopsy/pict/but_ok.jpg
-share/autopsy/pict/but_prev.jpg
-share/autopsy/pict/but_replace.jpg
-share/autopsy/pict/but_report.jpg
-share/autopsy/pict/but_view.jpg
-share/autopsy/pict/file_b_alldel.jpg
-share/autopsy/pict/file_b_check.jpg
-share/autopsy/pict/file_b_expand.jpg
-share/autopsy/pict/file_b_hide.jpg
-share/autopsy/pict/file_b_md5list.jpg
-share/autopsy/pict/file_h_acc_cur.jpg
-share/autopsy/pict/file_h_acc_link.jpg
-share/autopsy/pict/file_h_chg_cur.jpg
-share/autopsy/pict/file_h_chg_link.jpg
-share/autopsy/pict/file_h_cre_cur.jpg
-share/autopsy/pict/file_h_cre_link.jpg
-share/autopsy/pict/file_h_del_cur.jpg
-share/autopsy/pict/file_h_del_link.jpg
-share/autopsy/pict/file_h_gid_cur.jpg
-share/autopsy/pict/file_h_gid_link.jpg
-share/autopsy/pict/file_h_meta_cur.jpg
-share/autopsy/pict/file_h_meta_link.jpg
-share/autopsy/pict/file_h_mod_cur.jpg
-share/autopsy/pict/file_h_mod_link.jpg
-share/autopsy/pict/file_h_nam_cur.jpg
-share/autopsy/pict/file_h_nam_link.jpg
-share/autopsy/pict/file_h_siz_cur.jpg
-share/autopsy/pict/file_h_siz_link.jpg
-share/autopsy/pict/file_h_uid_cur.jpg
-share/autopsy/pict/file_h_uid_link.jpg
-share/autopsy/pict/file_h_wr_cur.jpg
-share/autopsy/pict/file_h_wr_link.jpg
-share/autopsy/pict/hashdb_h_alert.jpg
-share/autopsy/pict/hashdb_h_ig.jpg
-share/autopsy/pict/hashdb_h_nsrl.jpg
-share/autopsy/pict/int_b_calc.jpg
-share/autopsy/pict/int_b_valid.jpg
-share/autopsy/pict/int_h_data.jpg
-share/autopsy/pict/int_h_img.jpg
-share/autopsy/pict/int_h_str.jpg
-share/autopsy/pict/int_h_tl.jpg
-share/autopsy/pict/int_h_unalloc.jpg
-share/autopsy/pict/logo.jpg
-share/autopsy/pict/main_t_dat_cur.jpg
-share/autopsy/pict/main_t_dat_link.jpg
-share/autopsy/pict/main_t_fil_cur.jpg
-share/autopsy/pict/main_t_fil_link.jpg
-share/autopsy/pict/main_t_fil_org.jpg
-share/autopsy/pict/main_t_ftype_cur.jpg
-share/autopsy/pict/main_t_ftype_link.jpg
-share/autopsy/pict/main_t_ftype_org.jpg
-share/autopsy/pict/main_t_img_cur.jpg
-share/autopsy/pict/main_t_img_link.jpg
-share/autopsy/pict/main_t_img_org.jpg
-share/autopsy/pict/main_t_met_cur.jpg
-share/autopsy/pict/main_t_met_link.jpg
-share/autopsy/pict/main_t_met_org.jpg
-share/autopsy/pict/main_t_srch_cur.jpg
-share/autopsy/pict/main_t_srch_link.jpg
-share/autopsy/pict/menu_b_cancel.jpg
-share/autopsy/pict/menu_b_ccls.jpg
-share/autopsy/pict/menu_b_cnew.jpg
-share/autopsy/pict/menu_b_copen.jpg
-share/autopsy/pict/menu_b_fs.jpg
-share/autopsy/pict/menu_b_hashdb.jpg
-share/autopsy/pict/menu_b_hcls.jpg
-share/autopsy/pict/menu_b_help.jpg
-share/autopsy/pict/menu_b_hnew.jpg
-share/autopsy/pict/menu_b_inew.jpg
-share/autopsy/pict/menu_b_int.jpg
-share/autopsy/pict/menu_b_menu.jpg
-share/autopsy/pict/menu_b_note.jpg
-share/autopsy/pict/menu_b_ok.jpg
-share/autopsy/pict/menu_b_ref.jpg
-share/autopsy/pict/menu_b_rem.jpg
-share/autopsy/pict/menu_b_seq.jpg
-share/autopsy/pict/menu_b_tl.jpg
-share/autopsy/pict/menu_h_cdet.jpg
-share/autopsy/pict/menu_h_cnew.jpg
-share/autopsy/pict/menu_h_hdet.jpg
-share/autopsy/pict/menu_h_hnew.jpg
-share/autopsy/pict/menu_h_idet.jpg
-share/autopsy/pict/menu_h_inew.jpg
-share/autopsy/pict/menu_t_cg_cur.jpg
-share/autopsy/pict/menu_t_cg_link.jpg
-share/autopsy/pict/sanit_b_san.jpg
-share/autopsy/pict/menu_t_hg_cur.jpg
-share/autopsy/pict/menu_t_hg_link.jpg
-share/autopsy/pict/menu_t_hg_org.jpg
-share/autopsy/pict/menu_t_hm_cur.jpg
-share/autopsy/pict/menu_t_hm_link.jpg
-share/autopsy/pict/menu_t_hm_org.jpg
-share/autopsy/pict/sanit_b_norm.jpg
-share/autopsy/pict/sanitized.jpg
-share/autopsy/pict/srch_b_lorig.jpg
-share/autopsy/pict/srch_b_lun.jpg
-share/autopsy/pict/srch_b_srch.jpg
-share/autopsy/pict/srch_b_str.jpg
-share/autopsy/pict/srch_b_un.jpg
-share/autopsy/pict/tab_close.jpg
-share/autopsy/pict/tab_help.jpg
-share/autopsy/pict/tl_t_data_cur.jpg
-share/autopsy/pict/tl_t_data_link.jpg
-share/autopsy/pict/tl_t_notes_link.jpg
-share/autopsy/pict/tl_t_notes_org.jpg
-share/autopsy/pict/tl_t_tl_cur.jpg
-share/autopsy/pict/tl_t_tl_link.jpg
-share/autopsy/pict/tl_t_view_cur.jpg
-share/autopsy/pict/tl_t_view_link.jpg
-share/autopsy/help/blank.html
-share/autopsy/help/caseman.html
-share/autopsy/help/data_mode.html
-share/autopsy/help/file_category.html
-share/autopsy/help/file_mode.html
-share/autopsy/help/fs_mode.html
-share/autopsy/help/general.html
-share/autopsy/help/grep.html
-share/autopsy/help/hash_db.html
-share/autopsy/help/index.html
-share/autopsy/help/int_mode.html
-share/autopsy/help/menu.html
-share/autopsy/help/meta_mode.html
-share/autopsy/help/sequencer.html
-share/autopsy/help/srch_mode.html
-share/autopsy/help/temp.html
-share/autopsy/help/tl.html
-@dirrm share/autopsy/pict
-@dirrm share/autopsy/help
-@dirrm share/autopsy
+%%DATADIR%%/pict/back_pix.jpg
+%%DATADIR%%/pict/but_addnote.jpg
+%%DATADIR%%/pict/but_alloc_list.jpg
+%%DATADIR%%/pict/but_export.jpg
+%%DATADIR%%/pict/but_force.jpg
+%%DATADIR%%/pict/but_indexdb.jpg
+%%DATADIR%%/pict/but_lookup.jpg
+%%DATADIR%%/pict/but_new_name.jpg
+%%DATADIR%%/pict/but_next.jpg
+%%DATADIR%%/pict/but_ok.jpg
+%%DATADIR%%/pict/but_prev.jpg
+%%DATADIR%%/pict/but_replace.jpg
+%%DATADIR%%/pict/but_report.jpg
+%%DATADIR%%/pict/but_search.jpg
+%%DATADIR%%/pict/but_view.jpg
+%%DATADIR%%/pict/but_viewcont.jpg
+%%DATADIR%%/pict/favicon.ico
+%%DATADIR%%/pict/file_b_alldel.jpg
+%%DATADIR%%/pict/file_b_allfiles.jpg
+%%DATADIR%%/pict/file_b_check.jpg
+%%DATADIR%%/pict/file_b_expand.jpg
+%%DATADIR%%/pict/file_b_hide.jpg
+%%DATADIR%%/pict/file_b_md5list.jpg
+%%DATADIR%%/pict/file_h_acc_cur.jpg
+%%DATADIR%%/pict/file_h_acc_link.jpg
+%%DATADIR%%/pict/file_h_chg_cur.jpg
+%%DATADIR%%/pict/file_h_chg_link.jpg
+%%DATADIR%%/pict/file_h_cre_cur.jpg
+%%DATADIR%%/pict/file_h_cre_link.jpg
+%%DATADIR%%/pict/file_h_del_cur.jpg
+%%DATADIR%%/pict/file_h_del_link.jpg
+%%DATADIR%%/pict/file_h_gid_cur.jpg
+%%DATADIR%%/pict/file_h_gid_link.jpg
+%%DATADIR%%/pict/file_h_meta_cur.jpg
+%%DATADIR%%/pict/file_h_meta_link.jpg
+%%DATADIR%%/pict/file_h_mod_cur.jpg
+%%DATADIR%%/pict/file_h_mod_link.jpg
+%%DATADIR%%/pict/file_h_nam_cur.jpg
+%%DATADIR%%/pict/file_h_nam_link.jpg
+%%DATADIR%%/pict/file_h_siz_cur.jpg
+%%DATADIR%%/pict/file_h_siz_link.jpg
+%%DATADIR%%/pict/file_h_uid_cur.jpg
+%%DATADIR%%/pict/file_h_uid_link.jpg
+%%DATADIR%%/pict/file_h_wr_cur.jpg
+%%DATADIR%%/pict/file_h_wr_link.jpg
+%%DATADIR%%/pict/hashdb_h_alert.jpg
+%%DATADIR%%/pict/hashdb_h_ig.jpg
+%%DATADIR%%/pict/hashdb_h_nsrl.jpg
+%%DATADIR%%/pict/int_b_calc.jpg
+%%DATADIR%%/pict/int_b_valid.jpg
+%%DATADIR%%/pict/int_h_data.jpg
+%%DATADIR%%/pict/int_h_img.jpg
+%%DATADIR%%/pict/int_h_str.jpg
+%%DATADIR%%/pict/int_h_tl.jpg
+%%DATADIR%%/pict/int_h_unalloc.jpg
+%%DATADIR%%/pict/logo.jpg
+%%DATADIR%%/pict/main_t_dat_cur.jpg
+%%DATADIR%%/pict/main_t_dat_link.jpg
+%%DATADIR%%/pict/main_t_fil_cur.jpg
+%%DATADIR%%/pict/main_t_fil_link.jpg
+%%DATADIR%%/pict/main_t_fil_org.jpg
+%%DATADIR%%/pict/main_t_ftype_cur.jpg
+%%DATADIR%%/pict/main_t_ftype_link.jpg
+%%DATADIR%%/pict/main_t_ftype_org.jpg
+%%DATADIR%%/pict/main_t_img_cur.jpg
+%%DATADIR%%/pict/main_t_img_link.jpg
+%%DATADIR%%/pict/main_t_img_org.jpg
+%%DATADIR%%/pict/main_t_met_cur.jpg
+%%DATADIR%%/pict/main_t_met_link.jpg
+%%DATADIR%%/pict/main_t_met_org.jpg
+%%DATADIR%%/pict/main_t_srch_cur.jpg
+%%DATADIR%%/pict/main_t_srch_link.jpg
+%%DATADIR%%/pict/menu_b_add.jpg
+%%DATADIR%%/pict/menu_b_analyze.jpg
+%%DATADIR%%/pict/menu_b_back.jpg
+%%DATADIR%%/pict/menu_b_cancel.jpg
+%%DATADIR%%/pict/menu_b_ccls.jpg
+%%DATADIR%%/pict/menu_b_close.jpg
+%%DATADIR%%/pict/menu_b_cnew.jpg
+%%DATADIR%%/pict/menu_b_copen.jpg
+%%DATADIR%%/pict/menu_b_fs.jpg
+%%DATADIR%%/pict/menu_b_hashdb.jpg
+%%DATADIR%%/pict/menu_b_hcls.jpg
+%%DATADIR%%/pict/menu_b_help.jpg
+%%DATADIR%%/pict/menu_b_hnew.jpg
+%%DATADIR%%/pict/menu_b_ifnew.jpg
+%%DATADIR%%/pict/menu_b_inew.jpg
+%%DATADIR%%/pict/menu_b_int.jpg
+%%DATADIR%%/pict/menu_b_menu.jpg
+%%DATADIR%%/pict/menu_b_next.jpg
+%%DATADIR%%/pict/menu_b_note.jpg
+%%DATADIR%%/pict/menu_b_ok.jpg
+%%DATADIR%%/pict/menu_b_ref.jpg
+%%DATADIR%%/pict/menu_b_rem.jpg
+%%DATADIR%%/pict/menu_b_seq.jpg
+%%DATADIR%%/pict/menu_b_tl.jpg
+%%DATADIR%%/pict/menu_h_cdet.jpg
+%%DATADIR%%/pict/menu_h_cnew.jpg
+%%DATADIR%%/pict/menu_h_hdet.jpg
+%%DATADIR%%/pict/menu_h_hnew.jpg
+%%DATADIR%%/pict/menu_h_idet.jpg
+%%DATADIR%%/pict/menu_h_inew.jpg
+%%DATADIR%%/pict/menu_t_cg_cur.jpg
+%%DATADIR%%/pict/menu_t_cg_link.jpg
+%%DATADIR%%/pict/menu_t_cg_org.jpg
+%%DATADIR%%/pict/sanit_b_san.jpg
+%%DATADIR%%/pict/menu_t_hg_cur.jpg
+%%DATADIR%%/pict/menu_t_hg_link.jpg
+%%DATADIR%%/pict/menu_t_hg_org.jpg
+%%DATADIR%%/pict/menu_t_hm_cur.jpg
+%%DATADIR%%/pict/menu_t_hm_link.jpg
+%%DATADIR%%/pict/menu_t_hm_org.jpg
+%%DATADIR%%/pict/sanit_b_norm.jpg
+%%DATADIR%%/pict/sanitized.jpg
+%%DATADIR%%/pict/srch_b_lorig.jpg
+%%DATADIR%%/pict/srch_b_lun.jpg
+%%DATADIR%%/pict/srch_b_str.jpg
+%%DATADIR%%/pict/srch_b_un.jpg
+%%DATADIR%%/pict/tab_close.jpg
+%%DATADIR%%/pict/tab_help.jpg
+%%DATADIR%%/pict/tl_t_data_cur.jpg
+%%DATADIR%%/pict/tl_t_data_link.jpg
+%%DATADIR%%/pict/tl_t_notes_link.jpg
+%%DATADIR%%/pict/tl_t_notes_org.jpg
+%%DATADIR%%/pict/tl_t_tl_cur.jpg
+%%DATADIR%%/pict/tl_t_tl_link.jpg
+%%DATADIR%%/pict/tl_t_view_cur.jpg
+%%DATADIR%%/pict/tl_t_view_link.jpg
+%%DATADIR%%/help/blank.html
+%%DATADIR%%/help/caseman.html
+%%DATADIR%%/help/data_mode.html
+%%DATADIR%%/help/file_category.html
+%%DATADIR%%/help/file_mode.html
+%%DATADIR%%/help/fs_mode.html
+%%DATADIR%%/help/general.html
+%%DATADIR%%/help/grep.html
+%%DATADIR%%/help/grep_lim.html
+%%DATADIR%%/help/hash_db.html
+%%DATADIR%%/help/index.html
+%%DATADIR%%/help/int_mode.html
+%%DATADIR%%/help/menu.html
+%%DATADIR%%/help/meta_mode.html
+%%DATADIR%%/help/sequencer.html
+%%DATADIR%%/help/srch_mode.html
+%%DATADIR%%/help/temp.html
+%%DATADIR%%/help/timezones.html
+%%DATADIR%%/help/tl.html
+@dirrm %%DATADIR%%/pict
+@dirrm %%DATADIR%%/help
+@dirrm %%DATADIR%%