diff options
| author | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@FreeBSD.org> | 2004-07-23 19:10:32 +0000 |
| commit | 4eb209da7d941e66e0cb065aead6bda76c9e97f3 (patch) | |
| tree | c9cf2fdcee3885499960b9c706dacac0a0080f8e /emulators/vmware-guestd6 | |
| parent | Fix USE_PHP (diff) | |
- Add the X_WINDOW_SYSTEM={xorg,xfree86-4,xfree86-3} variable to bsd.port.mk,
and make XFREE86_VERSION map to it. XFREE86_VERSION is now deprecated.
- Make xorg the default X_WINDOW_SYSTEM on -current.
- Add several new X_*_PORT variables which point to various pieces of X11 based
on the setting of X_WINDOW_SYSTEM, and make ports use them.
- Add information to CHANGES about how to handle the transition.
PR: ports/68763
Approved by: portmgr (marcus)
Approved by: re (scottl)
Diffstat (limited to 'emulators/vmware-guestd6')
| -rw-r--r-- | emulators/vmware-guestd6/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index a16399b41fff..8f55d3514a9c 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -52,7 +52,7 @@ UMOUNT= /sbin/umount .if defined(VMWARE_X_PORTS) -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 PLIST_SUB+= INSTALLXSERVER3:="" PLIST_SUB+= INSTALLXSERVER4:="@comment " .else @@ -121,7 +121,7 @@ post-patch: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${X11BASE}/bin -.if ${XFREE86_VERSION} == 3 +.if ${X_WINDOW_SYSTEM:L} == xfree86-3 ${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} "" |