update mbmon to 2.04

patch provided by Sergio Jimenez in PR 26355

* The modified BSD license is set from this version.

* Logging facility in the daemon mode is included (but unabled
  in default, contribution by David Quattlebaum ).

* IIR low path filter smoothing method is included for plotting
  graphs in xmbmon (contribution by Takayuki Hosoda).

* Manual files are contributed by Nicolas Rueff .

* Winbond W83791D, W83627THF chips are supported.

* Initialization of ADM9240 chip for some Intel motherboards
  (by Alex Vasylenko).

* SMBus access of ALI1533/1543 chipset (Aladdin IV, V)
  is supported.

* ISA access of 2nd and 3rd temperatures for Winbond chips fails
  in most of motherboard.  Due to this problem, fraction of these
  temperatures is always 0.5.  This "bug" is fixed now.

 * Others: Fixing small bugs.

8 files changed, 30 insertions, 47 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index dfbbc239f3d..2d6010462e7 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.6 2004/04/07 13:59:40 recht Exp $
+# $NetBSD: Makefile,v 1.7 2004/07/19 10:10:10 recht Exp $
 #
 
 .include "../../sysutils/mbmon/Makefile.common"
 
-PKGNAME=	mbmon-203
-PKGREVISION=	1
+PKGNAME=	mbmon-204
 
 MAINTAINER=	tech-pkg@NetBSD.org
 #HOMEPAGE=	
diff --git a/sysutils/mbmon/Makefile.common b/sysutils/mbmon/Makefile.common
index b42f5d655c2..c74c18ce05a 100644
--- a/sysutils/mbmon/Makefile.common
+++ b/sysutils/mbmon/Makefile.common
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile.common,v 1.10 2004/04/07 13:59:40 recht Exp $
+# $NetBSD: Makefile.common,v 1.11 2004/07/19 10:10:10 recht Exp $
 #
 
-DISTNAME=		xmbmon203
+DISTNAME=		xmbmon204
 CATEGORIES=		sysutils
 MASTER_SITES=		http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
 PATCH_SITES+=		${MASTER_SITES}
-PATCHFILES+=		xmbmon200203temp23.diff
-PATCH_DIST_STRIP=	-p0
 
 MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
diff --git a/sysutils/mbmon/PLIST b/sysutils/mbmon/PLIST
index 557fe16868d..1b99ad6db73 100644
--- a/sysutils/mbmon/PLIST
+++ b/sysutils/mbmon/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/05/28 07:22:54 agc Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/07/19 10:10:10 recht Exp $
 bin/mbmon
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
index 961a8ed95eb..7565ba8d320 100644
--- a/sysutils/mbmon/distinfo
+++ b/sysutils/mbmon/distinfo
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.7 2004/04/07 13:59:40 recht Exp $
+$NetBSD: distinfo,v 1.8 2004/07/19 10:10:10 recht Exp $
 
-SHA1 (xmbmon203.tar.gz) = 009ccd550d4aa1acc830948d5be304f142c78341
-Size (xmbmon203.tar.gz) = 113252 bytes
-SHA1 (xmbmon200203temp23.diff) = a843e9cf49f0a7b8084bc7764544a8c40bfdf265
-Size (xmbmon200203temp23.diff) = 531 bytes
-SHA1 (patch-aa) = f7329f826e61cb6803d49a1d9e78fc55edde1098
-SHA1 (patch-ab) = bfc75d75dfc1d976d3920ff4fb56dcbe45f06421
-SHA1 (patch-ac) = cf9dedf838f26092472ac8eff35138313b894445
-SHA1 (patch-ad) = ed9b64a127af6e70e7d9d9e095bdb88cb6de11ea
+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
diff --git a/sysutils/mbmon/patches/patch-aa b/sysutils/mbmon/patches/patch-aa
index 7bed8b1346d..35675d35928 100644
--- a/sysutils/mbmon/patches/patch-aa
+++ b/sysutils/mbmon/patches/patch-aa
@@ -1,8 +1,6 @@
-$NetBSD: patch-aa,v 1.4 2004/03/07 01:34:04 snj Exp $
-
---- Makefile.in.orig	2003-07-03 20:13:45.000000000 -0700
-+++ Makefile.in	2004-03-06 17:27:16.000000000 -0800
-@@ -15,20 +15,19 @@
+--- 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@
  
@@ -24,17 +22,19 @@ $NetBSD: patch-aa,v 1.4 2004/03/07 01:34:04 snj Exp $
 -CFLAGS=-O3 $(INCLUDES) $(DEFS)
 -CFLAGSX=-O3 $(XINCLUDES) $(DEFS)
 +CFLAGS+= $(INCLUDES) $(DEFS)
-+CFLAGSX= $(CFLAGS) $(XINCLUDES)
++CFLAGSX+= $(XINCLUDES) $(DEFS)
  LDFLAGS=-s
  
  LINT=lint
-@@ -38,8 +37,8 @@ RM=rm -f
- INSTALL=install
+@@ -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:
diff --git a/sysutils/mbmon/patches/patch-ab b/sysutils/mbmon/patches/patch-ab
index 587846569a3..de1b8121033 100644
--- a/sysutils/mbmon/patches/patch-ab
+++ b/sysutils/mbmon/patches/patch-ab
@@ -1,18 +1,14 @@
-$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
+--- 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"
  		;;
 +	amd64-*-netbsd* | x86_64-*-netbsd*)
-+  		CC=cc
++		CC=cc
 +		HOSTDEF="-DNETBSD"
 +		ADDLIBS="-lx86_64"
 +		;;
  	*)
    		CC=gcc
  		;;
- esac
diff --git a/sysutils/mbmon/patches/patch-ac b/sysutils/mbmon/patches/patch-ac
index 1933149e911..da625e60735 100644
--- a/sysutils/mbmon/patches/patch-ac
+++ b/sysutils/mbmon/patches/patch-ac
@@ -1,9 +1,6 @@
-$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-* \
+--- 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 @@
  	      | sparc64-* | mips64-* | mipsel-* \
  	      | mips64el-* | mips64orion-* | mips64orionel-*  \
  	      | mipstx39-* | mipstx39el-* \
@@ -13,4 +10,3 @@ $NetBSD: patch-ac,v 1.1 2004/03/07 01:06:45 fvdl Exp $
  		;;
  	# 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
index 984172f7710..48d0f68911d 100644
--- a/sysutils/mbmon/patches/patch-ad
+++ b/sysutils/mbmon/patches/patch-ad
@@ -1,9 +1,6 @@
-$NetBSD: patch-ad,v 1.2 2004/03/07 01:23:13 snj Exp $
-
---- 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 @@
- 
+--- 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"
@@ -13,4 +10,3 @@ $NetBSD: patch-ad,v 1.2 2004/03/07 01:23:13 snj Exp $
  #endif
  
  static int OpenIO()
- {