Attachment 143874 Details for Bug 185354 – patch for xmbmon

[patch] patch for xmbmon

xmbmon-205_11.patch (text/plain), 3.47 KB, created by Muhammad Moinur Rahman on 2014-06-17 15:09:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Muhammad Moinur Rahman

Created: 2014-06-17 15:09:01 UTC

Size: 3.47 KB

patch

obsolete

>diff -ruN /usr/ports//sysutils/xmbmon/Makefile ./Makefile
>--- /usr/ports//sysutils/xmbmon/Makefile	2014-06-16 07:12:37.000000000 +0600
>+++ ./Makefile	2014-06-17 20:53:54.081735868 +0600
>@@ -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,9 +26,9 @@
> 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"
>+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} \
>@@ -49,18 +49,22 @@
> .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
>-.if !${PORT_OPTIONS:MX11}
>-	@${REINPLACE_CMD} -e '/p xmbmon/d' ${WRKSRC}/Makefile.in
>-.endif
>-.if !${PORT_OPTIONS:MCLI}
>-	@${REINPLACE_CMD} -e '/p mbmon/d' ${WRKSRC}/Makefile.in
>-.endif
>+	@${REINPLACE_CMD} -e 's+/usr/share/doc/mbmon+${STAGEDIR}${DOCSDIR}+' ${WRKSRC}/mbmon.1
> .if ${PORT_OPTIONS:MSMB}
> 	@${REINPLACE_CMD} -e 's/^DEFS=/&-DSMBUS_IOCTL /' ${WRKSRC}/Makefile.in
> .endif
> 
>+do-install:
>+.if ${PORT_OPTIONS:MX11}
>+	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
>+	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${PREFIX}/man/man1
>+.endif
>+.if ${PORT_OPTIONS:MCLI}
>+	@${INSTALL_PROGRAM} ${WRKSRC}/mbmon ${STAGEDIR}${PREFIX}/bin
>+	@${INSTALL_MAN} ${WRKSRC}/mbmon.1 ${STAGEDIR}${PREFIX}/man/man1
>+.endif
>+
>+post-install:
> .if ${PORT_OPTIONS:MDOCS}
> 	${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
>diff -ruN /usr/ports//sysutils/xmbmon/files/patch-Makefile.in ./files/patch-Makefile.in
>--- /usr/ports//sysutils/xmbmon/files/patch-Makefile.in	2013-12-25 21:07:47.000000000 +0600
>+++ ./files/patch-Makefile.in	2014-06-17 18:21:41.825364732 +0600
>@@ -12,37 +12,3 @@
>  
>  LINT=lint
>  # LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
>-@@ -37,9 +37,9 @@
>- RM=rm -f
>- INSTALL=install
>- 
>--INST_DIR=/usr/local/bin
>--INST_MANDIR=/usr/local/man/man1
>--INST_XDIR=/usr/X11R6/bin
>-+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
>-  
>-@@ -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)
>- 
>--all: $(PROGRAM)
>-+all: $(PROGRAM) $(MANPAGE)
>- 
>- 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 @@
>- 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-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) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANDIR)
>- 
>- lint:
>- 	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm

Actions: View | Diff

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