Update to 201

PR:		ports/42984
Submitted by:	maintainer

14 files changed, 78 insertions, 134 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 51ee399805dc..68d915252468 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -1,26 +1,24 @@
-# ports collection makefile for:	xmbmon
-# Date created:	2001/08/30
-# Whom:		kaz
+# Ports collection makefile for:	xmbmon
+# Date created:				2001/08/30
+# Whom:					kaz@kobe1995.net (NAKAMURA Kauzushi)
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xmbmon
-PORTVERSION=	107p1
+PORTVERSION=	201
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/p/pl/}
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-nox11
+.endif
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	kaz@kobe1995.net
 
 GNU_CONFIGURE=	yes
-DOCS=	00README.txt	00READMEj.txt	DEBUG_Info	xmbmon.resources
-
-WITHOUT_X11?= no
-
-.if (${WITHOUT_X11} == yes)
-MAKE_ARGS+=	WITHOUT_X11=yes DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
-DOCS=   	00README.txt    00READMEj.txt   DEBUG_Info
+.if defined(WITHOUT_X11)
+MAKE_ARGS+=	DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
 PLIST_SUB=	X11_ONLY="@comment "
 .else
 USE_XLIB=	yes
@@ -28,21 +26,12 @@ MAKE_ARGS+=	DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
 PLIST_SUB=	X11_ONLY=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-pre-extract:
-	@${ECHO}
-	@${ECHO} "set WITHOUT_X11 variable to 'yes' if you want to build without X11"
-	@${ECHO}
-
-post-patch:
-	@${MV} -f ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.X
-.if ${WITHOUT_X11} == yes
-	@${GREP} -v '^PROGRAM+=' ${WRKSRC}/Makefile.in.X | ${SED} 's/__DOCS__/$(DOCS)/' > ${WRKSRC}/Makefile.in
-.else
-	@${SED} 's/__DOCS__/$(DOCS)/' ${WRKSRC}/Makefile.in.X > ${WRKSRC}/Makefile.in
-.endif
-	@${RM} -f ${WRKSRC}/Makefile.in.X
+pre-everything::
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Definable build options"
+	@${ECHO_CMD} "-----------------------"
+	@${ECHO_CMD} "WITHOUT_X11	- Self explanatory"
+	@${ECHO_CMD} ""
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -50,4 +39,4 @@ post-install:
 	(cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-doc)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/mbmon/distinfo b/sysutils/mbmon/distinfo
index 3e32df83df34..b402f6e23dd8 100644
--- a/sysutils/mbmon/distinfo
+++ b/sysutils/mbmon/distinfo
@@ -1 +1 @@
-MD5 (xmbmon107pl1.tar.gz) = 086ba6c4ba6c99f860cf01f2e6b940d8
+MD5 (xmbmon201.tar.gz) = 1774fdd5ef6b6fa6b119ca5826381aac
diff --git a/sysutils/mbmon/files/patch-aa b/sysutils/mbmon/files/patch-aa
index bd02f62b0bb2..f07e3c43fc0e 100644
--- a/sysutils/mbmon/files/patch-aa
+++ b/sysutils/mbmon/files/patch-aa
@@ -1,8 +1,8 @@
---- Makefile.in~	Mon Feb 11 00:43:27 2002
-+++ Makefile.in	Sun Feb 17 13:33:34 2002
-@@ -11,9 +11,9 @@
+--- Makefile.in.orig	Thu Aug 22 14:03:21 2002
++++ Makefile.in	Fri Nov 22 22:14:39 2002
+@@ -13,9 +13,9 @@
  
- DEFS=-DHAVE_CONFIG_H
+ DEFS=-DHAVE_CONFIG_H -Wall
  
 -LIBDIR=/usr/X11R6/lib
 +LIBDIR=$(X11BASE)/lib
@@ -12,7 +12,7 @@
  XLIB=-lXaw -lXmu
  EXTENSIONLIB=-lXext
  INCLUDES=-I$(INCDIR)
-@@ -21,9 +21,9 @@
+@@ -23,9 +23,9 @@
  LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
  
  #CC=/compat/linux/usr/bin/gcc
@@ -25,7 +25,7 @@
  LDFLAGS=-s
  
  LINT=lint
-@@ -32,16 +32,19 @@
+@@ -34,16 +34,22 @@
  RM=rm -f
  INSTALL=install
  
@@ -39,18 +39,21 @@
  .c.o:
  	$(CC) -c $(CFLAGS) $*.c
  
--PROGRAM = mbmon xmbmon testpci testsmb testhwm testfan
+-PROGRAM = mbmon xmbmon
+-
 +PROGRAM = mbmon
