Date: Sat, 1 Feb 2014 16:24:02 +0900 (JST) From: Tsurutani Naoki <turutani@scphys.kyoto-u.ac.jp> To: FreeBSD-gnats-submit@freebsd.org Cc: turutani@scphys.kyoto-u.ac.jp Subject: ports/186332: fix install path of the binary in sysutils/xmbmon Message-ID: <201402010724.s117O2Fa065738@h120.65.226.10.32118.vlan.kuins.net> Resent-Message-ID: <201402010730.s117U0uF056367@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 186332
>Category: ports
>Synopsis: fix install path of the binary in sysutils/xmbmon
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Sat Feb 01 07:30:00 UTC 2014
>Closed-Date:
>Last-Modified:
>Originator: Tsurutani Naoki
>Release: FreeBSD 8.4-PRERELEASE i386
>Organization:
>Environment:
System: FreeBSD h120.65.226.10.32118.vlan.kuins.net 8.4-PRERELEASE FreeBSD 8.4-PRERELEASE #26 r249149: Fri Apr 5 22:13:25 JST 2013 turutani@h120.65.226.10.32118.vlan.kuins.net:/usr/local/work/usr/obj/usr/src/sys/POLYMER i386
>Description:
sysutils/xmbmon installs an executable "xmbmon" to X resource directory.
this is something strange.
>How-To-Repeat:
always.
>Fix:
here is a patch to ports tree.
this also makes normal user can build the ports.
diff -urN xmbmon.orig/Makefile xmbmon/Makefile
--- xmbmon.orig/Makefile 2013-12-26 00:07:47.000000000 +0900
+++ xmbmon/Makefile 2014-02-01 16:18:46.000000000 +0900
@@ -31,21 +31,22 @@
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:
diff -urN xmbmon.orig/files/patch-Makefile.in xmbmon/files/patch-Makefile.in
--- xmbmon.orig/files/patch-Makefile.in 2013-12-26 00:07:47.000000000 +0900
+++ xmbmon/files/patch-Makefile.in 2014-02-01 15:22:26.000000000 +0900
@@ -12,19 +12,17 @@
LINT=lint
# LINT=$(CC) -c -Wall -Wshadow -Wpointer-arith
-@@ -37,9 +37,9 @@
+@@ -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=%%STAGEDIR%%%%PREFIX%%/lib/X11/app-defaults
+ 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)
@@ -34,15 +32,20 @@
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,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) -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 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) -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
diff -urN xmbmon.orig/pkg-plist xmbmon/pkg-plist
--- xmbmon.orig/pkg-plist 1970-01-01 09:00:00.000000000 +0900
+++ xmbmon/pkg-plist 2014-02-01 16:18:34.000000000 +0900
@@ -0,0 +1,7 @@
+@mode 4555
+%%CLIFILE%%bin/mbmon
+%%X11FILE%%bin/xmbmon
+@mode
+%%CLIFILE%%man/man1/mbmon.1.gz
+%%X11FILE%%man/man1/xmbmon.1x.gz
+@comment @dirrm %%DOCSDIR%%
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201402010724.s117O2Fa065738>