Make tct build and run on NetBSD 2.0 and bump PKGREVISION.

This does not add support for ffsv2 filesystems nor superblocks.
This addresses PR#28357.

16 files changed, 190 insertions, 82 deletions

diff --git a/security/tct/Makefile b/security/tct/Makefile
index 0ec9e1e9c1a..34ec492fb1f 100644
--- a/security/tct/Makefile
+++ b/security/tct/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.12 2004/05/09 06:48:40 snj Exp $
+# $NetBSD: Makefile,v 1.13 2005/01/22 15:59:58 ben Exp $
 #
 
 DISTNAME=	tct-1.09
+PKGREVISION=	1
 CATEGORIES=	security
 MASTER_SITES=	http://www.porcupine.org/forensics/
 
diff --git a/security/tct/distinfo b/security/tct/distinfo
index ed4ce706f33..bf2be2d3920 100644
--- a/security/tct/distinfo
+++ b/security/tct/distinfo
@@ -1,19 +1,19 @@
-$NetBSD: distinfo,v 1.2 2002/01/05 16:20:54 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/01/22 15:59:58 ben Exp $
 
 SHA1 (tct-1.09.tar.gz) = fffb6ae1f389cfdfad95a9a81f6eaba115c9dfc0
 Size (tct-1.09.tar.gz) = 314134 bytes
-SHA1 (patch-aa) = 36d0bd8a0171d490dbbab84d75a379cdd0b60f9c
-SHA1 (patch-ab) = 54acf9c6f1f2e3eed1bf0bf448c086584a9f3071
-SHA1 (patch-ac) = cef2a88ab3fd23a3b9b3fb3e5109efe936aed934
-SHA1 (patch-ad) = e8d2dbf5941020dd6a596329b9d462733da55117
-SHA1 (patch-ae) = bfef1e0df8b0eaad9815e514a4b6ca9ddcdd5bbe
-SHA1 (patch-af) = bd843a6f3f46b75104bc990408f19f52918d3cdf
-SHA1 (patch-ag) = 0bcbd120663144a486eaeacaa52b5ce8970f88a3
-SHA1 (patch-ah) = 2c0a020793df5539426d32ce56da24b5ecfadf1c
-SHA1 (patch-ai) = dd6059d627a2245074ecf0ddba16f2f4a26a863d
-SHA1 (patch-aj) = b9fd22a2afc0d40472682f5e04ae53837d3f8afa
-SHA1 (patch-ak) = 17b946140958aee8b78062e3f3546740fc1f2df1
-SHA1 (patch-al) = 739b445a65a138b8e9aac83b25bab5b6e5519fb8
-SHA1 (patch-am) = 8d37a161ba18dd2725203b2fcf47329c11c8c4a5
-SHA1 (patch-an) = 7ec22708fb8b0345231542a82e79b1d78b7235d7
+SHA1 (patch-aa) = 7a8afdf11dcb2d3a56a8c6eb7676842a559e587b
+SHA1 (patch-ab) = 375bd9b4ba268bd2f6cbb936c310ab705d5d9cd8
+SHA1 (patch-ac) = 6fec33f88d786240b47eaff766c7697eee8351a3
+SHA1 (patch-ad) = 679c5a69d5edcebaa3a0475146a1426384a4fb70
+SHA1 (patch-ae) = 3bbf76a4ce9df40e08b5c365767820348dc82941
+SHA1 (patch-af) = bbf402d8d4c5c6118e158d70f4e1814f0e179c8d
+SHA1 (patch-ag) = f4bcf5d08b2df418b38182aa0ea0e574d377f9f4
+SHA1 (patch-ah) = 5cd6180c4b83f12db59e34b3dd7e5290f8d7aea9
+SHA1 (patch-ai) = 8bc7f949bed634b1c5e0ee78295e80a0b8ce6e0a
+SHA1 (patch-aj) = f1d7a66a265f5a1e8bc52d2319a83702b3c37342
+SHA1 (patch-ak) = 4cb026ec6cc6252a3553d4c940683943a9cfd21f
+SHA1 (patch-al) = 189e95ec0a632d118a5db3102696b9fa0222006d
+SHA1 (patch-am) = 2a45fcdfb88c0340e46419bcd76eef7c7202a9f9
+SHA1 (patch-an) = c8b8df8ac2950ae171e09531a08457f834484854
 SHA1 (patch-ao) = bf62338ffbe1a773c23b69e56f2126bf67b70a0a
