7 files changed, 48 insertions, 129 deletions

diff --git a/sysutils/mbmon/Makefile b/sysutils/mbmon/Makefile
index 31c2e451e7f4..397aa646b326 100644
--- a/sysutils/mbmon/Makefile
+++ b/sysutils/mbmon/Makefile
@@ -5,45 +5,28 @@
 # $FreeBSD$
 #
 
-PORTNAME=	xmbmon
+PORTNAME?=	mbmon
 PORTVERSION=	205
-PORTREVISION=	5
+PORTREVISION?=	0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/
-.if defined(WITHOUT_X11)
-PKGNAMESUFFIX=	-nox11
-.endif
-DISTNAME=	${PORTNAME}${PORTVERSION}
+DISTNAME=	xmbmon${PORTVERSION}
 
-MAINTAINER=	ports@FreeBSD.ORG
-COMMENT=	X/tty motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240
+MAINTAINER=	jylefort@FreeBSD.org
+COMMENT?=	A tty motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240
 
-USE_REINPLACE=	yes
+ONLY_FOR_ARCHS=	i386 amd64
 GNU_CONFIGURE=	yes
-.if defined(WITHOUT_X11)
-PLIST_SUB=	X11_ONLY="@comment "
-.else
-USE_XLIB=	yes
-PLIST_SUB=	X11_ONLY=""
-.endif
-
-MAKE_ARGS+=	DOCSDIR='${DOCSDIR}' INSTALL_DATA='${INSTALL_DATA}' PREFIX='${PREFIX}'
 
-MAN1=		xmbmon.1x mbmon.1
+MAKE_ARGS=	PROGRAM="${PORTNAME}"
 
-.include <bsd.port.pre.mk>
+PLIST_FILES+=	bin/${PORTNAME}
+MAN1?=		mbmon.1
+PORTDOCS=	ChangeLog ChangeLog.jp ReadMe ReadMe.jp ReadMe.tech
 
-.if ${ARCH} != "i386" && ${ARCH} != "amd64"
-BROKEN=		"Does not compile on !i386 and !amd64"
-.endif
+OPTIONS=	SMB "enable smb(4) support" on
 
-pre-everything::
-	@${ECHO_CMD} ""
-	@${ECHO_CMD} "Definable build options"
-	@${ECHO_CMD} "-----------------------"
-	@${ECHO_CMD} "WITHOUT_X11	- Self explanatory"
-	@${ECHO_CMD} "WITHOUT_SMB	- disable smb(4) support"
-	@${ECHO_CMD} ""
+.include <bsd.port.pre.mk>
 
 post-patch:
 	@${REINPLACE_CMD} -e 's+/usr/share/doc/mbmon+${DOCSDIR}+' ${WRKSRC}/mbmon.1
@@ -51,10 +34,13 @@ post-patch:
 	@${REINPLACE_CMD} -e 's/^DEFS=/&-DSMBUS_IOCTL /' ${WRKSRC}/Makefile.in
 .endif
 