-+TESTER	= testpci testsmb testhwm testfan
-+DOCS=	00README.txt	00READMEj.txt	DEBUG_Info	xmbmon.resources
+ TESTPROG = testpci testsmb testhwm testfan
++DOCS=	00README.txt 00READMEj.txt 00READMEtech.txt
++.if !defined(WITHOUT_X11)
++DOCS+=	xmbmon.resources
 +PROGRAM+= xmbmon
++.endif
++  
++all: $(PROGRAM) $(TESTPROG)
  
--all: $(PROGRAM)
-+all: $(PROGRAM) $(TESTER)
- 
- mbmon: methods.h mbmon.c mbmon_small.c getMBinfo.o getMB-isa.o getMB-smb.o getMB-via.o pci_hwm.h pci_hwm.o smb_io.h smb_io.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c getMBinfo.o getMB-isa.o getMB-smb.o getMB-via.o pci_hwm.o
-@@ -68,8 +71,14 @@
+ MB_OBJ  = getMB-via.o getMB-smb.o getMB-isa.o
+ SMB_OBJ = smbus_piix4.o smbus_amd.o smbus_ali.o
+@@ -115,8 +121,14 @@
  	$(RM) Makefile config.cache config.log config.h config.status
  
  install: $(PROGRAM)
@@ -63,7 +66,7 @@
  lint:
  	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm
 +
-+install-doc: $(DOCS)
++install-doc:
 +	@for f in $(DOCS); do \
 +		$(INSTALL_DATA) $$f $(DOCSDIR)/; \
 +	done
diff --git a/sysutils/mbmon/files/patch-getMB-isa.c b/sysutils/mbmon/files/patch-getMB-isa.c
deleted file mode 100644
index 02d4e1a4f454..000000000000
--- a/sysutils/mbmon/files/patch-getMB-isa.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- getMB-isa.c.orig	Tue Dec 10 08:56:28 2002
-+++ getMB-isa.c	Tue Dec 10 08:57:21 2002
-@@ -8,6 +8,7 @@
- #include <fcntl.h>
- 
- #ifndef LINUX	/* FreeBSD */
-+#include <sys/types.h>
- #include <machine/cpufunc.h>
- #define OUTb(x,y)	outb((x),(y))
- #define WAIT	outb(0xEB,0x00)
diff --git a/sysutils/mbmon/files/patch-getMB-via.c b/sysutils/mbmon/files/patch-getMB-via.c
deleted file mode 100644
index 81e59e2e893e..000000000000
--- a/sysutils/mbmon/files/patch-getMB-via.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- getMB-via.c.orig	Tue Dec 10 08:56:53 2002
-+++ getMB-via.c	Tue Dec 10 08:59:07 2002
-@@ -11,6 +11,7 @@
- #include <fcntl.h>
- 
- #ifndef LINUX	/* FreeBSD */
-+#include <sys/types.h>
- #include <machine/cpufunc.h>
- #define OUTb(x,y)	outb((x),(y))
- #define WAIT	outb(0xEB,0x00)
diff --git a/sysutils/mbmon/pkg-descr b/sysutils/mbmon/pkg-descr
index ee95fa4f82b7..5d70f1cac7a3 100644
--- a/sysutils/mbmon/pkg-descr
+++ b/sysutils/mbmon/pkg-descr
@@ -12,4 +12,4 @@ the superuser privilege, so it may cause a system crash.  Please test
 
 WWW: http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
 -- 
-kaz
+kaz@kobe1995.net (NAKAMURA Kazushi)
diff --git a/sysutils/mbmon/pkg-plist b/sysutils/mbmon/pkg-plist
index 80e6f5358632..d9e45a916c44 100644
--- a/sysutils/mbmon/pkg-plist
+++ b/sysutils/mbmon/pkg-plist
@@ -2,6 +2,6 @@ bin/mbmon
 %%X11_ONLY%%bin/xmbmon
 %%PORTDOCS%%share/doc/xmbmon/00README.txt
 %%PORTDOCS%%share/doc/xmbmon/00READMEj.txt
-%%PORTDOCS%%share/doc/xmbmon/DEBUG_Info
+%%PORTDOCS%%share/doc/xmbmon/00READMEtech.txt
 %%X11_ONLY%%%%PORTDOCS%%share/doc/xmbmon/xmbmon.resources
 %%PORTDOCS%%@dirrm share/doc/xmbmon
diff --git a/sysutils/xmbmon/Makefile b/sysutils/xmbmon/Makefile
index 51ee399805dc..68d915252468 100644
--- a/sysutils/xmbmon/Makefile
+++ b/sysutils/xmbmon/Makefile
@@ -1,26 +1,24 @@
-# ports collection makefile for:	xmbmon
-# Date created:	2001/08/30
-# Whom:		kaz
+# Ports collection makefile for:	xmbmon
+# Date created:				2001/08/30
+# Whom:					kaz@kobe1995.net (NAKAMURA Kauzushi)
 #
 # $FreeBSD$
 #
 
 PORTNAME=	xmbmon