diff --git a/security/tct/patches/patch-aa b/security/tct/patches/patch-aa
index 810fa319805..f746cc11b96 100644
--- a/security/tct/patches/patch-aa
+++ b/security/tct/patches/patch-aa
@@ -1,13 +1,15 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-aa,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/aux/makedefs	2001/10/11 15:53:08	1.1
-+++ src/aux/makedefs	2001/10/11 15:53:44
-@@ -2,6 +2,8 @@
+--- src/aux/makedefs.orig	2001-10-04 12:34:08.000000000 -0700
++++ src/aux/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-ab b/security/tct/patches/patch-ab
index 440e838dc87..c666ca176a7 100644
--- a/security/tct/patches/patch-ab
+++ b/security/tct/patches/patch-ab
@@ -1,13 +1,15 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ab,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- extras/entropy/makedefs	2002/01/03 09:33:04	1.1
-+++ extras/entropy/makedefs	2002/01/03 09:33:30
-@@ -2,6 +2,8 @@
+--- extras/entropy/makedefs.orig	2001-10-04 12:59:35.000000000 -0700
++++ extras/entropy/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-ac b/security/tct/patches/patch-ac
index 20bceb59b45..63e8ac89492 100644
--- a/security/tct/patches/patch-ac
+++ b/security/tct/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ac,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- extras/findkey/makedefs	2002/01/03 09:34:44	1.1
-+++ extras/findkey/makedefs	2002/01/03 09:35:11
-@@ -2,6 +2,8 @@
+--- extras/findkey/makedefs.orig	2001-10-04 12:32:54.000000000 -0700
++++ extras/findkey/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-ad b/security/tct/patches/patch-ad
index 1b77bb39bb5..2a7d77abfd0 100644
--- a/security/tct/patches/patch-ad
+++ b/security/tct/patches/patch-ad
@@ -1,12 +1,13 @@
-$NetBSD: patch-ad,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ad,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- lib/ostype.pl	2002/01/03 09:36:20	1.1
-+++ lib/ostype.pl	2002/01/03 09:36:43
-@@ -9,6 +9,7 @@
+--- lib/ostype.pl.orig	2000-07-30 16:39:20.000000000 -0700
++++ lib/ostype.pl
+@@ -9,6 +9,8 @@ print "Determining OS (in determine_os()
  
  # Order does not matter, table is sorted.
  %OS_INFO = (
 +    "NETBSD1", "NetBSD.1",
++    "NETBSD2", "NetBSD.2",
      "FREEBSD2", "FreeBSD.2",
      "FREEBSD3", "FreeBSD.3",
      "FREEBSD4", "FreeBSD.4",
diff --git a/security/tct/patches/patch-ae b/security/tct/patches/patch-ae
index e3ae71157d7..8426d30244d 100644
--- a/security/tct/patches/patch-ae
+++ b/security/tct/patches/patch-ae
@@ -1,13 +1,15 @@
-$NetBSD: patch-ae,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ae,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/file/makedefs	2002/01/03 09:37:43	1.1
-+++ src/file/makedefs	2002/01/03 09:38:04
-@@ -2,6 +2,8 @@
+--- src/file/makedefs.orig	2001-10-04 12:42:22.000000000 -0700
++++ src/file/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-af b/security/tct/patches/patch-af
index 4ecb8e976c4..468114c7dcc 100644
--- a/security/tct/patches/patch-af
+++ b/security/tct/patches/patch-af
@@ -1,12 +1,86 @@
-$NetBSD: patch-af,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-af,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/fstools/ffs.c	2002/01/03 09:39:06	1.1
-+++ src/fstools/ffs.c	2002/01/03 09:44:41
-@@ -193,7 +193,12 @@
+--- src/fstools/ffs.c.orig	2001-09-15 13:45:56.000000000 -0700
++++ src/fstools/ffs.c
+@@ -28,6 +28,16 @@
+ #include "mymalloc.h"
+ #include "error.h"
+ 
++#if defined(NETBSD2)
++#define MY_DINODE ufs1_dinode
++#define MY_SBOFF SBLOCK_UFS1
++#define MY_FS_MAGIC FS_UFS1_MAGIC
++#else
++#define MY_DINODE dinode
++#define MY_SBOFF SBOFF
++#define MY_FS_MAGIC FS_MAGIC
++#endif
++
+  /*
+   * Structure of a fast file system handle.
+   */
+@@ -36,7 +46,7 @@ typedef struct {
+     struct fs *fs;			/* super block buffer */
+     FS_BUF *cg_buf;			/* cylinder block buffer */
+     FS_BUF *dino_buf;			/* inode block buffer */
+-    struct dinode dinode;		/* disk inode */
++    struct MY_DINODE dinode;	/* disk inode */
+ } FFS_INFO;
+ 
+ /* ffs_cgroup_lookup - look up cached cylinder group info */
+@@ -84,7 +94,7 @@ static void ffs_cgroup_free(FFS_INFO *ff
+ 
+ /* ffs_dinode_lookup - look up cached disk inode */
+ 
+-static struct dinode *ffs_dinode_lookup(FFS_INFO *ffs, INUM_T inum)
++static struct MY_DINODE *ffs_dinode_lookup(FFS_INFO *ffs, INUM_T inum)
+ {
+     DADDR_T addr;
+     int     offs;
+@@ -109,9 +119,9 @@ static struct dinode *ffs_dinode_lookup(
+      * Copy the inode, in order to avoid alignment problems when accessing
+      * structure members.
+      */
+-    offs = itoo(ffs->fs, inum) * sizeof(struct dinode);
++    offs = itoo(ffs->fs, inum) * sizeof(struct MY_DINODE);
+     memcpy((char *) &ffs->dinode, ffs->dino_buf->data + offs,
+-	   sizeof(struct dinode));
++	   sizeof(struct MY_DINODE));
+     return (&ffs->dinode);
+ }
+ 
+@@ -125,7 +135,7 @@ static void ffs_dinode_free(FFS_INFO *ff
+ 
+ /* ffs_copy_inode - copy disk inode to generic inode */
+ 
+-static void ffs_copy_inode(struct dinode * dino, FS_INODE *fs_inode)
++static void ffs_copy_inode(struct MY_DINODE * dino, FS_INODE *fs_inode)
+ {
+     int     i;
+ 
+@@ -151,7 +161,7 @@ static FS_INODE *ffs_inode_lookup(FS_INF
+ {
+     FFS_INFO *ffs = (FFS_INFO *) fs;
+     FS_INODE *fs_inode = fs_inode_alloc(NDADDR, NIADDR);
+-    struct dinode *dino = ffs_dinode_lookup(ffs, inum);
++    struct MY_DINODE *dino = ffs_dinode_lookup(ffs, inum);
+ 
+     ffs_copy_inode(dino, fs_inode);
+     return (fs_inode);
+@@ -168,7 +178,7 @@ void    ffs_inode_walk(FS_INFO *fs, INUM
+     struct cg *cg = 0;
+     INUM_T  inum;
+     unsigned char *inosused;
+-    struct dinode *dino;
++    struct MY_DINODE *dino;
+     FS_INODE *fs_inode = fs_inode_alloc(NDADDR, NIADDR);
+     int     myflags;
+     INUM_T  ibase;
+@@ -193,7 +203,12 @@ void    ffs_inode_walk(FS_INFO *fs, INUM
  	cg_num = INO_TO_CG(ffs->fs, inum);
  	if (cg == 0 || cg->cg_cgx != cg_num) {
  	    cg = ffs_cgroup_lookup(ffs, cg_num);
-+#ifdef NETBSD1
++#if defined(NETBSD1) || defined(NETBSD2)
 +	    /* BYTE_SWAPPED filesystems can come later */
 +	    inosused = (unsigned char *) cg_inosused(cg, 0);
 +#else
@@ -15,11 +89,11 @@ $NetBSD: patch-af,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
  	    ibase = cg_num * ffs->fs->fs_ipg;
  	}
  
-@@ -290,7 +295,12 @@
+@@ -290,7 +305,12 @@ void    ffs_block_walk(FS_INFO *fs, DADD
  	cg_num = dtog(ffs->fs, addr);
  	if (cg == 0 || cg->cg_cgx != cg_num) {
  	    cg = ffs_cgroup_lookup(ffs, cg_num);
-+#ifdef NETBSD1
++#if defined(NETBSD1) || defined(NETBSD2)
 +	    /* BYTE_SWAPPED filesystems can come later */
 +	    freeblocks = (unsigned char *) cg_blksfree(cg, 0);
 +#else
@@ -28,3 +102,17 @@ $NetBSD: patch-af,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
  	    dbase = cgbase(ffs->fs, cg_num);
  	    dmin = cgdmin(ffs->fs, cg_num);
  	    sblock = cgsblock(ffs->fs, cg_num);
+@@ -390,11 +410,11 @@ FS_INFO *ffs_open(const char *name)
+      */
+     len = roundup(sizeof(struct fs), DEV_BSIZE);
+     ffs->fs = (struct fs *) mymalloc(len);
+-    if (LSEEK(ffs->fs_info.fd, SBOFF, SEEK_SET) != SBOFF)
++    if (LSEEK(ffs->fs_info.fd, MY_SBOFF, SEEK_SET) != MY_SBOFF)
+ 	error("%s: lseek: %m", myname);
+     if (read(ffs->fs_info.fd, (char *) ffs->fs, len) != len)
+ 	error("%s: read superblock: %m", name);
+-    if (ffs->fs->fs_magic != FS_MAGIC)
++    if (ffs->fs->fs_magic != MY_FS_MAGIC)
+ 	error("%s: bad magic number in superblock", name);
+ 
+     /*
diff --git a/security/tct/patches/patch-ag b/security/tct/patches/patch-ag
index 1d68fcdc978..f79b61ebeda 100644
--- a/security/tct/patches/patch-ag
+++ b/security/tct/patches/patch-ag
@@ -1,14 +1,12 @@
-$NetBSD: patch-ag,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ag,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/fstools/fs_tools.h	2002/01/03 09:46:02	1.1
-+++ src/fstools/fs_tools.h	2002/01/03 09:47:01
-@@ -201,6 +201,26 @@
- #ifndef isset				/* NIH */
- #define isset(a,i)	((a)[(i)/NBBY] & (1<<((i)%NBBY)))
+--- src/fstools/fs_tools.h.orig	2001-09-07 10:06:57.000000000 -0700
++++ src/fstools/fs_tools.h
+@@ -203,6 +203,26 @@ extern int optind;
  #endif
-+#endif
-+
-+#if defined(NETBSD1)
+ #endif
+ 
++#if defined(NETBSD1) || defined(NETBSD2)
 +#define SUPPORTED
 +#define HAVE_UFS_FFS
 +#include <sys/vnode.h>
@@ -26,6 +24,8 @@ $NetBSD: patch-ag,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
 +#define UFS_TYPE        "ufs"
 +#define DEF_FSTYPE      UFS_TYPE
 +#define INO_TO_CG       ino_to_cg
- #endif
- 
++#endif
++
   /*
+   * Catch-all.
+   */
diff --git a/security/tct/patches/patch-ah b/security/tct/patches/patch-ah
index e519f0cf55a..5148da9e410 100644
--- a/security/tct/patches/patch-ah
+++ b/security/tct/patches/patch-ah
@@ -1,13 +1,15 @@
-$NetBSD: patch-ah,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ah,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/lastcomm/makedefs	2002/01/03 09:48:45	1.1
-+++ src/lastcomm/makedefs	2002/01/03 09:49:06
-@@ -2,6 +2,8 @@
+--- src/lastcomm/makedefs.orig	2001-10-04 12:45:44.000000000 -0700
++++ src/lastcomm/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.4*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-ai b/security/tct/patches/patch-ai
index 8f2f980d594..be11f8c5f7d 100644
--- a/security/tct/patches/patch-ai
+++ b/security/tct/patches/patch-ai
@@ -1,13 +1,13 @@
-$NetBSD: patch-ai,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ai,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/lastcomm/sys_defs.h	2002/01/03 09:49:57	1.1
-+++ src/lastcomm/sys_defs.h	2002/01/03 09:50:25
+--- src/lastcomm/sys_defs.h.orig	2000-07-30 16:39:20.000000000 -0700
++++ src/lastcomm/sys_defs.h
 @@ -7,7 +7,7 @@
    */
  #if defined(FREEBSD2) || defined(FREEBSD3)  || defined(FREEBSD4) \
  	|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
 -	|| defined(OPENBSD2)
-+	|| defined(OPENBSD2) || defined(NETBSD1)
++	|| defined(OPENBSD2) || defined(NETBSD1) || defined(NETBSD2)
  #define SUPPORTED
  #define _PATH_ACCT	"/var/account/acct"
  #define HAVE_COMP_BLOCK_IO_COUNT
diff --git a/security/tct/patches/patch-aj b/security/tct/patches/patch-aj
index e6ccfd200c2..1ea709a61ba 100644
--- a/security/tct/patches/patch-aj
+++ b/security/tct/patches/patch-aj
@@ -1,13 +1,15 @@
-$NetBSD: patch-aj,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-aj,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/major_minor/makedefs	2002/01/03 09:51:21	1.1
-+++ src/major_minor/makedefs	2002/01/03 09:51:42
-@@ -2,6 +2,8 @@
+--- src/major_minor/makedefs.orig	2001-10-04 12:46:24.000000000 -0700
++++ src/major_minor/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-ak b/security/tct/patches/patch-ak
index 517edf8e09b..a99b52b1065 100644
--- a/security/tct/patches/patch-ak
+++ b/security/tct/patches/patch-ak
@@ -1,13 +1,15 @@
-$NetBSD: patch-ak,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-ak,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/misc/makedefs	2002/01/03 09:53:00	1.1
-+++ src/misc/makedefs	2002/01/03 09:53:24
-@@ -2,6 +2,8 @@
+--- src/misc/makedefs.orig	2001-10-04 12:47:05.000000000 -0700
++++ src/misc/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-al b/security/tct/patches/patch-al
index c9fea7ef743..c97bb7d9f23 100644
--- a/security/tct/patches/patch-al
+++ b/security/tct/patches/patch-al
@@ -1,13 +1,15 @@
-$NetBSD: patch-al,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-al,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/pcat/makedefs	2002/01/03 09:54:14	1.1
-+++ src/pcat/makedefs	2002/01/03 09:54:32
-@@ -2,6 +2,8 @@
+--- src/pcat/makedefs.orig	2001-10-04 12:31:47.000000000 -0700
++++ src/pcat/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"
diff --git a/security/tct/patches/patch-am b/security/tct/patches/patch-am
index 304ca734977..003170ecebd 100644
--- a/security/tct/patches/patch-am
+++ b/security/tct/patches/patch-am
@@ -1,14 +1,14 @@
-$NetBSD: patch-am,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-am,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/pcat/pcat.c	2002/01/03 09:55:26	1.1
-+++ src/pcat/pcat.c	2002/01/03 09:56:38
+--- src/pcat/pcat.c.orig	2001-09-25 10:22:20.000000000 -0700
++++ src/pcat/pcat.c
 @@ -177,6 +177,24 @@
  #endif
  
   /*
 +  * Based on the OpenBSD code above.
 +  */
-+#if defined(NETBSD1)
++#if defined(NETBSD1) || defined(NETBSD2)
 +#define SUPPORTED
 +#include <sys/param.h>
 +#include <sys/user.h>
diff --git a/security/tct/patches/patch-an b/security/tct/patches/patch-an
index 72d95007200..67777c5095d 100644
--- a/security/tct/patches/patch-an
+++ b/security/tct/patches/patch-an
@@ -1,13 +1,15 @@
-$NetBSD: patch-an,v 1.1.1.1 2002/01/03 10:58:57 agc Exp $
+$NetBSD: patch-an,v 1.2 2005/01/22 15:59:58 ben Exp $
 
---- src/fstools/makedefs	2002/01/03 10:03:47	1.1
-+++ src/fstools/makedefs	2002/01/03 10:04:05
-@@ -2,6 +2,8 @@
+--- src/fstools/makedefs.orig	2001-10-04 12:44:26.000000000 -0700
++++ src/fstools/makedefs
+@@ -2,6 +2,10 @@ SYSTEM=`(uname -s) 2>/dev/null`
  RELEASE=`(uname -r) 2>/dev/null`
  
  case "$SYSTEM.$RELEASE" in
 +   NetBSD.1*)	DEFS="-DNETBSD1"
 +		;;
++   NetBSD.2*)	DEFS="-DNETBSD2"
++		;;
    FreeBSD.2*)   DEFS="-DFREEBSD2"
                  ;;
    FreeBSD.3*)   DEFS="-DFREEBSD3"