maintainer-update of xmbmon port.

	maintainer-update of xmbmon port.
	TO VERSION 205

PR:		ports/71814
Submitted by:	NAKAMURA Kazushi <kaz@kobe1995.net>

8 files changed, 24 insertions, 50 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 1ff42589ec67..875485728daf 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmbmon
-PORTVERSION=	204
+PORTVERSION=	205
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
 .if defined(WITHOUT_X11)
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
index b3ebc75c70df..3dbd76b6f0f8 100644
--- a/sysutils/mbmon/distinfo
+++ b/sysutils/mbmon/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmbmon204.tar.gz) = 68516bf34c7a624b23122ba575b579cb
-SIZE (xmbmon204.tar.gz) = 117994
+MD5 (xmbmon205.tar.gz) = ab6614c785f5b653fcc69fb9c02058f0
+SIZE (xmbmon204.tar.gz) = 142987
diff --git a/sysutils/mbmon/files/patch-aa b/sysutils/mbmon/files/patch-aa
index 58babcd1f9cd..3b4e65a7d9ac 100644
--- a/sysutils/mbmon/files/patch-aa
+++ b/sysutils/mbmon/files/patch-aa
@@ -1,31 +1,17 @@
---- 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@
- 
--LIBDIR=/usr/X11R6/lib
-+LIBDIR=$(X11BASE)/lib
- INCDIR=.
--XINCDIR=/usr/X11R6/include
-+XINCDIR=$(X11BASE)/include
- XLIB=-lXaw -lXmu
- EXTENSIONLIB=-lXext
- INCLUDES=-I$(INCDIR)
-@@ -29,9 +29,9 @@
- LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
+--- Makefile.in.orig	Fri Aug 13 16:04:21 2004
++++ Makefile.in	Fri Sep 17 05:34:33 2004
+@@ -26,8 +26,8 @@
+ 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)
 +CC?=@CC@
-+CFLAGS+= $(INCLUDES) $(DEFS)
-+CFLAGSX= $(XINCLUDES) $(DEFS)
++CFLAGS+=$(INCLUDES) $(DEFS)
+ CFLAGSX=$(CFLAGS) @X_CFLAGS@
  LDFLAGS=-s
  
- LINT=lint
-@@ -40,19 +40,25 @@
+@@ -37,19 +37,25 @@
  RM=rm -f
  INSTALL=install
  
@@ -58,7 +44,7 @@
  
  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
-@@ -136,12 +142,18 @@
+@@ -133,12 +139,18 @@
  	$(RM) Makefile config.cache config.log config.h config.status
  
  install: $(PROGRAM)
diff --git a/sysutils/mbmon/files/patch-testsmb.c b/sysutils/mbmon/files/patch-testsmb.c
index ceabe4903225..f02a2e6b69cb 100644
--- a/sysutils/mbmon/files/patch-testsmb.c
+++ b/sysutils/mbmon/files/patch-testsmb.c
@@ -17,6 +17,7 @@ $FreeBSD$
  	
  	CloseIO();
 -exit:
+	;	/* dummy statment for gcc 3.4 or after */
  
    } /* endo of Big roop for smb_base candidates */
    exit (0);
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 1ff42589ec67..875485728daf 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	xmbmon
-PORTVERSION=	204
+PORTVERSION=	205
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
 .if defined(WITHOUT_X11)
diff --git a/sysutils/xmbmon/distinfo b/sysutils/xmbmon/distinfo
index b3ebc75c70df..3dbd76b6f0f8 100644
--- a/sysutils/xmbmon/distinfo
+++ b/sysutils/xmbmon/distinfo
@@ -1,2 +1,2 @@
-MD5 (xmbmon204.tar.gz) = 68516bf34c7a624b23122ba575b579cb
-SIZE (xmbmon204.tar.gz) = 117994
+MD5 (xmbmon205.tar.gz) = ab6614c785f5b653fcc69fb9c02058f0
+SIZE (xmbmon204.tar.gz) = 142987
diff --git a/sysutils/xmbmon/files/patch-aa b/sysutils/xmbmon/files/patch-aa
index 58babcd1f9cd..3b4e65a7d9ac 100644
--- a/sysutils/xmbmon/files/patch-aa
+++ b/sysutils/xmbmon/files/patch-aa
@@ -1,31 +1,17 @@
---- 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@
- 
--LIBDIR=/usr/X11R6/lib
-+LIBDIR=$(X11BASE)/lib
- INCDIR=.
--XINCDIR=/usr/X11R6/include
-+XINCDIR=$(X11BASE)/include
- XLIB=-lXaw -lXmu
- EXTENSIONLIB=-lXext
- INCLUDES=-I$(INCDIR)
-@@ -29,9 +29,9 @@
- LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
+--- Makefile.in.orig	Fri Aug 13 16:04:21 2004
++++ Makefile.in	Fri Sep 17 05:34:33 2004
+@@ -26,8 +26,8 @@
+ 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)
 +CC?=@CC@
-+CFLAGS+= $(INCLUDES) $(DEFS)
-+CFLAGSX= $(XINCLUDES) $(DEFS)
++CFLAGS+=$(INCLUDES) $(DEFS)
+ CFLAGSX=$(CFLAGS) @X_CFLAGS@
  LDFLAGS=-s
  
- LINT=lint
-@@ -40,19 +40,25 @@
+@@ -37,19 +37,25 @@
  RM=rm -f
  INSTALL=install
  
@@ -58,7 +44,7 @@
  
  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
-@@ -136,12 +142,18 @@
+@@ -133,12 +139,18 @@
  	$(RM) Makefile config.cache config.log config.h config.status
  
  install: $(PROGRAM)
diff --git a/sysutils/xmbmon/files/patch-testsmb.c b/sysutils/xmbmon/files/patch-testsmb.c
index ceabe4903225..f02a2e6b69cb 100644
--- a/sysutils/xmbmon/files/patch-testsmb.c
+++ b/sysutils/xmbmon/files/patch-testsmb.c
@@ -17,6 +17,7 @@ $FreeBSD$
  	
  	CloseIO();
 -exit:
+	;	/* dummy statment for gcc 3.4 or after */
  
    } /* endo of Big roop for smb_base candidates */
    exit (0);