Index: head/sysutils/mbmon/Makefile =================================================================== --- head/sysutils/mbmon/Makefile (revision 118728) +++ head/sysutils/mbmon/Makefile (revision 118729) @@ -1,51 +1,51 @@ # Ports collection makefile for: xmbmon # Date created: 2001/08/30 # Whom: kaz@kobe1995.net (NAKAMURA Kauzushi) # # $FreeBSD$ # PORTNAME= xmbmon -PORTVERSION= 204 +PORTVERSION= 205 CATEGORIES= sysutils MASTER_SITES= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/ .if defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= kaz@kobe1995.net COMMENT= X/tty motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240 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 .include .if ${ARCH} != "i386" && ${ARCH} != "amd64" BROKEN= "Does not compile on !i386 and !amd64" .endif pre-everything:: @${ECHO_CMD} "" @${ECHO_CMD} "Definable build options" @${ECHO_CMD} "-----------------------" @${ECHO_CMD} "WITHOUT_X11 - Self explanatory" @${ECHO_CMD} "" post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} (cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-doc) .endif .include Property changes on: head/sysutils/mbmon/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/sysutils/mbmon/distinfo =================================================================== --- head/sysutils/mbmon/distinfo (revision 118728) +++ head/sysutils/mbmon/distinfo (revision 118729) @@ -1,2 +1,2 @@ -MD5 (xmbmon204.tar.gz) = 68516bf34c7a624b23122ba575b579cb -SIZE (xmbmon204.tar.gz) = 117994 +MD5 (xmbmon205.tar.gz) = ab6614c785f5b653fcc69fb9c02058f0 +SIZE (xmbmon204.tar.gz) = 142987 Property changes on: head/sysutils/mbmon/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/sysutils/mbmon/files/patch-aa =================================================================== --- head/sysutils/mbmon/files/patch-aa (revision 118728) +++ head/sysutils/mbmon/files/patch-aa (revision 118729) @@ -1,82 +1,68 @@ ---- Makefile.in.orig Sat May 1 22:20:14 2004 -+++ Makefile.in Mon May 24 22:14:19 2004 -@@ -18,9 +18,9 @@ +--- 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@ - 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 - #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 -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 -@@ -136,12 +142,18 @@ +@@ -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 Property changes on: head/sysutils/mbmon/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/mbmon/files/patch-testsmb.c =================================================================== --- head/sysutils/mbmon/files/patch-testsmb.c (revision 118728) +++ head/sysutils/mbmon/files/patch-testsmb.c (revision 118729) @@ -1,22 +1,23 @@ $FreeBSD$ --- testsmb.c.orig Mon Aug 2 09:54:32 2004 +++ testsmb.c Mon Aug 2 09:55:00 2004 @@ -126,7 +126,7 @@ break; default: fprintf(stderr, "No known SMBus(I2C) chip found.\n"); - goto exit; + continue; } if(OpenIO() == -1) return -1; @@ -141,7 +141,6 @@ } CloseIO(); -exit: + ; /* dummy statment for gcc 3.4 or after */ } /* endo of Big roop for smb_base candidates */ exit (0); Property changes on: head/sysutils/mbmon/files/patch-testsmb.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/sysutils/xmbmon/Makefile =================================================================== --- head/sysutils/xmbmon/Makefile (revision 118728) +++ head/sysutils/xmbmon/Makefile (revision 118729) @@ -1,51 +1,51 @@ # Ports collection makefile for: xmbmon # Date created: 2001/08/30 # Whom: kaz@kobe1995.net (NAKAMURA Kauzushi) # # $FreeBSD$ # PORTNAME= xmbmon -PORTVERSION= 204 +PORTVERSION= 205 CATEGORIES= sysutils MASTER_SITES= http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/ .if defined(WITHOUT_X11) PKGNAMESUFFIX= -nox11 .endif DISTNAME= ${PORTNAME}${PORTVERSION} MAINTAINER= kaz@kobe1995.net COMMENT= X/tty motherboard monitor for LM78/79, W8378x, AS99127F, VT82C686 and ADM9240 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 .include .if ${ARCH} != "i386" && ${ARCH} != "amd64" BROKEN= "Does not compile on !i386 and !amd64" .endif pre-everything:: @${ECHO_CMD} "" @${ECHO_CMD} "Definable build options" @${ECHO_CMD} "-----------------------" @${ECHO_CMD} "WITHOUT_X11 - Self explanatory" @${ECHO_CMD} "" post-install: .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} (cd ${WRKSRC}; ${MAKE} ${MAKE_ARGS} install-doc) .endif .include Property changes on: head/sysutils/xmbmon/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.11 \ No newline at end of property +1.12 \ No newline at end of property Index: head/sysutils/xmbmon/distinfo =================================================================== --- head/sysutils/xmbmon/distinfo (revision 118728) +++ head/sysutils/xmbmon/distinfo (revision 118729) @@ -1,2 +1,2 @@ -MD5 (xmbmon204.tar.gz) = 68516bf34c7a624b23122ba575b579cb -SIZE (xmbmon204.tar.gz) = 117994 +MD5 (xmbmon205.tar.gz) = ab6614c785f5b653fcc69fb9c02058f0 +SIZE (xmbmon204.tar.gz) = 142987 Property changes on: head/sysutils/xmbmon/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.8 \ No newline at end of property +1.9 \ No newline at end of property Index: head/sysutils/xmbmon/files/patch-aa =================================================================== --- head/sysutils/xmbmon/files/patch-aa (revision 118728) +++ head/sysutils/xmbmon/files/patch-aa (revision 118729) @@ -1,82 +1,68 @@ ---- Makefile.in.orig Sat May 1 22:20:14 2004 -+++ Makefile.in Mon May 24 22:14:19 2004 -@@ -18,9 +18,9 @@ +--- 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@ - 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 - #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 -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 -@@ -136,12 +142,18 @@ +@@ -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 Property changes on: head/sysutils/xmbmon/files/patch-aa ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.6 \ No newline at end of property +1.7 \ No newline at end of property Index: head/sysutils/xmbmon/files/patch-testsmb.c =================================================================== --- head/sysutils/xmbmon/files/patch-testsmb.c (revision 118728) +++ head/sysutils/xmbmon/files/patch-testsmb.c (revision 118729) @@ -1,22 +1,23 @@ $FreeBSD$ --- testsmb.c.orig Mon Aug 2 09:54:32 2004 +++ testsmb.c Mon Aug 2 09:55:00 2004 @@ -126,7 +126,7 @@ break; default: fprintf(stderr, "No known SMBus(I2C) chip found.\n"); - goto exit; + continue; } if(OpenIO() == -1) return -1; @@ -141,7 +141,6 @@ } CloseIO(); -exit: + ; /* dummy statment for gcc 3.4 or after */ } /* endo of Big roop for smb_base candidates */ exit (0); Property changes on: head/sysutils/xmbmon/files/patch-testsmb.c ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property