Unbreak on 6.x and 7.x

Approved by:	portmgr (implicit)

13 files changed, 188 insertions, 4 deletions

diff --git a/sysutils/tct/Makefile b/sysutils/tct/Makefile
index 1f042ef50ae2..1c43c532a301 100644
--- a/sysutils/tct/Makefile
+++ b/sysutils/tct/Makefile
@@ -24,10 +24,6 @@ MYPORTDOCS=	CHANGES COPYRIGHT INSTALL LICENSE MANIFEST OS-NOTES README.FIRST TOD
 
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} >= 600000
-BROKEN=		"Does not build on FreeBSD >= 6.x"
-.endif
-
 post-patch:
 	${SED} -e 's,/usr/local,${PREFIX},g' pkg-message > ${PKGMESSAGE}
 
diff --git a/sysutils/tct/files/patch-extras_entropy_makedefs b/sysutils/tct/files/patch-extras_entropy_makedefs
new file mode 100644
index 000000000000..2ea25dbe889a
--- /dev/null
+++ b/sysutils/tct/files/patch-extras_entropy_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- extras/entropy/makedefs.orig
++++ extras/entropy/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
diff --git a/sysutils/tct/files/patch-extras_findkey_makedefs b/sysutils/tct/files/patch-extras_findkey_makedefs
new file mode 100644
index 000000000000..c10bd8fddc54
--- /dev/null
+++ b/sysutils/tct/files/patch-extras_findkey_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- extras/findkey/makedefs.orig
++++ extras/findkey/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
diff --git a/sysutils/tct/files/patch-src_aux_makedefs b/sysutils/tct/files/patch-src_aux_makedefs
new file mode 100644
index 000000000000..a3f698baa27d
--- /dev/null
+++ b/sysutils/tct/files/patch-src_aux_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/aux/makedefs.orig
++++ src/aux/makedefs
+@@ -10,6 +10,10 @@
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
+                 ;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
++		;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
+   OpenBSD.3*)   DEFS="-DOPENBSD3"
diff --git a/sysutils/tct/files/patch-src_file_makedefs b/sysutils/tct/files/patch-src_file_makedefs
new file mode 100644
index 000000000000..e8cab084c7c1
--- /dev/null
+++ b/sysutils/tct/files/patch-src_file_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/file/makedefs.orig
++++ src/file/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
diff --git a/sysutils/tct/files/patch-src_fstools_fs__tools.h b/sysutils/tct/files/patch-src_fstools_fs__tools.h
new file mode 100644
index 000000000000..dd26df8f4cdf
--- /dev/null
+++ b/sysutils/tct/files/patch-src_fstools_fs__tools.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/fstools/fs_tools.h.orig
++++ src/fstools/fs_tools.h
+@@ -115,7 +115,7 @@
+ #define INO_TO_CG	ino_to_cg
+ #endif
+ 
+-#if defined(FREEBSD5)
++#if defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7)
+ #define SUPPORTED
+ #include <sys/vnode.h>
+ #include <ufs/ufs/quota.h>
diff --git a/sysutils/tct/files/patch-src_fstools_makedefs b/sysutils/tct/files/patch-src_fstools_makedefs
new file mode 100644
index 000000000000..7440e9adfad7
--- /dev/null
+++ b/sysutils/tct/files/patch-src_fstools_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/fstools/makedefs.orig
++++ src/fstools/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
diff --git a/sysutils/tct/files/patch-src_lastcomm_makedefs b/sysutils/tct/files/patch-src_lastcomm_makedefs
new file mode 100644
index 000000000000..9d924a413095
--- /dev/null
+++ b/sysutils/tct/files/patch-src_lastcomm_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/lastcomm/makedefs.orig
++++ src/lastcomm/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.3*)   DEFS="-DOPENBSD3"
+                 ;;
diff --git a/sysutils/tct/files/patch-src_lastcomm_sys__defs.h b/sysutils/tct/files/patch-src_lastcomm_sys__defs.h
new file mode 100644
index 000000000000..bb495f40b720
--- /dev/null
+++ b/sysutils/tct/files/patch-src_lastcomm_sys__defs.h
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/lastcomm/sys_defs.h.orig
++++ src/lastcomm/sys_defs.h
+@@ -6,7 +6,7 @@
+   * This software is distributed under the IBM Public License.
+   */
+ #if defined(FREEBSD2) || defined(FREEBSD3)  || defined(FREEBSD4) \
+-	|| defined(FREEBSD5) \
++	|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7) \
+ 	|| defined(BSDI2) || defined(BSDI3) || defined(BSDI4) \
+ 	|| defined(OPENBSD2) || defined(OPENBSD3)
+ #define SUPPORTED
diff --git a/sysutils/tct/files/patch-src_major__minor_makedefs b/sysutils/tct/files/patch-src_major__minor_makedefs
new file mode 100644
index 000000000000..ec4e14aefacd
--- /dev/null
+++ b/sysutils/tct/files/patch-src_major__minor_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/major_minor/makedefs.orig
++++ src/major_minor/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
diff --git a/sysutils/tct/files/patch-src_misc_makedefs b/sysutils/tct/files/patch-src_misc_makedefs
new file mode 100644
index 000000000000..64bbf07b1f40
--- /dev/null
+++ b/sysutils/tct/files/patch-src_misc_makedefs
@@ -0,0 +1,16 @@
+
+$FreeBSD$
+
+--- src/misc/makedefs.orig
++++ src/misc/makedefs
+@@ -9,6 +9,10 @@
+   FreeBSD.4*)   DEFS="-DFREEBSD4"
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+                 ;;
diff --git a/sysutils/tct/files/patch-src_pcat_makedefs b/sysutils/tct/files/patch-src_pcat_makedefs
new file mode 100644
index 000000000000..9d7245035613
--- /dev/null
+++ b/sysutils/tct/files/patch-src_pcat_makedefs
@@ -0,0 +1,18 @@
+
+$FreeBSD$
+
+--- src/pcat/makedefs.orig
++++ src/pcat/makedefs
+@@ -13,6 +13,12 @@
+                 ;;
+   FreeBSD.5*)   DEFS="-DFREEBSD5"
+ 		SYSLIBS="-lkvm"
++		;;
++  FreeBSD.6*)	DEFS="-DFREEBSD6"
++		SYSLIBS="-lkvm"
++		;;
++  FreeBSD.7*)	DEFS="-DFREEBSD7"
++		SYSLIBS="-lkvm"
+                 ;;
+   OpenBSD.2*)   DEFS="-DOPENBSD2"
+ 		SYSLIBS="-lkvm"
diff --git a/sysutils/tct/files/patch-src_pcat_pcat.c b/sysutils/tct/files/patch-src_pcat_pcat.c
new file mode 100644
index 000000000000..c62cc755a0fc
--- /dev/null
+++ b/sysutils/tct/files/patch-src_pcat_pcat.c
@@ -0,0 +1,14 @@
+
+$FreeBSD$
+
+--- src/pcat/pcat.c.orig
++++ src/pcat/pcat.c
+@@ -114,7 +114,7 @@
+   * grope kernel memory instead.
+   */
+ #if defined(FREEBSD2) || defined(FREEBSD3) || defined(FREEBSD4) \
+-	|| defined(FREEBSD5)
++	|| defined(FREEBSD5) || defined(FREEBSD6) || defined(FREEBSD7)
+ #define SUPPORTED
+ #include <sys/param.h>
+ #include <sys/user.h>