diff options
Diffstat (limited to 'emulators/vmware-guestd6')
| -rw-r--r-- | emulators/vmware-guestd6/Makefile | 30 | ||||
| -rw-r--r-- | emulators/vmware-guestd6/pkg-descr.tools | 11 | ||||
| -rw-r--r-- | emulators/vmware-guestd6/pkg-plist.tools | 6 |
3 files changed, 8 insertions, 39 deletions
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index c0362691e13e..bdabbe499ee9 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -69,22 +69,10 @@ BITS?= 64 .if defined(VMWARE_X_PORTS) -.if ${X_WINDOW_SYSTEM:L} == xfree86-3 -.if ${BITS} == 32 -PLIST_SUB+= INSTALLXSERVER3:="" -.else -PLIST_SUB+= INSTALLXSERVER3:="@comment " -.endif -PLIST_SUB+= INSTALLXSERVER4:="@comment " -PLIST_SUB+= INSTALLXVMMOUSE:="@comment " -.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 -PLIST_SUB+= INSTALLXSERVER3:="@comment " +.if ${X_WINDOW_SYSTEM:L} == xfree86-4 PLIST_SUB+= INSTALLXSERVER4:="" -PLIST_SUB+= INSTALLXVMMOUSE:="" .else -PLIST_SUB+= INSTALLXSERVER3:="@comment " PLIST_SUB+= INSTALLXSERVER4:="@comment " -PLIST_SUB+= INSTALLXVMMOUSE:="" .endif .else @@ -174,24 +162,10 @@ do-install: .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 - ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-3/XF86Config ${X11BASE}/etc/XF86Config_VMware - @${ECHO} "" - @${ECHO} "You have installed XFree86 3.x X Server for VMware." - @${ECHO} "${X11BASE}/etc/XF86Config_VMware is a sample XF86Config file." - @${ECHO} "Copy this file to /etc/XF86Config before starting X." -.else - @${ECHO} "There is no XFree86 3.x X server for your system." - @${ECHO} "Consider upgrading your X to XFree86 4.x or switch to X.Org." -.endif -.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 +.if ${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 ; \ diff --git a/emulators/vmware-guestd6/pkg-descr.tools b/emulators/vmware-guestd6/pkg-descr.tools index 2027da8571ce..cccff5433821 100644 --- a/emulators/vmware-guestd6/pkg-descr.tools +++ b/emulators/vmware-guestd6/pkg-descr.tools @@ -2,14 +2,11 @@ VMware tools support FreeBSD _guest_ OS running on VMware Workstation. Beware, this port is _not_ for FreeBSD _host_ OS. VMware tools for FreeBSD consist of vmware-toolbox which supports -seamless operation between the Host and the Guest OS, dual-boot -configulation files, and special XFree86 3.x server for Guest OS. -However, we cannot install dual-boot configuration since it requires -to modify /etc files. +seamless operation between the Host and the Guest OS and dual-boot +configulation files. However, we cannot install dual-boot configuration +since it requires to modify /etc files. -This ports will install vmware-toolbox to your computer, and -XFree86 X server if you set XFREE86_VERSION to 3 in /etc/make.conf, -If you already use XFree86 4.1.0 or later, you may use 'vmware' +This ports will install vmware-toolbox to your computer. You may use 'vmware' driver for X server. Vmware-guestd is installed as a separate port, ports/emulators/vmware-guestd4, but this port install guestd automatically. diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools index 01dff9975c77..c9e1f6501362 100644 --- a/emulators/vmware-guestd6/pkg-plist.tools +++ b/emulators/vmware-guestd6/pkg-plist.tools @@ -1,10 +1,8 @@ bin/vmware-toolbox bin/vmware-toolbox-tcl %%INSTALLXGTKTOOL:%%bin/vmware-toolbox-gtk -%%INSTALLXSERVER3:%%bin/XF86_VMware -%%INSTALLXSERVER3:%%etc/XF86Config_VMware %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware -%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware +lib/modules/input/vmmouse_drv.o_VMware %%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers -%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input +dirrmtry lib/modules/input |