-PORTVERSION=	107p1
+PORTVERSION=	201
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/
-DISTNAME=	${PORTNAME}${PORTVERSION:S/p/pl/}
+.if defined(WITHOUT_X11)
+PKGNAMESUFFIX=	-nox11
+.endif
+DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	kaz@kobe1995.net
 
 GNU_CONFIGURE=	yes
-DOCS=	00README.txt	00READMEj.txt	DEBUG_Info	xmbmon.resources
-
-WITHOUT_X11?= no
-
-.if (${WITHOUT_X11} == yes)
-MAKE_ARGS+=	WITHOUT_X11=yes DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
-DOCS=   	00README.txt    00READMEj.txt   DEBUG_Info
+.if defined(WITHOUT_X11)
+MAKE_ARGS+=	DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
 PLIST_SUB=	X11_ONLY="@comment "
 .else
 USE_XLIB=	yes
@@ -28,21 +26,12 @@ MAKE_ARGS+=	DOCSDIR='$(DOCSDIR)' INSTALL_DATA='$(INSTALL_DATA)'
 PLIST_SUB=	X11_ONLY=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-pre-extract:
-	@${ECHO}
-	@${ECHO} "set WITHOUT_X11 variable to 'yes' if you want to build without X11"
-	@${ECHO}
-
-post-patch:
-	@${MV} -f ${WRKSRC}/Makefile.in ${WRKSRC}/Makefile.in.X
-.if ${WITHOUT_X11} == yes
-	@${GREP} -v '^PROGRAM+=' ${WRKSRC}/Makefile.in.X | ${SED} 's/__DOCS__/$(DOCS)/' > ${WRKSRC}/Makefile.in
-.else
-	@${SED} 's/__DOCS__/$(DOCS)/' ${WRKSRC}/Makefile.in.X > ${WRKSRC}/Makefile.in
-.endif
-	@${RM} -f ${WRKSRC}/Makefile.in.X
+pre-everything::
+	@${ECHO_CMD} ""
+	@${ECHO_CMD} "Definable build options"
+	@${ECHO_CMD} "-----------------------"
+	@${ECHO_CMD} "WITHOUT_X11	- Self explanatory"
+	@${ECHO_CMD} ""
 
 post-install:
 .if !defined(NOPORTDOCS)
@@ -50,4 +39,4 @@ post-install:
 	(cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-doc)
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/sysutils/xmbmon/distinfo b/sysutils/xmbmon/distinfo
index 3e32df83df34..b402f6e23dd8 100644
--- a/sysutils/xmbmon/distinfo
+++ b/sysutils/xmbmon/distinfo
@@ -1 +1 @@
-MD5 (xmbmon107pl1.tar.gz) = 086ba6c4ba6c99f860cf01f2e6b940d8
+MD5 (xmbmon201.tar.gz) = 1774fdd5ef6b6fa6b119ca5826381aac
diff --git a/sysutils/xmbmon/files/patch-aa b/sysutils/xmbmon/files/patch-aa
index bd02f62b0bb2..f07e3c43fc0e 100644
--- a/sysutils/xmbmon/files/patch-aa
+++ b/sysutils/xmbmon/files/patch-aa
@@ -1,8 +1,8 @@
---- Makefile.in~	Mon Feb 11 00:43:27 2002
-+++ Makefile.in	Sun Feb 17 13:33:34 2002
-@@ -11,9 +11,9 @@
+--- Makefile.in.orig	Thu Aug 22 14:03:21 2002
++++ Makefile.in	Fri Nov 22 22:14:39 2002
+@@ -13,9 +13,9 @@
  
- DEFS=-DHAVE_CONFIG_H
+ DEFS=-DHAVE_CONFIG_H -Wall
  
 -LIBDIR=/usr/X11R6/lib
 +LIBDIR=$(X11BASE)/lib
@@ -12,7 +12,7 @@
  XLIB=-lXaw -lXmu
  EXTENSIONLIB=-lXext
  INCLUDES=-I$(INCDIR)
-@@ -21,9 +21,9 @@
+@@ -23,9 +23,9 @@
  LIBS=-L$(LIBDIR) -lXaw $(XLIB) -lXt $(EXTENSIONLIB) -lX11 -lm
  
  #CC=/compat/linux/usr/bin/gcc
@@ -25,7 +25,7 @@
  LDFLAGS=-s
  
  LINT=lint
-@@ -32,16 +32,19 @@
+@@ -34,16 +34,22 @@
  RM=rm -f
  INSTALL=install
  
