5 files changed, 30 insertions, 68 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 04c3fe8f18ba..1ff42589ec67 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xmbmon
-PORTVERSION=	203
-PORTREVISION=	1
+PORTVERSION=	204
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
 .if defined(WITHOUT_X11)
@@ -26,7 +25,9 @@ USE_XLIB=	yes
 PLIST_SUB=	X11_ONLY=""
 .endif
 
-MAKE_ARGS+=	DOCSDIR='${DOCSDIR}' INSTALL_DATA='${INSTALL_DATA}'
+MAKE_ARGS+=	DOCSDIR='${DOCSDIR}' INSTALL_DATA='${INSTALL_DATA}' PREFIX='${PREFIX}'
+
+MAN1=		xmbmon.1x
 
 .include <bsd.port.pre.mk>
 
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
index 2c8e03148385..b3ebc75c70df 100644
--- a/sysutils/mbmon/distinfo
+++ b/sysutils/mbmon/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmbmon203.tar.gz) = f84e48b8e433170358cec840020b2419
-SIZE (xmbmon203.tar.gz) = 113252
+MD5 (xmbmon204.tar.gz) = 68516bf34c7a624b23122ba575b579cb
+SIZE (xmbmon204.tar.gz) = 117994
diff --git a/sysutils/mbmon/files/patch-aa b/sysutils/mbmon/files/patch-aa
index 89496d8d1562..58babcd1f9cd 100644
--- a/sysutils/mbmon/files/patch-aa
+++ b/sysutils/mbmon/files/patch-aa
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Sun Jun  8 21:28:31 2003
-+++ Makefile.in	Sun Jul 27 13:11:15 2003
-@@ -13,9 +13,9 @@
+--- Makefile.in.orig	Sat May  1 22:20:14 2004
++++ Makefile.in	Mon May 24 22:14:19 2004
+@@ -18,9 +18,9 @@
  
  DEFS=-DHAVE_CONFIG_H -Wall @HOSTDEF@
  
@@ -12,7 +12,7 @@
  XLIB=-lXaw -lXmu
  EXTENSIONLIB=-lXext
  INCLUDES=-I$(INCDIR)
-@@ -24,9 +24,9 @@
+@@ -29,9 +29,9 @@
  LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
  
  #CC=/compat/linux/usr/bin/gcc
@@ -25,35 +25,40 @@
  LDFLAGS=-s
  
  LINT=lint
-@@ -35,16 +35,22 @@
+@@ -40,19 +40,25 @@
  RM=rm -f
  INSTALL=install
  
 -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_DIR=$(PREFIX)/bin
-+INST_XDIR=$(PREFIX)/bin
++INST_MANDIR=$(PREFIX)/man/man1
++INST_XDIR=$(X11BASE)/bin
++INST_MANXDIR=$(X11BASE)/man/man1
 +INST_XRDIR=$(X11BASE)/lib/X11/app-defaults
   
  .c.o:
  	$(CC) -c $(CFLAGS) $*.c
  
+ MANPAGE = mbmon.1 xmbmon.1x
 -PROGRAM = mbmon xmbmon
 -
 +PROGRAM = mbmon
  TESTPROG = testpci testsmb testhwm testfan
-+DOCS=	00README.txt 00READMEj.txt 00READMEtech.txt
++DOCS= ReadMe ReadMe.jp ReadMe.tech
 +.if !defined(WITHOUT_X11)
 +DOCS+=	xmbmon.resources
 +PROGRAM+= xmbmon
 +.endif
-+  
++
 +all: $(PROGRAM) $(TESTPROG)
  
  MB_OBJ  = getMB-via.o getMB-smb.o getMB-isa.o
  SMB_OBJ = smbuses.o smbus_piix4.o smbus_amd.o smbus_ali.o smbus_amd8.o
-@@ -124,8 +130,14 @@
+@@ -136,12 +142,18 @@
  	$(RM) Makefile config.cache config.log config.h config.status
  
  install: $(PROGRAM)
