Date: Thu, 9 Feb 2006 10:54:12 -0600 From: Scot Hetzel <swhetzel@gmail.com> To: FreeBSD-gnats-submit@freebsd.org, freebsd-ports-bugs@freebsd.org Cc: matusita@FreeBSD.org Subject: Re: ports/93100: emulators/vmware-tools5 fails to build when WITH_VMWARE_GTK defined Message-ID: <790a9fff0602090854k6af98653u5e33bf1a41117f5a@mail.gmail.com> In-Reply-To: <200602091640.k19Ge5tK097742@freefall.freebsd.org> References: <200602091631.k19GV3JW070767@www.freebsd.org> <200602091640.k19Ge5tK097742@freefall.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
------=_Part_4211_3578815.1139504052758
Content-Type: text/plain; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable
Content-Disposition: inline
Attached is the patch to fix the the problem reported in PR93100, when
installing vmware-tools5 and having WITH_VMWARE_GTK defined, and no
${X11BASE}/lib/modules/[drivers,input] directories.
Scot
--
DISCLAIMER:
No electrons were mamed while sending this message. Only slightly bruised.
------=_Part_4211_3578815.1139504052758
Content-Type: text/plain; name=vmware-guestd5.diff; charset=us-ascii
Content-Transfer-Encoding: 7bit
X-Attachment-Id: f_ejhb3ne5
Content-Disposition: attachment; filename="vmware-guestd5.diff"
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/Makefile,v
retrieving revision 1.28
diff -u -r1.28 Makefile
--- Makefile 23 Dec 2005 01:43:38 -0000 1.28
+++ Makefile 9 Feb 2006 01:38:46 -0000
@@ -35,6 +35,18 @@
.if defined(VMWARE_X_PORTS)
USE_X_PREFIX= yes
NO_BUILD= yes
+
+.if defined(WITH_VMWARE_GTK)
+PLIST_SUB+= INSTALLXGTKTOOL:=""
+USE_ICONV= yes
+USE_GETTEXT= yes
+USE_XLIB= yes
+USE_GNOME= glib12 gtk12
+LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x
+.else
+PLIST_SUB+= INSTALLXGTKTOOL:="@comment "
+.endif
+
.endif
RESTRICTED= "Not sure if we can redistribute this."
@@ -80,17 +92,6 @@
PLIST_SUB+= INSTALLXVMMOUSE:=""
.endif
-.if defined(WITH_VMWARE_GTK)
-PLIST_SUB+= INSTALLXGTKTOOL:=""
-USE_ICONV= yes
-USE_GETTEXT= yes
-USE_XLIB= yes
-USE_GNOME= glib12 gtk12
-LIB_DEPENDS+= c.5:${PORTSDIR}/misc/compat5x
-.else
-PLIST_SUB+= INSTALLXGTKTOOL:="@comment "
-.endif
-
.else
VMWARE_KMODDIR= ${PREFIX}/lib/vmware-tools/modules
@@ -178,6 +179,11 @@
.if defined(WITH_VMWARE_GTK)
${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
.endif
+.if ${X_WINDOW_SYSTEM:L} != xfree86-3
+ if [ ! -d ${X11BASE}/lib/modules/input ] ; then \
+ ${MKDIR} ${X11BASE}/lib/modules/input ; \
+ fi
+.endif
.if ${X_WINDOW_SYSTEM:L} == xfree86-3
.if ${BITS} == 32
${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
@@ -192,6 +198,9 @@
.endif
.elif ${X_WINDOW_SYSTEM:L} == xfree86-4
${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
+ if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
+ ${MKDIR} ${X11BASE}/lib/modules/drivers ; \
+ fi
.if ${BITS} == 32
${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.3.x/vmware_drv.o ${X11BASE}/lib/modules/drivers/vmware_drv.o_VMware
${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware
Index: pkg-plist
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/pkg-plist,v
retrieving revision 1.8
diff -u -r1.8 pkg-plist
--- pkg-plist 22 Jan 2006 05:52:17 -0000 1.8
+++ pkg-plist 1 Feb 2006 05:44:07 -0000
@@ -1,7 +1,7 @@
-sbin/vmware-checkvm
-sbin/vmware-guestd
@unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true
etc/rc.d/vmware-guestd.sh
+sbin/vmware-checkvm
+sbin/vmware-guestd
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules
Index: pkg-plist.tools
===================================================================
RCS file: /home/ncvs/ports/emulators/vmware-guestd5/pkg-plist.tools,v
retrieving revision 1.5
diff -u -r1.5 pkg-plist.tools
--- pkg-plist.tools 20 Dec 2005 01:19:05 -0000 1.5
+++ pkg-plist.tools 9 Feb 2006 01:40:32 -0000
@@ -6,3 +6,5 @@
%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
+%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
+%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input
------=_Part_4211_3578815.1139504052758--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?790a9fff0602090854k6af98653u5e33bf1a41117f5a>