Update to 1.15.

PR:		ports/97220
Submitted by:	Ports Fury

4 files changed, 129 insertions, 124 deletions

diff --git a/sysutils/tct/Makefile b/sysutils/tct/Makefile
index d441766f30dc..dfed1b9b1050 100644
--- a/sysutils/tct/Makefile
+++ b/sysutils/tct/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	tct
-PORTVERSION=	1.14
+PORTVERSION=	1.15
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.porcupine.org/forensics/
 
@@ -14,61 +14,68 @@ MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Analyzer for forensic data
 
 USE_PERL5=	yes
-PKGMESSAGE=	${WRKSRC}/pkg-message
+MAKE_ENV=	OPT="${CFLAGS}"
 
-MAN1=		file-tct.1 ils.1 mactime.1 md5-tct.1 pcat.1 grave-robber.1 lastcomm.1 major_minor.1 timeout.1 icat.1 lazarus.1 unrm.1
+MAN1=		file-tct.1 grave-robber.1 icat.1 ils.1 lastcomm.1 lazarus.1 \
+		mactime.1 major_minor.1 md5-tct.1 pcat.1 timeout.1 unrm.1
 MAN5=		magic.5 tm-format.5
 
-MYPORTDOCS=	CHANGES COPYRIGHT INSTALL LICENSE MANIFEST OS-NOTES README.FIRST TODO docs/README docs/design-notes docs/lazarus.README docs/grave-robber.README docs/mac.README
-
 .include <bsd.port.pre.mk>
 
+.if defined(WITH_LSOF)
+RUN_DEPENDS+=	${LOCALBASE}/sbin/lsof:${PORTSDIR}/sysutils/lsof
+.endif
+
 post-patch:
-	${SED} -e 's,/usr/local,${PREFIX},g' pkg-message > ${PKGMESSAGE}
+	@${FIND} ${WRKSRC} -name "Makefile" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|^CC|#CC|g ; \
+		 s|^DEBUG|#DEBUG|g ; \
+		 s|^OPT|#OPT|g'
+	@${REINPLACE_CMD} -e '/TCT_HOME/s|$$cwd|${DATADIR}|g' ${WRKSRC}/reconfig
+	@${REINPLACE_CMD} -e 's|/usr/local/bin|${LOCALBASE}/bin|g ; \
+		 s|/usr/X11R6/bin|${X11BASE}/bin|g' ${WRKSRC}/conf/paths.pl
+	@${RM} ${WRKSRC}/conf/paths.pl.bak
 
 do-install:
-	@${MKDIR} ${DOCSDIR}/lib
-	@${MKDIR} ${DOCSDIR}/lazarus
-	@${MKDIR} ${DOCSDIR}/etc
-	@${MKDIR} ${DOCSDIR}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/file ${PREFIX}/bin/file-tct
-	${INSTALL_DATA} -m 555 ${WRKSRC}/bin/grave-robber ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/icat ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/ils ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/lastcomm ${PREFIX}/bin
-	${INSTALL_DATA} -m 555 ${WRKSRC}/bin/mactime ${PREFIX}/bin
-	${INSTALL_DATA} -m 555 ${WRKSRC}/lazarus/lazarus ${PREFIX}/bin
-	${LN} -s ${PREFIX}/bin/lazarus ${DOCSDIR}/lazarus/lazarus
-	${LN} -s ${PREFIX}/bin/file-tct ${DOCSDIR}/bin/file
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/major_minor ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/md5 ${PREFIX}/bin/md5-tct
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/pcat ${PREFIX}/bin
-	${INSTALL_DATA} -m 555 ${WRKSRC}/bin/strip_tct_home ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/unrm ${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/timeout ${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/man/man1/file.1 ${PREFIX}/man/man1/file-tct.1
-	${INSTALL_MAN} ${WRKSRC}/man/man1/md5.1 ${PREFIX}/man/man1/md5-tct.1
-	@${MKDIR} ${DOCSDIR}/lib
-	${INSTALL_DATA} ${WRKSRC}/lib/* ${DOCSDIR}/lib
+.for f in icat ils lastcomm major_minor pcat unrm timeout
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin/${f}
+.endfor
+.for f in file grave-robber mactime strip_tct_home
+	${INSTALL_SCRIPT} ${WRKSRC}/bin/${f} ${PREFIX}/bin/${f}
+.endfor
+.for f in file md5
+	${INSTALL_PROGRAM} ${WRKSRC}/bin/${f} ${PREFIX}/bin/${f}-tct
+.endfor
+	${INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${PREFIX}/bin
+	@${MKDIR} ${DATADIR}/bin
+	${LN} -s ${PREFIX}/bin/file-tct ${DATADIR}/bin/file
 	@${MKDIR} ${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_SCRIPT} ${WRKSRC}/lib/savecore.pl ${PREFIX}/${SITE_PERL_REL}
 	${INSTALL_SCRIPT} ${WRKSRC}/conf/paths.pl ${PREFIX}/${SITE_PERL_REL}
-
-post-install:
-.if !defined(NOPORTDOCS)
-.for file in ${MYPORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${file} ${DOCSDIR}
-.endfor
-.endif
+	@${MKDIR} ${DATADIR}/conf
+	${INSTALL_DATA} ${WRKSRC}/conf/* ${DATADIR}/conf
+	@${MKDIR} ${DATADIR}/etc
+	${INSTALL_DATA} ${WRKSRC}/etc/magic ${DATADIR}/etc
+	@${MKDIR} ${DATADIR}/lazarus
+	${LN} -s ${PREFIX}/bin/lazarus ${DATADIR}/lazarus/lazarus
+	@${MKDIR} ${DATADIR}/lib
+	${INSTALL_DATA} ${WRKSRC}/lib/* ${DATADIR}/lib
+	${INSTALL_MAN} ${WRKSRC}/man/man1/file.1 ${MANPREFIX}/man/man1/file-tct.1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/md5.1 ${MANPREFIX}/man/man1/md5-tct.1
 .for f in ${MAN1:S/file-tct.1//:S/md5-tct.1//}
-	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${PREFIX}/man/man1
+	${INSTALL_MAN} ${WRKSRC}/man/man1/${f} ${MANPREFIX}/man/man1
 .endfor
 .for f in ${MAN5}
-	${INSTALL_MAN} ${WRKSRC}/man/man5/${f} ${PREFIX}/man/man5
+	${INSTALL_MAN} ${WRKSRC}/man/man5/${f} ${MAN5PREFIX}/man/man5
 .endfor
-	@${MKDIR} ${DOCSDIR}/conf
-	${INSTALL_DATA} ${WRKSRC}/conf/* ${DOCSDIR}/conf
-	${INSTALL_DATA} ${WRKSRC}/etc/magic ${DOCSDIR}/etc
-	@${CAT} ${PKGMESSAGE}
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for f in CHANGES COPYRIGHT INSTALL LICENSE MANIFEST OS-NOTES README.FIRST TODO
+	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
+.endfor
+.for f in README design-notes grave-robber.README lazarus.README mac.README
+	${INSTALL_DATA} ${WRKSRC}/docs/${f} ${DOCSDIR}
+.endfor
+.endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/tct/distinfo b/sysutils/tct/distinfo
index 5c5559f51a5f..39e1c5653ef5 100644
--- a/sysutils/tct/distinfo
+++ b/sysutils/tct/distinfo
@@ -1,3 +1,3 @@
-MD5 (tct-1.14.tar.gz) = 732d01e7771da6c940dbdae80cefb60e
-SHA256 (tct-1.14.tar.gz) = 97009847bf0cf4e4b88bd576d792e540be8d345efc6354d4bc71ebce71015879
-SIZE (tct-1.14.tar.gz) = 316852
+MD5 (tct-1.15.tar.gz) = d4992f242f7b3a6c8137e8562935f946
+SHA256 (tct-1.15.tar.gz) = 4c8e343453332bd1fdf0627f9b888e2a4f597e70b367f124cc7f2562558213a1
+SIZE (tct-1.15.tar.gz) = 317164
diff --git a/sysutils/tct/pkg-message b/sysutils/tct/pkg-message
deleted file mode 100644
index 8e7ddd2f9159..000000000000
--- a/sysutils/tct/pkg-message
+++ /dev/null
@@ -1,4 +0,0 @@
-
-You will need to edit some files like lazarus or coroner.cf and change the path for
-$TCT_HOME to /usr/local/share/doc/tct. It is recommended to install sysutils/lsof too.
-
diff --git a/sysutils/tct/pkg-plist b/sysutils/tct/pkg-plist
index 383bbd5a4af1..49b4d0c8166c 100644
--- a/sysutils/tct/pkg-plist
+++ b/sysutils/tct/pkg-plist
@@ -1,83 +1,85 @@
-%%DOCSDIR%%/README
-%%DOCSDIR%%/CHANGES
-%%DOCSDIR%%/COPYRIGHT
-%%DOCSDIR%%/INSTALL
-%%DOCSDIR%%/LICENSE
-%%DOCSDIR%%/MANIFEST
-%%DOCSDIR%%/OS-NOTES
-%%DOCSDIR%%/README.FIRST
-%%DOCSDIR%%/TODO
-%%DOCSDIR%%/design-notes
-%%DOCSDIR%%/grave-robber.README
-%%DOCSDIR%%/lazarus.README
-%%DOCSDIR%%/mac.README
-%%DOCSDIR%%/conf/coroner.cf
-%%DOCSDIR%%/conf/grave-robber.cf
-%%DOCSDIR%%/conf/lazarus.cf
-%%DOCSDIR%%/conf/look@first
-%%DOCSDIR%%/conf/mac_file.lst
-%%DOCSDIR%%/conf/mac_file.headers
-%%DOCSDIR%%/conf/paths.pl
-%%DOCSDIR%%/conf/paths.pl.old
-%%DOCSDIR%%/conf/save_these_files
-%%DOCSDIR%%/lazarus/lazarus
-%%DOCSDIR%%/bin/file
-bin/ils
+bin/file
+bin/file-tct
 bin/grave-robber
+bin/icat
+bin/ils
 bin/lastcomm
+bin/lazarus
 bin/mactime
 bin/major_minor
+bin/md5-tct
 bin/pcat
-bin/unrm
 bin/strip_tct_home
 bin/timeout
-bin/lazarus
-bin/icat
-bin/md5-tct
-bin/file-tct
-%%DOCSDIR%%/lib/body_init.pl
-%%DOCSDIR%%/lib/bsd.pl
-%%DOCSDIR%%/lib/chk_binaries.pl
-%%DOCSDIR%%/lib/command.pl
-%%DOCSDIR%%/lib/crunch.pl
-%%DOCSDIR%%/lib/date.pl
-%%DOCSDIR%%/lib/datez.pl
-%%DOCSDIR%%/lib/dig-sig.pl
-%%DOCSDIR%%/lib/file_mode.pl
-%%DOCSDIR%%/lib/getopts.pl
-%%DOCSDIR%%/lib/hostname.pl
-%%DOCSDIR%%/lib/is_able.pl
-%%DOCSDIR%%/lib/linux.pl
-%%DOCSDIR%%/lib/logger.pl
-%%DOCSDIR%%/lib/major_minor.pl
-%%DOCSDIR%%/lib/maj_min_walk.pl
-%%DOCSDIR%%/lib/misc.pl
-%%DOCSDIR%%/lib/ostype.pl
-%%DOCSDIR%%/lib/pass.cache.pl
-%%DOCSDIR%%/lib/print_table.pl
-%%DOCSDIR%%/lib/proc.pl
-%%DOCSDIR%%/lib/process_dirs.pl
-%%DOCSDIR%%/lib/ps_spy.pl
-%%DOCSDIR%%/lib/rawdev.pl
-%%DOCSDIR%%/lib/realpath.pl
-%%DOCSDIR%%/lib/save_the_files.pl
-%%DOCSDIR%%/lib/savecore.pl
-%%SITE_PERL%%/savecore.pl
+bin/unrm
+%%DATADIR%%/bin/file
+%%DATADIR%%/conf/coroner.cf
+%%DATADIR%%/conf/grave-robber.cf
+%%DATADIR%%/conf/lazarus.cf
+%%DATADIR%%/conf/look@first
+%%DATADIR%%/conf/mac_file.headers
+%%DATADIR%%/conf/mac_file.lst
+%%DATADIR%%/conf/paths.pl
+%%DATADIR%%/conf/paths.pl.old
+%%DATADIR%%/conf/save_these_files
+%%DATADIR%%/etc/magic
+%%DATADIR%%/lazarus/lazarus
+%%DATADIR%%/lib/body_init.pl
+%%DATADIR%%/lib/bsd.pl
+%%DATADIR%%/lib/chk_binaries.pl
+%%DATADIR%%/lib/command.pl
+%%DATADIR%%/lib/crunch.pl
+%%DATADIR%%/lib/date.pl
+%%DATADIR%%/lib/datez.pl
+%%DATADIR%%/lib/dig-sig.pl
+%%DATADIR%%/lib/file_mode.pl
+%%DATADIR%%/lib/getopts.pl
+%%DATADIR%%/lib/hostname.pl
+%%DATADIR%%/lib/is_able.pl
+%%DATADIR%%/lib/linux.pl
+%%DATADIR%%/lib/logger.pl
+%%DATADIR%%/lib/maj_min_walk.pl
+%%DATADIR%%/lib/major_minor.pl
+%%DATADIR%%/lib/misc.pl
+%%DATADIR%%/lib/ostype.pl
+%%DATADIR%%/lib/pass.cache.pl
+%%DATADIR%%/lib/print_table.pl
+%%DATADIR%%/lib/proc.pl
+%%DATADIR%%/lib/process_dirs.pl
+%%DATADIR%%/lib/ps_spy.pl
+%%DATADIR%%/lib/rawdev.pl
+%%DATADIR%%/lib/realpath.pl
+%%DATADIR%%/lib/save_the_files.pl
+%%DATADIR%%/lib/savecore.pl
+%%DATADIR%%/lib/solaris.pl
+%%DATADIR%%/lib/stat.pl
+%%DATADIR%%/lib/suck_free_inodes.pl
+%%DATADIR%%/lib/suck_table.pl
+%%DATADIR%%/lib/sunos.pl
+%%DATADIR%%/lib/system_stubs.pl
+%%DATADIR%%/lib/tm_misc.pl
+%%DATADIR%%/lib/tree.pl
+%%DATADIR%%/lib/trust.pl
+%%DATADIR%%/lib/vault_cp.pl
+%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/COPYRIGHT
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL
+%%PORTDOCS%%%%DOCSDIR%%/LICENSE
+%%PORTDOCS%%%%DOCSDIR%%/MANIFEST
+%%PORTDOCS%%%%DOCSDIR%%/OS-NOTES
+%%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/README.FIRST
+%%PORTDOCS%%%%DOCSDIR%%/TODO
+%%PORTDOCS%%%%DOCSDIR%%/design-notes
+%%PORTDOCS%%%%DOCSDIR%%/grave-robber.README
+%%PORTDOCS%%%%DOCSDIR%%/lazarus.README
+%%PORTDOCS%%%%DOCSDIR%%/mac.README
 %%SITE_PERL%%/paths.pl
-%%DOCSDIR%%/lib/solaris.pl
-%%DOCSDIR%%/lib/stat.pl
-%%DOCSDIR%%/lib/suck_free_inodes.pl
-%%DOCSDIR%%/lib/suck_table.pl
-%%DOCSDIR%%/lib/sunos.pl
-%%DOCSDIR%%/lib/system_stubs.pl
-%%DOCSDIR%%/lib/tm_misc.pl
-%%DOCSDIR%%/lib/tree.pl
-%%DOCSDIR%%/lib/trust.pl
-%%DOCSDIR%%/lib/vault_cp.pl
-%%DOCSDIR%%/etc/magic
-@dirrm %%DOCSDIR%%/conf
-@dirrm %%DOCSDIR%%/lib
-@dirrm %%DOCSDIR%%/lazarus
-@dirrm %%DOCSDIR%%/etc
-@dirrm %%DOCSDIR%%/bin
-@dirrm %%DOCSDIR%%
+%%SITE_PERL%%/savecore.pl
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrm %%DATADIR%%/bin
+@dirrm %%DATADIR%%/conf
+@dirrm %%DATADIR%%/etc
+@dirrm %%DATADIR%%/lazarus
+@dirrm %%DATADIR%%/lib
+@dirrm %%DATADIR%%