@@ -39,18 +39,21 @@
  .c.o:
  	$(CC) -c $(CFLAGS) $*.c
  
--PROGRAM = mbmon xmbmon testpci testsmb testhwm testfan
+-PROGRAM = mbmon xmbmon
+-
 +PROGRAM = mbmon
-+TESTER	= testpci testsmb testhwm testfan
-+DOCS=	00README.txt	00READMEj.txt	DEBUG_Info	xmbmon.resources
+ TESTPROG = testpci testsmb testhwm testfan
++DOCS=	00README.txt 00READMEj.txt 00READMEtech.txt
++.if !defined(WITHOUT_X11)
++DOCS+=	xmbmon.resources
 +PROGRAM+= xmbmon
++.endif
++  
++all: $(PROGRAM) $(TESTPROG)
  
--all: $(PROGRAM)
-+all: $(PROGRAM) $(TESTER)
- 
- mbmon: methods.h mbmon.c mbmon_small.c getMBinfo.o getMB-isa.o getMB-smb.o getMB-via.o pci_hwm.h pci_hwm.o smb_io.h smb_io.c
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c getMBinfo.o getMB-isa.o getMB-smb.o getMB-via.o pci_hwm.o
-@@ -68,8 +71,14 @@
+ MB_OBJ  = getMB-via.o getMB-smb.o getMB-isa.o
+ SMB_OBJ = smbus_piix4.o smbus_amd.o smbus_ali.o
+@@ -115,8 +121,14 @@
  	$(RM) Makefile config.cache config.log config.h config.status
  
  install: $(PROGRAM)
@@ -63,7 +66,7 @@
  lint:
  	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm
 +
-+install-doc: $(DOCS)
++install-doc:
 +	@for f in $(DOCS); do \
 +		$(INSTALL_DATA) $$f $(DOCSDIR)/; \
 +	done
diff --git a/sysutils/xmbmon/files/patch-getMB-isa.c b/sysutils/xmbmon/files/patch-getMB-isa.c
deleted file mode 100644
index 02d4e1a4f454..000000000000
--- a/sysutils/xmbmon/files/patch-getMB-isa.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- getMB-isa.c.orig	Tue Dec 10 08:56:28 2002
-+++ getMB-isa.c	Tue Dec 10 08:57:21 2002
-@@ -8,6 +8,7 @@
- #include <fcntl.h>
- 
- #ifndef LINUX	/* FreeBSD */
-+#include <sys/types.h>
- #include <machine/cpufunc.h>
- #define OUTb(x,y)	outb((x),(y))
- #define WAIT	outb(0xEB,0x00)
diff --git a/sysutils/xmbmon/files/patch-getMB-via.c b/sysutils/xmbmon/files/patch-getMB-via.c
deleted file mode 100644
index 81e59e2e893e..000000000000
--- a/sysutils/xmbmon/files/patch-getMB-via.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- getMB-via.c.orig	Tue Dec 10 08:56:53 2002
-+++ getMB-via.c	Tue Dec 10 08:59:07 2002
-@@ -11,6 +11,7 @@
- #include <fcntl.h>
- 
- #ifndef LINUX	/* FreeBSD */
-+#include <sys/types.h>
- #include <machine/cpufunc.h>
- #define OUTb(x,y)	outb((x),(y))
- #define WAIT	outb(0xEB,0x00)
diff --git a/sysutils/xmbmon/pkg-descr b/sysutils/xmbmon/pkg-descr
index ee95fa4f82b7..5d70f1cac7a3 100644
--- a/sysutils/xmbmon/pkg-descr
+++ b/sysutils/xmbmon/pkg-descr
@@ -12,4 +12,4 @@ the superuser privilege, so it may cause a system crash.  Please test
 
 WWW: http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html
 -- 
-kaz
+kaz@kobe1995.net (NAKAMURA Kazushi)
diff --git a/sysutils/xmbmon/pkg-plist b/sysutils/xmbmon/pkg-plist
index 80e6f5358632..d9e45a916c44 100644
--- a/sysutils/xmbmon/pkg-plist
+++ b/sysutils/xmbmon/pkg-plist
@@ -2,6 +2,6 @@ bin/mbmon
 %%X11_ONLY%%bin/xmbmon
 %%PORTDOCS%%share/doc/xmbmon/00README.txt
 %%PORTDOCS%%share/doc/xmbmon/00READMEj.txt
-%%PORTDOCS%%share/doc/xmbmon/DEBUG_Info
+%%PORTDOCS%%share/doc/xmbmon/00READMEtech.txt
 %%X11_ONLY%%%%PORTDOCS%%share/doc/xmbmon/xmbmon.resources
 %%PORTDOCS%%@dirrm share/doc/xmbmon