View | Details | Raw Unified | Return to bug 185354 | Differences between
and this patch

Collapse All | Expand All

(-)./Makefile (-12 / +16 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	xmbmon
4
PORTNAME=	xmbmon
5
PORTVERSION=	205
5
PORTVERSION=	205
6
PORTREVISION=	10
6
PORTREVISION=	11
7
CATEGORIES=	sysutils
7
CATEGORIES=	sysutils
8
MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/${PORTNAME}/
8
MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/${PORTNAME}/
9
DISTNAME=	${PORTNAME}${PORTVERSION}
9
DISTNAME=	${PORTNAME}${PORTVERSION}
Lines 26-34 Link Here
26
OPTIONS_MULTI=	INTERFACE
26
OPTIONS_MULTI=	INTERFACE
27
OPTIONS_MULTI_INTERFACE=	CLI X11
27
OPTIONS_MULTI_INTERFACE=	CLI X11
28
OPTIONS_DEFAULT=SMB CLI
28
OPTIONS_DEFAULT=SMB CLI
29
ASUS_DESC=	"Enable A7N8X-VM support"
29
ASUS_DESC=	Enable A7N8X-VM support
30
SMB_DESC=	"Enable smb(4) support"
30
SMB_DESC=	Enable smb(4) support
31
CLI_DESC=	"CLI support only"
31
CLI_DESC=	CLI support only
32
32
33
ASUS_PATCHFILES=	${PORTNAME}${PORTVERSION}_A7N8X-VM.patch
33
ASUS_PATCHFILES=	${PORTNAME}${PORTVERSION}_A7N8X-VM.patch
34
X11_PLIST_FILES=	lib/X11/app-defaults/${PORTNAME} \
34
X11_PLIST_FILES=	lib/X11/app-defaults/${PORTNAME} \
Lines 49-66 Link Here
49
.endif
49
.endif
50
50
51
post-patch:
51
post-patch:
52
	@${REINPLACE_CMD} -e 's+/usr/share/doc/mbmon+${STAGEIR}${DOCSDIR}+' ${WRKSRC}/mbmon.1
52
	@${REINPLACE_CMD} -e 's+/usr/share/doc/mbmon+${STAGEDIR}${DOCSDIR}+' ${WRKSRC}/mbmon.1
53
	@${REINPLACE_CMD} -e 's+%%STAGEDIR%%%%PREFIX%%+${STAGEDIR}${PREFIX}+' ${WRKSRC}/Makefile.in
54
.if !${PORT_OPTIONS:MX11}
55
	@${REINPLACE_CMD} -e '/p xmbmon/d' ${WRKSRC}/Makefile.in
56
.endif
57
.if !${PORT_OPTIONS:MCLI}
58
	@${REINPLACE_CMD} -e '/p mbmon/d' ${WRKSRC}/Makefile.in
59
.endif
60
.if ${PORT_OPTIONS:MSMB}
53
.if ${PORT_OPTIONS:MSMB}
61
	@${REINPLACE_CMD} -e 's/^DEFS=/&-DSMBUS_IOCTL /' ${WRKSRC}/Makefile.in
54
	@${REINPLACE_CMD} -e 's/^DEFS=/&-DSMBUS_IOCTL /' ${WRKSRC}/Makefile.in
62
.endif
55
.endif
63
56
57
do-install:
58
.if ${PORT_OPTIONS:MX11}
59
	@${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
60
	@${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1x ${STAGEDIR}${PREFIX}/man/man1
61
.endif
62
.if ${PORT_OPTIONS:MCLI}
63
	@${INSTALL_PROGRAM} ${WRKSRC}/mbmon ${STAGEDIR}${PREFIX}/bin
64
	@${INSTALL_MAN} ${WRKSRC}/mbmon.1 ${STAGEDIR}${PREFIX}/man/man1
65
.endif
66
67
post-install:
64
.if ${PORT_OPTIONS:MDOCS}
68
.if ${PORT_OPTIONS:MDOCS}
65
	${MKDIR} ${STAGEDIR}${DOCSDIR}
69
	${MKDIR} ${STAGEDIR}${DOCSDIR}
66
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
70
	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
(-)./files/patch-Makefile.in (-34 lines)
Lines 12-48 Link Here
12
 
12
 
13
 LINT=lint
13
 LINT=lint
14
 # LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
14
 # LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
15
@@ -37,9 +37,9 @@
16
 RM=rm -f
17
 INSTALL=install
18
 
19
-INST_DIR=/usr/local/bin
20
-INST_MANDIR=/usr/local/man/man1
21
-INST_XDIR=/usr/X11R6/bin
22
+INST_DIR=%%STAGEDIR%%%%PREFIX%%/bin
23
+INST_MANDIR=%%STAGEDIR%%%%PREFIX%%/man/man1
24
+INST_XDIR=%%STAGEDIR%%%%PREFIX%%/lib/X11/app-defaults
25
 INST_MANXDIR=/usr/X11R6/man/man1
26
 INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
27
  
28
@@ -56,7 +56,7 @@
29
 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
30
 OBJS = getMBinfo.o tyan_tiger.o pci_pm.o sensors.o $(MB_OBJ) $(SMB_OBJ) $(HWM_OBJ)
31
 
32
-all: $(PROGRAM)
33
+all: $(PROGRAM) $(MANPAGE)
34
 
35
 mbmon: mbmon.c mbmon.h methods.h pci_pm.h smbuses.h sensors.h $(OBJS)
36
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c $(OBJS) $(LIBS)
37
@@ -135,10 +135,8 @@
38
 install: $(PROGRAM)
39
 	$(INSTALL) -o root -g wheel -m 4555 -c -p mbmon $(INST_DIR)
40
 	$(INSTALL) -o root -g wheel -m 4555 -c -p xmbmon $(INST_XDIR)
41
-
42
-install-man: $(MANPAGE)
43
 	$(INSTALL) -o root -g wheel -m 444 -c -p mbmon.1 $(INST_MANDIR)
44
-	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANXDIR)
45
+	$(INSTALL) -o root -g wheel -m 444 -c -p xmbmon.1x $(INST_MANDIR)
46
 
47
 lint:
48
 	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm

Return to bug 185354