Update to 2.05:

 * Bugs for detecting ALi chipset fixed.
 * Further smoothing for plotting curves in xmbmon.
 * SMBus accesses of VIA VT8237 and Intel ICH6 are supported.
 * Problem related to select() system call fixed (by Tsuneyuki Sakano).
 * The part of IO port read/write is unified into an gas in-line
   assembler code (so, gcc with x86-gas is assumed!); a contribution
   by John Wehle (john@feith.com).
 * Changes to work on Solaris for x86 platform and others for
   cleaning up the codes, contributed by John Wehle (john@feith.com).
 * Others: Fixing small bugs.

8 files changed, 46 insertions, 70 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 2d6010462e7..f694e325d64 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.7 2004/07/19 10:10:10 recht Exp $
+# $NetBSD: Makefile,v 1.8 2004/11/22 20:15:29 wiz Exp $
 #
 
 .include "../../sysutils/mbmon/Makefile.common"
 
-PKGNAME=	mbmon-204
+PKGNAME=	mbmon-205
 
 MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	
diff --git a/sysutils/mbmon/Makefile.common b/sysutils/mbmon/Makefile.common
index c74c18ce05a..ba826e62fbb 100644
--- a/sysutils/mbmon/Makefile.common
+++ b/sysutils/mbmon/Makefile.common
@@ -1,18 +1,22 @@
-# $NetBSD: Makefile.common,v 1.11 2004/07/19 10:10:10 recht Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/11/22 20:15:29 wiz Exp $
 #
 
-DISTNAME=		xmbmon204
-CATEGORIES=		sysutils
-MASTER_SITES=		http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
-PATCH_SITES+=		${MASTER_SITES}
+DISTNAME=	xmbmon205
+CATEGORIES=	sysutils
+MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} xmbmon205conf.tar.gz
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
 
-GNU_CONFIGURE=		yes
-USE_BUILDLINK3=		yes
+GNU_CONFIGURE=	yes
+USE_BUILDLINK3=	yes
 
-DISTINFO_FILE?=		${.CURDIR}/../../sysutils/mbmon/distinfo
-PATCHDIR=		${.CURDIR}/../../sysutils/mbmon/patches
+DISTINFO_FILE?=	${.CURDIR}/../../sysutils/mbmon/distinfo
+PATCHDIR=	${.CURDIR}/../../sysutils/mbmon/patches
 
 ONLY_FOR_PLATFORM=	FreeBSD-*-i386 NetBSD-*-i386 OpenBSD-*-i386 NetBSD-*-x86_64
+
+# for xmbmon205conf.tar.gz -- remove during next update!
+post-extract:
+	mv ${WRKDIR}/configure* ${WRKSRC}
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
index 7565ba8d320..769860e374a 100644
--- a/sysutils/mbmon/distinfo
+++ b/sysutils/mbmon/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.8 2004/07/19 10:10:10 recht Exp $
+$NetBSD: distinfo,v 1.9 2004/11/22 20:15:29 wiz Exp $
 
-SHA1 (xmbmon204.tar.gz) = d51a11bbd7cb034d5283a8b21c507cbfe063fa12
-Size (xmbmon204.tar.gz) = 117994 bytes
-SHA1 (patch-aa) = 1e797f9907e34048ee874bb4fc3139646e85ed06
-SHA1 (patch-ab) = 8bfe1343691b6815dbac231cbc6dd7f45a84932f
-SHA1 (patch-ac) = 41fe8ab86d47814b1d28224587b5a80e5960a271
-SHA1 (patch-ad) = e076aeec1a792dba6d82cef89735b71da4984ef3
+SHA1 (xmbmon205.tar.gz) = 4fc4b1442a6e638b2c5cbcf9b26ca17465b0da70
+Size (xmbmon205.tar.gz) = 142987 bytes
+SHA1 (xmbmon205conf.tar.gz) = ec834490d9171b94092a1e0373f8eb36030c5d8e
+Size (xmbmon205conf.tar.gz) = 32462 bytes
+SHA1 (patch-aa) = 911efa33ae462e32963936249df1d0ab5036f006
+SHA1 (patch-ab) = 9b578976808160e960a77079f86621de0b6ccdf3
+SHA1 (patch-ac) = b9866fee24c4dd6652e59b23149fe01cb0253bed
diff --git a/sysutils/mbmon/patches/patch-aa b/sysutils/mbmon/patches/patch-aa
index 35675d35928..1bcf1185e10 100644
--- a/sysutils/mbmon/patches/patch-aa
+++ b/sysutils/mbmon/patches/patch-aa
@@ -1,41 +1,18 @@
 --- Makefile.in.orig	2004-07-18 02:15:42.000000000 +0100
 +++ Makefile.in	2004-07-18 02:19:16.000000000 +0100
