Make this work for amd64, and enable it.

5 files changed, 54 insertions, 3 deletions

diff --git a/sysutils/mbmon/Makefile.common b/sysutils/mbmon/Makefile.common
index 5022bd598a0..75e99312d59 100644
--- a/sysutils/mbmon/Makefile.common
+++ b/sysutils/mbmon/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2004/02/02 18:34:10 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.8 2004/03/07 01:06:45 fvdl Exp $
 #
 
 DISTNAME=		xmbmon203
@@ -17,4 +17,4 @@ GNU_CONFIGURE=		yes
 DISTINFO_FILE?=		${.CURDIR}/../../sysutils/mbmon/distinfo
 PATCHDIR=		${.CURDIR}/../../sysutils/mbmon/patches
 
-ONLY_FOR_PLATFORM=	FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386
+ONLY_FOR_PLATFORM=	FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 NetBSD-*-x86_64
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
index 755488def90..55af36545d4 100644
--- a/sysutils/mbmon/distinfo
+++ b/sysutils/mbmon/distinfo
@@ -1,5 +1,8 @@
-$NetBSD: distinfo,v 1.3 2003/08/23 16:41:59 recht Exp $
+$NetBSD: distinfo,v 1.4 2004/03/07 01:06:45 fvdl Exp $
 
 SHA1 (xmbmon203.tar.gz) = 009ccd550d4aa1acc830948d5be304f142c78341
 Size (xmbmon203.tar.gz) = 113252 bytes
 SHA1 (patch-aa) = bae95384b190801af7913ca79c29caa509488195
+SHA1 (patch-ab) = bfc75d75dfc1d976d3920ff4fb56dcbe45f06421
+SHA1 (patch-ac) = cf9dedf838f26092472ac8eff35138313b894445
+SHA1 (patch-ad) = 87b862e765bc0573bf8c7825e4b944e34a0e3497
diff --git a/sysutils/mbmon/patches/patch-ab b/sysutils/mbmon/patches/patch-ab
new file mode 100644
index 00000000000..587846569a3
--- /dev/null
+++ b/sysutils/mbmon/patches/patch-ab
@@ -0,0 +1,18 @@
+$NetBSD: patch-ab,v 1.1 2004/03/07 01:06:45 fvdl Exp $
+
+--- configure.orig	2003-04-11 18:47:14.000000000 +0200
++++ configure	2004-03-07 01:45:11.000000000 +0100
+@@ -875,8 +875,13 @@
+   		CC=cc
+ 		HOSTDEF="-DNETBSD"
+ 		ADDLIBS="-li386"
+ 		;;
++	amd64-*-netbsd* | x86_64-*-netbsd*)
++  		CC=cc
++		HOSTDEF="-DNETBSD"
++		ADDLIBS="-lx86_64"
++		;;
+ 	*)
+   		CC=gcc
+ 		;;
+ esac
diff --git a/sysutils/mbmon/patches/patch-ac b/sysutils/mbmon/patches/patch-ac
new file mode 100644
index 00000000000..1933149e911
--- /dev/null
+++ b/sysutils/mbmon/patches/patch-ac
@@ -0,0 +1,16 @@
+$NetBSD: patch-ac,v 1.1 2004/03/07 01:06:45 fvdl Exp $
+
+--- AC-TOOLS/config.sub.orig	2001-10-04 03:14:27.000000000 +0200
++++ AC-TOOLS/config.sub	2004-03-07 01:33:51.000000000 +0100
+@@ -181,9 +181,10 @@
+ 	      | sparclite-* | pdp11-* | sh-* | powerpc-* | powerpcle-* \
+ 	      | sparc64-* | mips64-* | mipsel-* \
+ 	      | mips64el-* | mips64orion-* | mips64orionel-*  \
+ 	      | mipstx39-* | mipstx39el-* \
+-	      | f301-*)
++	      | f301-* \
++	      | amd64-* | x86_64-*)
+ 		;;
+ 	# Recognize the various machine names and aliases which stand
+ 	# for a CPU type and a company and sometimes even an OS.
+ 	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
diff --git a/sysutils/mbmon/patches/patch-ad b/sysutils/mbmon/patches/patch-ad
new file mode 100644
index 00000000000..c04d6816e82
--- /dev/null
+++ b/sysutils/mbmon/patches/patch-ad
@@ -0,0 +1,14 @@
+--- io_static.c.orig	2003-03-14 06:04:51.000000000 +0100
++++ io_static.c	2004-03-07 01:53:17.000000000 +0100
+@@ -2,8 +2,11 @@
+ 
+ #include "io_cpu.h"
+ #ifdef NETBSD
+ #include "machine/sysarch.h"
++# ifdef __amd64__
++#  define i386_iopl x86_64_iopl
++# endif
+ #endif
+ 
+ static int OpenIO()
+ {