Rework this package so that it installs its executables into its own tct

hierarchy. Whilst this is not desirable, it's the only way to get this
package to execute properly, since it makes assumptions about absolute
and relative paths, and expects its own versions of certain commands (md5,
file), so it's best to keep these off to one side.

4 files changed, 58 insertions, 26 deletions

diff --git a/security/tct/Makefile b/security/tct/Makefile
index d5232ad21dc..7308aac2144 100644
--- a/security/tct/Makefile
+++ b/security/tct/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2002/01/04 16:38:48 agc Exp $
+# $NetBSD: Makefile,v 1.5 2002/01/05 16:20:54 agc Exp $
 #
 
 DISTNAME=	tct-1.09
@@ -14,18 +14,21 @@ REPLACE_PERL+=	extras/bdf extras/ils2mac extras/realpath
 REPLACE_PERL+=	lazarus/lazarus
 
 do-install:
+	${BSD_INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/bin
 	cd ${WRKSRC}/bin &&							\
 	for f in grave-robber mactime; do					\
-		${BSD_INSTALL_SCRIPT} $$f ${LOCALBASE}/sbin;			\
+		${BSD_INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin;			\
 	done;									\
-	for f in icat ils lastcomm major_minor pcat timeout unrm; do		\
-		${BSD_INSTALL_PROGRAM} $$f ${LOCALBASE}/sbin;			\
+	for f in file icat ils lastcomm major_minor md5 pcat timeout unrm; do	\
+		${BSD_INSTALL_PROGRAM} $$f ${LOCALBASE}/tct/bin;		\
 	done
 	cd ${WRKSRC}/extras &&							\
 	for f in bdf ils2mac realpath; do					\
-		${BSD_INSTALL_SCRIPT} $$f ${LOCALBASE}/sbin;			\
+		${BSD_INSTALL_SCRIPT} $$f ${LOCALBASE}/tct/bin;			\
 	done
-	${BSD_INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${LOCALBASE}/sbin
+	${BSD_INSTALL_SCRIPT} ${WRKSRC}/lazarus/lazarus ${LOCALBASE}/tct/bin
+	${BSD_INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/etc
+	cd ${WRKSRC}/etc && ${BSD_INSTALL_DATA} magic ${LOCALBASE}/tct/etc
 	${INSTALL_DATA_DIR} ${LOCALBASE}/share/doc/tct
 	cd ${WRKSRC}/docs &&							\
 	for f in README design-notes grave-robber.README lazarus.README mac.README; do \
@@ -33,6 +36,8 @@ do-install:
 	done
 	${INSTALL_DATA_DIR} ${PERL5_SITEARCH}
 	cd ${WRKSRC}/lib && ${BSD_INSTALL_DATA} *.pl ${PERL5_SITEARCH}
+	${BSD_INSTALL_PROGRAM_DIR} ${LOCALBASE}/tct/conf
+	cd ${WRKSRC}/conf && ${BSD_INSTALL_DATA} paths.pl *.cf ${LOCALBASE}/tct/conf
 
 .include "../../lang/perl5/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/tct/PLIST b/security/tct/PLIST
index 8d426142336..a9b994df140 100644
--- a/security/tct/PLIST
+++ b/security/tct/PLIST
@@ -1,22 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2002/01/04 13:17:17 agc Exp $
-sbin/bdf
-sbin/grave-robber
-sbin/icat
-sbin/ils
-sbin/ils2mac
-sbin/lazarus
-sbin/lastcomm
-sbin/mactime
-sbin/major_minor
-sbin/pcat
-sbin/realpath
-sbin/timeout
-sbin/unrm
-share/doc/tct/README
-share/doc/tct/design-notes
-share/doc/tct/grave-robber.README
-share/doc/tct/lazarus.README
-share/doc/tct/mac.README
+@comment $NetBSD: PLIST,v 1.3 2002/01/05 16:20:54 agc Exp $
 lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/body_init.pl
 lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/bsd.pl
 lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/chk_binaries.pl
@@ -54,4 +36,33 @@ lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/tm_misc.pl
 lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/tree.pl
 lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/trust.pl
 lib/perl5/site_perl/5.6.1/${MACHINE_ARCH}-${LOWER_OPSYS}/vault_cp.pl
+share/doc/tct/README
+share/doc/tct/design-notes
+share/doc/tct/grave-robber.README
+share/doc/tct/lazarus.README
+share/doc/tct/mac.README
+tct/bin/bdf
+tct/bin/file
+tct/bin/grave-robber
+tct/bin/icat
+tct/bin/ils
+tct/bin/ils2mac
+tct/bin/lazarus
+tct/bin/lastcomm
+tct/bin/mactime
+tct/bin/major_minor
+tct/bin/md5
+tct/bin/pcat
+tct/bin/realpath
+tct/bin/timeout
+tct/bin/unrm
+tct/conf/coroner.cf
+tct/conf/grave-robber.cf
+tct/conf/lazarus.cf
+tct/conf/paths.pl
+tct/etc/magic
 @dirrm share/doc/tct
+@dirrm tct/etc
+@dirrm tct/conf
+@dirrm tct/bin
+@dirrm tct
diff --git a/security/tct/distinfo b/security/tct/distinfo
index 6e27dc363a9..ed4ce706f33 100644
--- a/security/tct/distinfo
+++ b/security/tct/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: distinfo,v 1.2 2002/01/05 16:20:54 agc Exp $
 
 SHA1 (tct-1.09.tar.gz) = fffb6ae1f389cfdfad95a9a81f6eaba115c9dfc0
 Size (tct-1.09.tar.gz) = 314134 bytes
@@ -16,3 +16,4 @@ SHA1 (patch-ak) = 17b946140958aee8b78062e3f3546740fc1f2df1
 SHA1 (patch-al) = 739b445a65a138b8e9aac83b25bab5b6e5519fb8
 SHA1 (patch-am) = 8d37a161ba18dd2725203b2fcf47329c11c8c4a5
 SHA1 (patch-an) = 7ec22708fb8b0345231542a82e79b1d78b7235d7
+SHA1 (patch-ao) = bf62338ffbe1a773c23b69e56f2126bf67b70a0a
diff --git a/security/tct/patches/patch-ao b/security/tct/patches/patch-ao
new file mode 100644
index 00000000000..7b4cbef50ae
--- /dev/null
+++ b/security/tct/patches/patch-ao
@@ -0,0 +1,15 @@
+$NetBSD: patch-ao,v 1.1 2002/01/05 16:20:55 agc Exp $
+
+Use root's home directory for TCT_HOME
+
+--- reconfig	2002/01/05 15:38:05	1.1
++++ reconfig	2002/01/05 15:38:36
+@@ -167,7 +167,7 @@
+ 	die "Can't open $file for reading\n" unless open(FILE, $file);
+ 	while (<FILE>) {
+ 		if (/^\s*\$TCT_HOME\s*=/ && !$done) {
+-			$file{$n++} = "\$TCT_HOME = \"$cwd\";\n";
++			$file{$n++} = "\$TCT_HOME = \"$ENV{\"PREFIX\"}/tct\";\n";
+ 			$done = 1;
+ 			next;
+ 			}