-post-install:
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
+	${CHMOD} u+s ${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${PREFIX}/man/man1
 .if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	(cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-man install-doc)
+	${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/sysutils/mbmon/files/patch-Makefile.in b/sysutils/mbmon/files/patch-Makefile.in
new file mode 100644
index 000000000000..daae964a5e80
--- /dev/null
+++ b/sysutils/mbmon/files/patch-Makefile.in
@@ -0,0 +1,14 @@
+--- Makefile.in.orig	Wed Feb  1 20:12:01 2006
++++ Makefile.in	Wed Feb  1 20:12:22 2006
+@@ -27,9 +27,9 @@
+ 
+ #CC=/compat/linux/usr/bin/gcc
+ CC=@CC@
+-CFLAGS=-O3 $(INCLUDES) $(DEFS)
++CFLAGS+=$(INCLUDES) $(DEFS)
+ CFLAGSX=$(CFLAGS) @X_CFLAGS@
+-LDFLAGS=-s
++LDFLAGS=
+ 
+ LINT=lint
+ # LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
diff --git a/sysutils/mbmon/files/patch-aa b/sysutils/mbmon/files/patch-aa
deleted file mode 100644
index 3b4e65a7d9ac..000000000000
--- a/sysutils/mbmon/files/patch-aa
+++ /dev/null
@@ -1,68 +0,0 @@
---- 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)
-+CC?=@CC@
-+CFLAGS+=$(INCLUDES) $(DEFS)
- CFLAGSX=$(CFLAGS) @X_CFLAGS@
- LDFLAGS=-s
- 
-@@ -37,19 +37,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_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= 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
-@@ -133,12 +139,18 @@
- 	$(RM) Makefile config.cache config.log config.h config.status
- 
- install: $(PROGRAM)
--	$(INSTALL) -o root -g wheel -m 4555 -c -p mbmon $(INST_DIR)
--	$(INSTALL) -o root -g wheel -m 4555 -c -p xmbmon $(INST_XDIR)
-+	@for i in $(PROGRAM); do \
-+		$(INSTALL) -o root -g wheel -m 4555 -c -p $$i $(INST_DIR); \
-+	done
- 
- 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-configure b/sysutils/mbmon/files/patch-configure
index 7bd6af8d22b4..809c657fd978 100644
--- a/sysutils/mbmon/files/patch-configure
+++ b/sysutils/mbmon/files/patch-configure
@@ -1,17 +1,22 @@
-$FreeBSD$
-
---- configure	Fri Aug 13 10:22:18 2004
-+++ configure	Fri Dec 30 23:37:25 2005
-@@ -3486,7 +3486,7 @@
- 
+--- configure.orig	Wed Feb  1 20:34:58 2006
++++ configure	Wed Feb  1 20:35:38 2006
+@@ -3487,7 +3487,6 @@
  
  case "${host}" in
--	i?86-*-freebsd*)
-+	i?86-*-freebsd* | amd64-*-freebsd*)
-   		CC=cc
+ 	i?86-*-freebsd*)
+-  		CC=cc
  		;;
  	i?86-*-linux-*)
-@@ -3946,7 +3946,7 @@
+   		CC=gcc
+@@ -3499,7 +3498,6 @@
+ 		ADDLIBS="-li386"
+ 		;;
+ 	*)
+-  		CC=gcc
+ 		;;
+ esac
+ 
+@@ -3946,7 +3944,7 @@
  done
  
  
diff --git a/sysutils/mbmon/files/patch-xmbmon.c b/sysutils/mbmon/files/patch-xmbmon.c
deleted file mode 100644
index 171f801bea18..000000000000
--- a/sysutils/mbmon/files/patch-xmbmon.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmbmon.c.orig	Mon Feb 23 00:32:24 2004
-+++ xmbmon.c	Mon Feb 23 00:32:43 2004
-@@ -32,7 +32,7 @@
- #define DEFAULT_CSEC        "20"
- #define DEFAULT_WSEC      "1800"
- #define DEFAULT_TMIN      "10.0"
--#define DEFAULT_TMAX      "50.0"
-+#define DEFAULT_TMAX      "90.0"
- #define DEFAULT_TMINF     "50.0"	/* for Fahrenheit */
- #define DEFAULT_TMAXF     "130.0"	/* for Fahrenheit */
- #define DEFAULT_VMIN      "1.80"
diff --git a/sysutils/mbmon/pkg-descr b/sysutils/mbmon/pkg-descr
index 5d70f1cac7a3..2aa19cf03112 100644
--- a/sysutils/mbmon/pkg-descr
+++ b/sysutils/mbmon/pkg-descr
@@ -1,4 +1,4 @@
-This is an X/tty motherboard monitor which supports LM78/79, WINBond
+This is a X/tty motherboard monitor which supports LM78/79, WINBond
 83781D/83782D/83783S, ASUS 991227F, and VIA VT82C686A/B PC-health
 chips via 3 methods: ISA-I/O, SMBus, VIA-direct.
 
diff --git a/sysutils/mbmon/pkg-plist b/sysutils/mbmon/pkg-plist
deleted file mode 100644
index 166dea5bd162..000000000000
--- a/sysutils/mbmon/pkg-plist
+++ /dev/null
@@ -1,7 +0,0 @@
-bin/mbmon
-%%X11_ONLY%%bin/xmbmon
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe.jp
-%%PORTDOCS%%%%DOCSDIR%%/ReadMe.tech
-%%X11_ONLY%%%%PORTDOCS%%%%DOCSDIR%%/xmbmon.resources
-%%PORTDOCS%%@dirrm %%DOCSDIR%%