Attachment 143858 Details for Bug 185354 – And pointed out places modification, minor modification.

[patch] And pointed out places modification, minor modification.

xmbmon-205.patch (text/plain), 4.68 KB, created by takefu on 2014-06-17 03:04:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: takefu

Created: 2014-06-17 03:04:30 UTC

Size: 4.68 KB

patch

obsolete

>ï»¿diff -ruN /usr/ports/sysutils/xmbmon/Makefile ./Makefile
>--- /usr/ports/sysutils/xmbmon/Makefile	2014-06-16 10:12:37.000000000 +0900
>+++ ./Makefile	2014-06-17 11:56:25.000000000 +0900
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	xmbmon
> PORTVERSION=	205
>-PORTREVISION=	10
>+PORTREVISION=	11
> CATEGORIES=	sysutils
> MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/${PORTNAME}/
> DISTNAME=	${PORTNAME}${PORTVERSION}
>@@ -26,14 +26,19 @@
> OPTIONS_MULTI=	INTERFACE
> OPTIONS_MULTI_INTERFACE=	CLI X11
> OPTIONS_DEFAULT=SMB CLI
>-ASUS_DESC=	"Enable A7N8X-VM support"
>-SMB_DESC=	"Enable smb(4) support"
>-CLI_DESC=	"CLI support only"
>+OPTIONS_SUB=	yes
>+ASUS_DESC=	Enable A7N8X-VM support
>+SMB_DESC=	Enable smb(4) support
>+CLI_DESC=	CLI support only
> 
> ASUS_PATCHFILES=	${PORTNAME}${PORTVERSION}_A7N8X-VM.patch
>-X11_PLIST_FILES=	lib/X11/app-defaults/${PORTNAME} \
>+X11_PLIST_FILES=	"@mode 4555"\
>+			lib/X11/app-defaults/${PORTNAME} \
>+			@mode\
> 			man/man1/${PORTNAME}.1x.gz
>-CLI_PLIST_FILES=	bin/mbmon \
>+CLI_PLIST_FILES=	"@mode 4555"\
>+			bin/mbmon \
>+			@mode\
> 			man/man1/mbmon.1.gz
> 
> .include <bsd.port.options.mk>
>@@ -49,16 +54,20 @@
> .endif
> 
> post-patch:
>-	@${REINPLACE_CMD} -e 's+/usr/share/doc/mbmon+${STAGEIR}${DOCSDIR}+' ${WRKSRC}/mbmon.1
>-	@${REINPLACE_CMD} -e 's+%%STAGEDIR%%%%PREFIX%%+${STAGEDIR}${PREFIX}+' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's+/usr/share/doc/mbmon+${DOCSDIR}+'\
>+		${WRKSRC}/mbmon.1
>+	@${REINPLACE_CMD} -e 's+%%STAGEDIR%%%%PREFIX%%+${STAGEDIR}${PREFIX}+g ;\
>+		s+/usr/X11R6+${STAGEDIR}${PREFIX}/lib/X11/app-defaults+'\
>+		${WRKSRC}/Makefile.in
> .if !${PORT_OPTIONS:MX11}
>-	@${REINPLACE_CMD} -e '/p xmbmon/d' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e '/[ps] xmbmon/d' ${WRKSRC}/Makefile.in
> .endif
> .if !${PORT_OPTIONS:MCLI}
>-	@${REINPLACE_CMD} -e '/p mbmon/d' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e '/[ps] mbmon/d' ${WRKSRC}/Makefile.in
> .endif
> .if ${PORT_OPTIONS:MSMB}
>-	@${REINPLACE_CMD} -e 's/^DEFS=/&-DSMBUS_IOCTL /' ${WRKSRC}/Makefile.in
>+	@${REINPLACE_CMD} -e 's/^DEFS=/&-DSMBUS_IOCTL /'\
>+		${WRKSRC}/Makefile.in
> .endif
> 
> .if ${PORT_OPTIONS:MDOCS}
>diff -ruN /usr/ports/sysutils/xmbmon/files/patch-Makefile.in ./files/patch-Makefile.in
>--- /usr/ports/sysutils/xmbmon/files/patch-Makefile.in	2013-12-26 00:07:47.000000000 +0900
>+++ ./files/patch-Makefile.in	2014-06-17 11:39:00.000000000 +0900
>@@ -1,30 +1,22 @@
>---- 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
>-@@ -37,9 +37,9 @@
>+--- Makefile.in.orig	2004-08-13 16:04:21.000000000 +0900
>++++ Makefile.in	2014-06-17 11:38:39.000000000 +0900
>+@@ -37,11 +37,11 @@
>  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=%%STAGEDIR%%%%PREFIX%%/bin
> +INST_MANDIR=%%STAGEDIR%%%%PREFIX%%/man/man1
> +INST_XDIR=%%STAGEDIR%%%%PREFIX%%/lib/X11/app-defaults
>- INST_MANXDIR=/usr/X11R6/man/man1
>- INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
>++INST_MANXDIR=$(INST_MANDIR)
>++INST_XRDIR=$(INST_XDIR)
>   
>+ .c.o:
>+ 	$(CC) -c $(CFLAGS) $*.c
> @@ -56,7 +56,7 @@
>  HWM_OBJ = sens_winbond.o sens_via686.o sens_it87.o sens_gl52.o sens_lm85.o sens_lm80.o sens_lm90.o sens_lm75.o sens_wl784.o smb_extemp.o
>  OBJS = getMBinfo.o tyan_tiger.o pci_pm.o sensors.o $(MB_OBJ) $(SMB_OBJ) $(HWM_OBJ)
>@@ -34,15 +26,21 @@
>  
>  mbmon: mbmon.c mbmon.h methods.h pci_pm.h smbuses.h sensors.h $(OBJS)
>  	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c $(OBJS) $(LIBS)
>-@@ -135,10 +135,8 @@
>+@@ -133,12 +133,12 @@
>+ 	$(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)
>--
>+-	$(INSTALL) -o root -g wheel -m 4555 -c -p mbmon $(INST_DIR)
>+-	$(INSTALL) -o root -g wheel -m 4555 -c -p xmbmon $(INST_XDIR)
>++	$(INSTALL) -o root -g wheel -c -p mbmon $(INST_DIR)
>++	$(INSTALL) -o root -g wheel -c -p xmbmon $(INST_XDIR)
>+ 
> -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 mbmon.1 $(INST_MANDIR)
> -	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANXDIR)
>-+	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANDIR)
>++#install-man: $(MANPAGE)
>++	$(INSTALL) -o root -g wheel -c -p mbmon.1 $(INST_MANDIR)
>++	$(INSTALL) -o root -g wheel -c -p xmbmon.1x $(INST_MANXDIR)
>  
>  lint:
>  	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm

Actions: View | Diff

Attachments on bug 185354: 139163 | 143829 | 143858 | 143874