Attachment #139936 for bug #186332

View | Details | Raw Unified | Return to bug 186332
Collapse All | Expand All




CLI_DESC=	"CLI support only"

ASUS_PATCHFILES=	${PORTNAME}${PORTVERSION}_A7N8X-VM.patch
X11_PLIST_FILES=	lib/X11/app-defaults/${PORTNAME} \
			man/man1/${PORTNAME}.1x.gz
CLI_PLIST_FILES=	bin/mbmon \
			man/man1/mbmon.1.gz

.include <bsd.port.options.mk>

.if !${PORT_OPTIONS:MX11}
PLIST_SUB+=	X11FILE="@comment "
MAKE_ARGS=	PROGRAM="mbmon"
.else
PLIST_SUB+=	X11FILE=""
USE_XORG=	x11 xt
.endif

.if ${PORT_OPTIONS:MCLI}
PLIST_SUB+=	CLIFILE=""
USE_RC_SUBR=	mbmon
.else
PLIST_SUB+=	CLIFILE="@comment "
.endif

post-patch:




 
 LINT=lint
 # LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
@@ -37,8 +37,8 @@
 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=/usr/X11R6/bin
 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)

 
 mbmon: mbmon.c mbmon.h methods.h pci_pm.h smbuses.h sensors.h $(OBJS)
 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c $(OBJS) $(LIBS)
@@ -133,12 +133,10 @@
	$(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-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) -c -p mbmon $(INST_DIR)
+	$(INSTALL) -c -p xmbmon $(INST_DIR)
+	$(INSTALL) -c -p mbmon.1 $(INST_MANDIR)
+	$(INSTALL) -c -p xmbmon.1x $(INST_MANDIR)
 
 lint:
 	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm

Line 0 Link Here

(-)xmbmon/pkg-plist (+7 lines)
	1	@mode 4555
	2	%%CLIFILE%%bin/mbmon
	3	%%X11FILE%%bin/xmbmon
	4	@mode
	5	%%CLIFILE%%man/man1/mbmon.1.gz
	6	%%X11FILE%%man/man1/xmbmon.1x.gz
	7	@comment @dirrm %%DOCSDIR%%

Return to bug 186332

Lines 31-51 Link Here

(-)xmbmon/Makefile (-4 / +5 lines)
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} \
35	man/man1/${PORTNAME}.1x.gz
36	CLI_PLIST_FILES= bin/mbmon \
37	man/man1/mbmon.1.gz
38		34
39	.include <bsd.port.options.mk>	35	.include <bsd.port.options.mk>
40		36
41	.if !${PORT_OPTIONS:MX11}	37	.if !${PORT_OPTIONS:MX11}
		38	PLIST_SUB+= X11FILE="@comment "
42	MAKE_ARGS= PROGRAM="mbmon"	39	MAKE_ARGS= PROGRAM="mbmon"
43	.else	40	.else
		41	PLIST_SUB+= X11FILE=""
44	USE_XORG= x11 xt	42	USE_XORG= x11 xt
45	.endif	43	.endif
46		44
47	.if ${PORT_OPTIONS:MCLI}	45	.if ${PORT_OPTIONS:MCLI}
		46	PLIST_SUB+= CLIFILE=""
48	USE_RC_SUBR= mbmon	47	USE_RC_SUBR= mbmon
		48	.else
		49	PLIST_SUB+= CLIFILE="@comment "
49	.endif	50	.endif
50		51
51	post-patch:	52	post-patch:

Lines 12-30 Link Here

(-)xmbmon/files/patch-Makefile.in (-9 / +12 lines)
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 @@	15	@@ -37,8 +37,8 @@
16	RM=rm -f	16	RM=rm -f
17	INSTALL=install	17	INSTALL=install
18		18
19	-INST_DIR=/usr/local/bin	19	-INST_DIR=/usr/local/bin
20	-INST_MANDIR=/usr/local/man/man1	20	-INST_MANDIR=/usr/local/man/man1
21	-INST_XDIR=/usr/X11R6/bin
22	+INST_DIR=%%STAGEDIR%%%%PREFIX%%/bin	21	+INST_DIR=%%STAGEDIR%%%%PREFIX%%/bin
23	+INST_MANDIR=%%STAGEDIR%%%%PREFIX%%/man/man1	22	+INST_MANDIR=%%STAGEDIR%%%%PREFIX%%/man/man1
24	+INST_XDIR=%%STAGEDIR%%%%PREFIX%%/lib/X11/app-defaults	23	INST_XDIR=/usr/X11R6/bin
25	INST_MANXDIR=/usr/X11R6/man/man1	24	INST_MANXDIR=/usr/X11R6/man/man1
26	INST_XRDIR=/usr/X11R6/lib/X11/app-defaults	25	INST_XRDIR=/usr/X11R6/lib/X11/app-defaults
27
28	@@ -56,7 +56,7 @@	26	@@ -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	27	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)	28	OBJS = getMBinfo.o tyan_tiger.o pci_pm.o sensors.o $(MB_OBJ) $(SMB_OBJ) $(HWM_OBJ)
Lines 34-48 Link Here
34		32
35	mbmon: mbmon.c mbmon.h methods.h pci_pm.h smbuses.h sensors.h $(OBJS)	33	mbmon: mbmon.c mbmon.h methods.h pci_pm.h smbuses.h sensors.h $(OBJS)
36	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c $(OBJS) $(LIBS)	34	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ mbmon.c $(OBJS) $(LIBS)
37	@@ -135,10 +135,8 @@	35	@@ -133,12 +133,10 @@
		36	$(RM) Makefile config.cache config.log config.h config.status
		37
38	install: $(PROGRAM)	38	install: $(PROGRAM)
39	$(INSTALL) -o root -g wheel -m 4555 -c -p mbmon $(INST_DIR)	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)	40	- $(INSTALL) -o root -g wheel -m 4555 -c -p xmbmon $(INST_XDIR)
41	-	41	-
42	-install-man: $(MANPAGE)	42	-install-man: $(MANPAGE)
43	$(INSTALL) -o root -g wheel -m 444 -c -p mbmon.1 $(INST_MANDIR)	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)	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)	45	+ $(INSTALL) -c -p mbmon $(INST_DIR)
		46	+ $(INSTALL) -c -p xmbmon $(INST_DIR)
		47	+ $(INSTALL) -c -p mbmon.1 $(INST_MANDIR)
		48	+ $(INSTALL) -c -p xmbmon.1x $(INST_MANDIR)
46		49
47	lint:	50	lint:
48	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm	51	$(LINT) $(INCLUDES) $(DEFS) $(FONTDEFINES) $(SRCS) -lm