@@ -63,10 +68,15 @@
 +		$(INSTALL) -o root -g wheel -m 4555 -c -p $$i $(INST_DIR); \
 +	done
  
- lint:
- 	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm
+ install-man: $(MANPAGE)
+ 	$(INSTALL) -o root -g wheel -m 444 -c -p mbmon.1 $(INST_MANDIR)
+-	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANXDIR)
 +
 +install-doc:
 +	@for f in $(DOCS); do \
 +		$(INSTALL_DATA) $$f $(DOCSDIR)/; \
 +	done
++	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANDIR)
+ 
+ lint:
+ 	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm
diff --git a/sysutils/mbmon/files/patch-sens_winbond.c b/sysutils/mbmon/files/patch-sens_winbond.c
deleted file mode 100644
index ee1f521ae38f..000000000000
--- a/sysutils/mbmon/files/patch-sens_winbond.c
+++ /dev/null
@@ -1,49 +0,0 @@
---- sens_winbond.c.orig	Sat Jul  5 07:56:47 2003
-+++ sens_winbond.c	Sun Oct 12 20:17:01 2003
-@@ -86,6 +86,7 @@
- #define	WINBD_FANDIV	0x47
- #define	WINBD_REGPIN	0x4B
- #define	ASUSM_FANDIV	0xA1
-+#define	ANADM_TEMPCFG	0x4B
- 
- #define WINBD_DIOSEL	0x59
- #define WINBD_VMCTRL	0x5D
-@@ -299,6 +300,12 @@
- 		goto ret1;
- 	}
- 
-+	if (wbdchipid == ADM9240) {
-+		temp1_flag = temp2_flag = 1;	/* disable! */
-+		method->Write(WINBD_CONFIG, 0x01);	/* init. chip */
-+		goto ret1;
-+	}
-+
- 	if (method == &method_isa && wbdchipid >= LM78) {
- 		temp1_flag = temp2_flag = 1;	/* disable! */
- 		goto ret1;
-@@ -364,9 +371,15 @@
- 		(wbdchipid == W83783S || wbdchipid == W83697HF || wbdchipid == ASM58))
- 		return 0xFFFF;
- 
--	if (no == 0)
--		return (float) method->Read(WINBD_TEMP0);
--	else if (no == 1) {
-+	if (no == 0) {
-+		f = (float) method->Read(WINBD_TEMP0);
-+		if (wbdchipid == ADM9240) {
-+			n = method->Read(ANADM_TEMPCFG);
-+			if (n & 0x80)
-+				f += 0.5;
-+		}
-+		return f;
-+	} else if (no == 1) {
- 		if (wbdchipid == ASB100) 
- 			return (float) method->Read(ASUSB_TEMP4);
- 		if (wbdchipid == ASM58) 
-@@ -518,5 +531,5 @@
- 		return 0xFFFF;
- 	}
- 
--	return 1350000 / (r * (1 << div[no]));
-+	return 22500 * 60 / (r * (1 << div[no]));
- }
diff --git a/sysutils/mbmon/pkg-plist b/sysutils/mbmon/pkg-plist
index d4a57ddbd8d7..166dea5bd162 100644
--- a/sysutils/mbmon/pkg-plist
+++ b/sysutils/mbmon/pkg-plist
@@ -1,7 +1,7 @@
 bin/mbmon
 %%X11_ONLY%%bin/xmbmon
-%%PORTDOCS%%%%DOCSDIR%%/00README.txt
-%%PORTDOCS%%%%DOCSDIR%%/00READMEj.txt
-%%PORTDOCS%%%%DOCSDIR%%/00READMEtech.txt
+%%PORTDOCS%%%%DOCSDIR%%/ReadMe
+%%PORTDOCS%%%%DOCSDIR%%/ReadMe.jp
+%%PORTDOCS%%%%DOCSDIR%%/ReadMe.tech
 %%X11_ONLY%%%%PORTDOCS%%%%DOCSDIR%%/xmbmon.resources
 %%PORTDOCS%%@dirrm %%DOCSDIR%%