-@@ -18,20 +18,19 @@
- 
- DEFS=-DHAVE_CONFIG_H -Wall @HOSTDEF@
- 
--LIBDIR=/usr/X11R6/lib
-+LIBDIR=${X11BASE}/lib
- INCDIR=.
--XINCDIR=/usr/X11R6/include
-+XINCDIR=${X11BASE}/include
- XLIB=-lXaw -lXmu
- EXTENSIONLIB=-lXext
- INCLUDES=-I$(INCDIR)
- XINCLUDES=-I$(XINCDIR)
- SPLIBS=@ADDLIBS@
--LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
-+LIBS=-Wl,-R${LIBDIR} -L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
+--- Makefile.in.orig	2004-08-13 09:04:21.000000000 +0200
++++ Makefile.in
+@@ -26,10 +26,10 @@ LIBS=@ADDLIBS@ @LIBS@
+ LIBSX=$(LIBS) @X_LIBS@ -lXt @X_PRE_LIBS@ -lX11 @X_EXTRA_LIBS@
  
  #CC=/compat/linux/usr/bin/gcc
 -CC=@CC@
 -CFLAGS=-O3 $(INCLUDES) $(DEFS)
--CFLAGSX=-O3 $(XINCLUDES) $(DEFS)
-+CFLAGS+= $(INCLUDES) $(DEFS)
-+CFLAGSX+= $(XINCLUDES) $(DEFS)
- LDFLAGS=-s
++#CC=@CC@
++CFLAGS+=$(INCLUDES) $(DEFS)
+ CFLAGSX=$(CFLAGS) @X_CFLAGS@
+-LDFLAGS=-s
++LDFLAGS+=-s
  
  LINT=lint
-@@ -42,9 +41,9 @@
- 
- INST_DIR=/usr/local/bin
- INST_MANDIR=/usr/local/man/man1
--INST_XDIR=/usr/X11R6/bin
--INST_MANXDIR=/usr/X11R6/man/man1
--INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
-+INST_XDIR=${X11BASE}/bin
-+INST_MANXDIR=${X11BASE}/man/man1
-+INST_XRDIR=${X11BASE}/lib/X11/app-defaults
-  
- .c.o:
- 	$(CC) -c $(CFLAGS) $*.c
+ # LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
diff --git a/sysutils/mbmon/patches/patch-ab b/sysutils/mbmon/patches/patch-ab
index de1b8121033..87bb26fabfc 100644
--- a/sysutils/mbmon/patches/patch-ab
+++ b/sysutils/mbmon/patches/patch-ab
@@ -1,8 +1,10 @@
 --- configure.orig	2004-07-18 02:20:24.000000000 +0100
 +++ configure	2004-07-18 02:21:41.000000000 +0100
-@@ -876,6 +876,11 @@
- 		HOSTDEF="-DNETBSD"
- 		ADDLIBS="-li386"
+--- configure.orig	2004-09-15 17:12:15.000000000 +0200
++++ configure
+@@ -3888,6 +3888,11 @@ fi
+ done
+ 
  		;;
 +	amd64-*-netbsd* | x86_64-*-netbsd*)
 +		CC=cc
@@ -11,4 +13,4 @@
 +		;;
  	*)
    		CC=gcc
- 		;;
+ 
diff --git a/sysutils/mbmon/patches/patch-ac b/sysutils/mbmon/patches/patch-ac
index da625e60735..65f26014569 100644
--- a/sysutils/mbmon/patches/patch-ac
+++ b/sysutils/mbmon/patches/patch-ac
@@ -1,6 +1,8 @@
 --- AC-TOOLS/config.sub.orig	2004-07-18 02:22:16.000000000 +0100
 +++ AC-TOOLS/config.sub	2004-07-18 02:23:09.000000000 +0100
-@@ -182,7 +182,8 @@
+--- AC-TOOLS/config.sub.orig	2001-10-04 03:14:27.000000000 +0200
++++ AC-TOOLS/config.sub
+@@ -182,7 +182,8 @@ case $basic_machine in
  	      | sparc64-* | mips64-* | mipsel-* \
  	      | mips64el-* | mips64orion-* | mips64orionel-*  \
  	      | mipstx39-* | mipstx39el-* \
diff --git a/sysutils/mbmon/patches/patch-ad b/sysutils/mbmon/patches/patch-ad
deleted file mode 100644
index 48d0f68911d..00000000000
--- a/sysutils/mbmon/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
---- io_static.c.orig	2004-07-18 02:25:12.000000000 +0100
-+++ io_static.c	2004-07-18 02:25:21.000000000 +0100
-@@ -3,6 +3,9 @@
- #include "io_cpu.h"
- #ifdef NETBSD
- #include "machine/sysarch.h"
-+# ifdef __amd64__
-+#  define i386_iopl x86_64_iopl
-+# endif
- #endif
- 
- static int OpenIO()
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 8920c4989b6..6ece6cd10c3 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/07/19 10:10:30 recht Exp $
+# $NetBSD: Makefile,v 1.6 2004/11/22 20:15:29 wiz Exp $
 #
 
 .include "../../sysutils/mbmon/Makefile.common"
 
-PKGNAME=	xmbmon-204
+PKGNAME=	xmbmon-205
 
 COMMENT=	X11-based motherboard monitoring utility
 
@@ -11,6 +11,8 @@ USE_X11=	yes
 
 ALL_TARGET=	xmbmon
 
+LDFLAGS+=	-Wl,-R${X11BASE}/lib
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmbmon ${PREFIX}/bin