Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 09 Dec 2013 09:36:14 +0900
From:      Takefu <takefu@airport.fm>
To:        freebsd-ports-bugs@FreeBSD.org
Cc:        Muhammad Moinur Rahman <5u623l20@gmail.com>
Subject:   Re: ports/184521: [patch] sysutils/mbmon
Message-ID:  <52A5107E.105@airport.fm>
In-Reply-To: <201312070910.rB79A1xh030896@freefall.freebsd.org>
References:  <201312070910.rB79A1xh030896@freefall.freebsd.org>

next in thread | previous in thread | raw e-mail | index | archive | help
fix StageDir

diff -ruN /usr/ports/sysutils/mbmon/Makefile ./Makefile
--- /usr/ports/sysutils/mbmon/Makefile	2013-09-21 08:05:58.000000000 +0900
+++ ./Makefile	2013-12-09 09:31:38.000000000 +0900
@@ -3,7 +3,7 @@

 PORTNAME?=	mbmon
 PORTVERSION=	205
-PORTREVISION?=	6
+PORTREVISION?=	7
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/
 DISTNAME=	xmbmon${PORTVERSION}
@@ -33,7 +33,6 @@
 USE_RC_SUBR=	mbmon
 .endif

-NO_STAGE=	yes
 .include <bsd.port.options.mk>

 .if ${PORT_OPTIONS:MASUS}
@@ -47,12 +46,12 @@
 .endif

 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-	${CHMOD} u+s ${PREFIX}/bin/${PORTNAME}
-	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${CHMOD} u+s ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_MAN} ${MAN1:S|^|${WRKSRC}/|} ${STAGEDIR}${PREFIX}/man/man1
+.if ${PORT_OPTIONS:MDOCS}
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 .endif

 .include <bsd.port.mk>
diff -ruN /usr/ports/sysutils/mbmon/files/patch-pci_pm.c ./files/patch-pci_pm.c
--- /usr/ports/sysutils/mbmon/files/patch-pci_pm.c	2012-07-14 23:29:18.000000000 +0900
+++ ./files/patch-pci_pm.c	2013-12-09 09:24:18.000000000 +0900
@@ -9,7 +9,15 @@
  			break;
  		case NFORCESMB:
  			comt = "NVidia nForce";
-@@ -166,6 +166,7 @@
+@@ -158,6 +158,7 @@
+ 		case ID_I801CA:
+ 		case ID_I801DB:
+ 		case ID_I801EB:
++		case ID_I801IB:
+ 		case ID_I6300ESB:
+ 		case ID_IICH6:
+ 			ret = ICH801SMB;
+@@ -166,6 +167,7 @@
  		case ID_AMD756:
  		case ID_AMD766:
  		case ID_AMD768:
@@ -17,7 +25,7 @@
  			ret = AMD756SMB;
  			inq_smbba = getSMBBA3;
  			break;
-@@ -182,7 +183,7 @@
+@@ -182,7 +184,7 @@
  				inq_smbba = getSMBBA4;
  			}
  			break;
diff -ruN /usr/ports/sysutils/mbmon/files/patch-pci_pm.h ./files/patch-pci_pm.h
--- /usr/ports/sysutils/mbmon/files/patch-pci_pm.h	2012-07-14 23:29:18.000000000 +0900
+++ ./files/patch-pci_pm.h	2013-12-09 09:24:18.000000000 +0900
@@ -15,7 +15,13 @@
  #define getSMBBA70	0x50	/* NVidia nForce2, bus0 */
  #define getSMBBA71	0x54	/* NVidia nForce2, bus1 */

-@@ -68,7 +68,8 @@
+@@ -63,12 +63,14 @@
+ #define ID_I801CA	0x24838086
+ #define ID_I801DB	0x24C38086
+ #define ID_I801EB	0x24D38086
++#define ID_I801IB	0x29308086
+ #define ID_I6300ESB	0x25A48086
+ #define ID_IICH6	0x266A8086
  #define ID_AMD756	0x740B1022
  #define ID_AMD766	0x74131022
  #define ID_AMD768	0x74431022
diff -ruN /usr/ports/sysutils/xmbmon/Makefile ./Makefile
--- /usr/ports/sysutils/xmbmon/Makefile	2013-09-21 08:05:58.000000000 +0900
+++ ./Makefile	2013-12-09 09:28:07.000000000 +0900
@@ -14,9 +14,8 @@
 PLIST_FILES=	lib/X11/app-defaults/XMBmon
 MAN1=		xmbmon.1x

-NO_STAGE=	yes
 post-install:
-	${MKDIR} ${PREFIX}/lib/X11/app-defaults
-	${INSTALL_DATA} ${WRKSRC}/xmbmon.resources ${PREFIX}/lib/X11/app-defaults/XMBmon
+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/X11/app-defaults
+	${INSTALL_DATA} ${WRKSRC}/xmbmon.resources ${STAGEDIR}${PREFIX}/lib/X11/app-defaults/XMBmon

 .include "${MASTERDIR}/Makefile"


>  
>  Hi,
>  Give me sometimes. I will update it to support STAGE and some other hacks.



-- 




Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?52A5107E.105>