diff options
author | matusita <matusita@FreeBSD.org> | 2005-05-19 07:07:57 +0800 |
---|---|---|
committer | matusita <matusita@FreeBSD.org> | 2005-05-19 07:07:57 +0800 |
commit | e846ad39ccf36a2cc6a1db101bb4b28d00e22692 (patch) | |
tree | 01f0c4d5ecb4e17344e0266da49eb378817bead4 /emulators | |
parent | ed04982951cd7d76c8c3a4e53b13bee1d07820a4 (diff) | |
download | freebsd-ports-gnome-e846ad39ccf36a2cc6a1db101bb4b28d00e22692.tar.gz freebsd-ports-gnome-e846ad39ccf36a2cc6a1db101bb4b28d00e22692.tar.zst freebsd-ports-gnome-e846ad39ccf36a2cc6a1db101bb4b28d00e22692.zip |
Update for VMware Workstation 5 after repocopy.
PR: 80436
Submitted by: Scot W. Hetzel
Diffstat (limited to 'emulators')
-rw-r--r-- | emulators/linux-vmware-toolbox5/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux-vmware-toolbox5/distinfo | 4 | ||||
-rw-r--r-- | emulators/linux-vmware-toolbox6/Makefile | 14 | ||||
-rw-r--r-- | emulators/linux-vmware-toolbox6/distinfo | 4 | ||||
-rw-r--r-- | emulators/vmware-guestd5/Makefile | 28 | ||||
-rw-r--r-- | emulators/vmware-guestd5/pkg-plist | 2 | ||||
-rw-r--r-- | emulators/vmware-guestd5/pkg-plist.tools | 2 | ||||
-rw-r--r-- | emulators/vmware-guestd6/Makefile | 28 | ||||
-rw-r--r-- | emulators/vmware-guestd6/pkg-plist | 2 | ||||
-rw-r--r-- | emulators/vmware-guestd6/pkg-plist.tools | 2 | ||||
-rw-r--r-- | emulators/vmware-tools5/Makefile | 4 | ||||
-rw-r--r-- | emulators/vmware-tools6/Makefile | 4 |
12 files changed, 68 insertions, 40 deletions
diff --git a/emulators/linux-vmware-toolbox5/Makefile b/emulators/linux-vmware-toolbox5/Makefile index dfeabe42e3f1..2d5b96db128c 100644 --- a/emulators/linux-vmware-toolbox5/Makefile +++ b/emulators/linux-vmware-toolbox5/Makefile @@ -11,10 +11,10 @@ PORTREVISION= 1 CATEGORIES= emulators linux MASTER_SITES= # bundled with VMware itself PKGNAMEPREFIX= linux- -DISTNAME= vmware-linux-tools +DISTNAME= VMwareTools-${VMWARE_VER}-${BUILD_VER} MAINTAINER= matusita@FreeBSD.org -COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version) +COMMENT=VMware toolbox for guest OS (for VMware 5.x, Linux version) RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs @@ -34,8 +34,8 @@ IS_INTERACTIVE= yes RESTRICTED= "Not sure if we can redistribute this." NO_PACKAGE= ${RESTRICTED} -VMWARE_VER= 4.5.2 -BUILD_VER= 8848 +VMWARE_VER= 5.0.0 +BUILD_VER= 13124 .include <bsd.port.pre.mk> @@ -58,8 +58,8 @@ pre-extract: @${ECHO} "" @${ECHO} "Before installing this port, please follow this instructions:" @${ECHO} "" - @${ECHO} " *) Be sure that your VM have an IDE CD-ROM." - @${ECHO} " *) Select \"Edit -> Removable Devices -> CD-ROM 1 -> Edit\" on VMware menu," + @${ECHO} " *) Be sure that your VM has an IDE CD-ROM drive." + @${ECHO} " *) Select \"VM -> Removable Devices -> CD-ROM -> Edit\" on VMware menu," @${ECHO} " *) Check \"Connected\" box." @${ECHO} " *) Check \"Use ISO image\" radio button." @${ECHO} " *) Choose the file \"linux.iso\" for the ISO image. You will find" @@ -89,6 +89,6 @@ post-extract: ${UMOUNT} ${MOUNT_DEV} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${PREFIX}/bin/linux-vmware-toolbox + ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox-old ${PREFIX}/bin/linux-vmware-toolbox .include <bsd.port.post.mk> diff --git a/emulators/linux-vmware-toolbox5/distinfo b/emulators/linux-vmware-toolbox5/distinfo index c500fd56f58f..6fa5eb67cfec 100644 --- a/emulators/linux-vmware-toolbox5/distinfo +++ b/emulators/linux-vmware-toolbox5/distinfo @@ -1 +1,3 @@ -MD5 (vmware-linux-tools.tar.gz) = IGNORE +#MD5 (VMwareTools-5.0.0-13124.tar.gz) = IGNORE +#MD5 (VMwareTools-${VMWARE_VER}-${BUILD_VER}.tar.gz) = IGNORE +MD5 (ghogeVMwareTools-${VMWARE_VER}-${BUILD_VER}.tar.gz) = IGNORE diff --git a/emulators/linux-vmware-toolbox6/Makefile b/emulators/linux-vmware-toolbox6/Makefile index dfeabe42e3f1..2d5b96db128c 100644 --- a/emulators/linux-vmware-toolbox6/Makefile +++ b/emulators/linux-vmware-toolbox6/Makefile @@ -11,10 +11,10 @@ PORTREVISION= 1 CATEGORIES= emulators linux MASTER_SITES= # bundled with VMware itself PKGNAMEPREFIX= linux- -DISTNAME= vmware-linux-tools +DISTNAME= VMwareTools-${VMWARE_VER}-${BUILD_VER} MAINTAINER= matusita@FreeBSD.org -COMMENT=VMware toolbox for guest OS (for VMware 4.x, Linux version) +COMMENT=VMware toolbox for guest OS (for VMware 5.x, Linux version) RUN_DEPENDS= ${LINUXBASE}/usr/X11R6/lib/libXrender.so.1:${PORTSDIR}/x11/linux-XFree86-libs @@ -34,8 +34,8 @@ IS_INTERACTIVE= yes RESTRICTED= "Not sure if we can redistribute this." NO_PACKAGE= ${RESTRICTED} -VMWARE_VER= 4.5.2 -BUILD_VER= 8848 +VMWARE_VER= 5.0.0 +BUILD_VER= 13124 .include <bsd.port.pre.mk> @@ -58,8 +58,8 @@ pre-extract: @${ECHO} "" @${ECHO} "Before installing this port, please follow this instructions:" @${ECHO} "" - @${ECHO} " *) Be sure that your VM have an IDE CD-ROM." - @${ECHO} " *) Select \"Edit -> Removable Devices -> CD-ROM 1 -> Edit\" on VMware menu," + @${ECHO} " *) Be sure that your VM has an IDE CD-ROM drive." + @${ECHO} " *) Select \"VM -> Removable Devices -> CD-ROM -> Edit\" on VMware menu," @${ECHO} " *) Check \"Connected\" box." @${ECHO} " *) Check \"Use ISO image\" radio button." @${ECHO} " *) Choose the file \"linux.iso\" for the ISO image. You will find" @@ -89,6 +89,6 @@ post-extract: ${UMOUNT} ${MOUNT_DEV} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox ${PREFIX}/bin/linux-vmware-toolbox + ${INSTALL_PROGRAM} ${WRKSRC}/bin/vmware-toolbox-old ${PREFIX}/bin/linux-vmware-toolbox .include <bsd.port.post.mk> diff --git a/emulators/linux-vmware-toolbox6/distinfo b/emulators/linux-vmware-toolbox6/distinfo index c500fd56f58f..6fa5eb67cfec 100644 --- a/emulators/linux-vmware-toolbox6/distinfo +++ b/emulators/linux-vmware-toolbox6/distinfo @@ -1 +1,3 @@ -MD5 (vmware-linux-tools.tar.gz) = IGNORE +#MD5 (VMwareTools-5.0.0-13124.tar.gz) = IGNORE +#MD5 (VMwareTools-${VMWARE_VER}-${BUILD_VER}.tar.gz) = IGNORE +MD5 (ghogeVMwareTools-${VMWARE_VER}-${BUILD_VER}.tar.gz) = IGNORE diff --git a/emulators/vmware-guestd5/Makefile b/emulators/vmware-guestd5/Makefile index d22f567208a3..0f76147b0591 100644 --- a/emulators/vmware-guestd5/Makefile +++ b/emulators/vmware-guestd5/Makefile @@ -7,17 +7,17 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= # bundled with VMware itself PKGNAMESUFFIX?= -guestd DISTNAME= vmware-freebsd-tools MAINTAINER= matusita@FreeBSD.org -COMMENT?=VMware time synchronization daemon for FreeBSD guest OS (for VMware 4.x) +COMMENT?=VMware time synchronization daemon for FreeBSD guest OS (for VMware 5.x) .if defined(VMWARE_X_PORTS) -RUN_DEPENDS= ${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd4 +RUN_DEPENDS= ${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd5 .endif DISTDIR= ${MOUNT_PT} @@ -40,8 +40,8 @@ NO_BUILD= yes RESTRICTED= "Not sure if we can redistribute this." NO_PACKAGE= ${RESTRICTED} -VMWARE_VER= 4.5.2 -BUILD_VER= 8848 +VMWARE_VER= 5.0.0 +BUILD_VER= 13124 .include <bsd.port.pre.mk> @@ -59,9 +59,15 @@ UMOUNT= /sbin/umount .if ${X_WINDOW_SYSTEM:L} == xfree86-3 PLIST_SUB+= INSTALLXSERVER3:="" PLIST_SUB+= INSTALLXSERVER4:="@comment " -.else +PLIST_SUB+= INSTALLXVMMOUSE:="@comment " +.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 PLIST_SUB+= INSTALLXSERVER3:="@comment " PLIST_SUB+= INSTALLXSERVER4:="" +PLIST_SUB+= INSTALLXVMMOUSE:="" +.else +PLIST_SUB+= INSTALLXSERVER3:="@comment " +PLIST_SUB+= INSTALLXSERVER4:="@comment " +PLIST_SUB+= INSTALLXVMMOUSE:="" .endif .else @@ -88,8 +94,9 @@ fetch-list: do-fetch: @${ECHO} "" @${ECHO} "========================================================================" - @${ECHO} "Choose \"VM\" -> \"Install VMware Tools...\" from the Workstation menu" - @${ECHO} "to connect the VM's CD-ROM drive temporarily to installation CD image." + @${ECHO} "Choose \"VM\" -> \"Install VMware Tools...\" from VMware Workstation" + @${ECHO} "menu to connect VM's CD-ROM drive and installation CD image temporary." + @${ECHO} "Press \"Install\" button when a dialog pops up." @${ECHO} "========================================================================" @${ECHO} "" .if !defined(BATCH) @@ -134,10 +141,12 @@ do-install: @${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 +.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware ${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 +.else + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware .endif -${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end @@ -163,6 +172,7 @@ do-install: ${MKDIR} ${PREFIX}/share/vmware-tools ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweron-vm-default + ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/resume-vm-default ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/suspend-vm-default ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools diff --git a/emulators/vmware-guestd5/pkg-plist b/emulators/vmware-guestd5/pkg-plist index 088fe9ab446d..f5b630cb77bd 100644 --- a/emulators/vmware-guestd5/pkg-plist +++ b/emulators/vmware-guestd5/pkg-plist @@ -1,11 +1,13 @@ 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 %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko %%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true %%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools 2>/dev/null || true share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default +share/vmware-tools/resume-vm-default share/vmware-tools/suspend-vm-default @dirrm share/vmware-tools @cwd / diff --git a/emulators/vmware-guestd5/pkg-plist.tools b/emulators/vmware-guestd5/pkg-plist.tools index acc0046b6340..03078f0d349b 100644 --- a/emulators/vmware-guestd5/pkg-plist.tools +++ b/emulators/vmware-guestd5/pkg-plist.tools @@ -3,4 +3,4 @@ bin/vmware-toolbox %%INSTALLXSERVER3:%%etc/XF86Config_VMware %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware -%%INSTALLXSERVER4:%%lib/modules/input/vmmouse_drv.o_VMware +%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware diff --git a/emulators/vmware-guestd6/Makefile b/emulators/vmware-guestd6/Makefile index d22f567208a3..0f76147b0591 100644 --- a/emulators/vmware-guestd6/Makefile +++ b/emulators/vmware-guestd6/Makefile @@ -7,17 +7,17 @@ PORTNAME= vmware PORTVERSION= ${VMWARE_VER}.${BUILD_VER} -PORTREVISION= 2 +PORTREVISION= 0 CATEGORIES= emulators MASTER_SITES= # bundled with VMware itself PKGNAMESUFFIX?= -guestd DISTNAME= vmware-freebsd-tools MAINTAINER= matusita@FreeBSD.org -COMMENT?=VMware time synchronization daemon for FreeBSD guest OS (for VMware 4.x) +COMMENT?=VMware time synchronization daemon for FreeBSD guest OS (for VMware 5.x) .if defined(VMWARE_X_PORTS) -RUN_DEPENDS= ${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd4 +RUN_DEPENDS= ${LOCALBASE}/sbin/vmware-guestd:${PORTSDIR}/emulators/vmware-guestd5 .endif DISTDIR= ${MOUNT_PT} @@ -40,8 +40,8 @@ NO_BUILD= yes RESTRICTED= "Not sure if we can redistribute this." NO_PACKAGE= ${RESTRICTED} -VMWARE_VER= 4.5.2 -BUILD_VER= 8848 +VMWARE_VER= 5.0.0 +BUILD_VER= 13124 .include <bsd.port.pre.mk> @@ -59,9 +59,15 @@ UMOUNT= /sbin/umount .if ${X_WINDOW_SYSTEM:L} == xfree86-3 PLIST_SUB+= INSTALLXSERVER3:="" PLIST_SUB+= INSTALLXSERVER4:="@comment " -.else +PLIST_SUB+= INSTALLXVMMOUSE:="@comment " +.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 PLIST_SUB+= INSTALLXSERVER3:="@comment " PLIST_SUB+= INSTALLXSERVER4:="" +PLIST_SUB+= INSTALLXVMMOUSE:="" +.else +PLIST_SUB+= INSTALLXSERVER3:="@comment " +PLIST_SUB+= INSTALLXSERVER4:="@comment " +PLIST_SUB+= INSTALLXVMMOUSE:="" .endif .else @@ -88,8 +94,9 @@ fetch-list: do-fetch: @${ECHO} "" @${ECHO} "========================================================================" - @${ECHO} "Choose \"VM\" -> \"Install VMware Tools...\" from the Workstation menu" - @${ECHO} "to connect the VM's CD-ROM drive temporarily to installation CD image." + @${ECHO} "Choose \"VM\" -> \"Install VMware Tools...\" from VMware Workstation" + @${ECHO} "menu to connect VM's CD-ROM drive and installation CD image temporary." + @${ECHO} "Press \"Install\" button when a dialog pops up." @${ECHO} "========================================================================" @${ECHO} "" .if !defined(BATCH) @@ -134,10 +141,12 @@ do-install: @${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 +.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware ${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 +.else + ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XOrg/6.8.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware .endif -${LOCALBASE}/sbin/vmware-guestd --cmd toolinstall.end @@ -163,6 +172,7 @@ do-install: ${MKDIR} ${PREFIX}/share/vmware-tools ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweroff-vm-default ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/poweron-vm-default + ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/resume-vm-default ${LN} -sfh /usr/bin/true ${PREFIX}/share/vmware-tools/suspend-vm-default ${LN} -sfh ${PREFIX}/share/vmware-tools /etc/vmware-tools diff --git a/emulators/vmware-guestd6/pkg-plist b/emulators/vmware-guestd6/pkg-plist index 088fe9ab446d..f5b630cb77bd 100644 --- a/emulators/vmware-guestd6/pkg-plist +++ b/emulators/vmware-guestd6/pkg-plist @@ -1,11 +1,13 @@ 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 %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko %%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools/modules 2>/dev/null || true %%VMWARE_VMMEMCTL:%%@unexec rmdir %D/lib/vmware-tools 2>/dev/null || true share/vmware-tools/poweroff-vm-default share/vmware-tools/poweron-vm-default +share/vmware-tools/resume-vm-default share/vmware-tools/suspend-vm-default @dirrm share/vmware-tools @cwd / diff --git a/emulators/vmware-guestd6/pkg-plist.tools b/emulators/vmware-guestd6/pkg-plist.tools index acc0046b6340..03078f0d349b 100644 --- a/emulators/vmware-guestd6/pkg-plist.tools +++ b/emulators/vmware-guestd6/pkg-plist.tools @@ -3,4 +3,4 @@ bin/vmware-toolbox %%INSTALLXSERVER3:%%etc/XF86Config_VMware %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware -%%INSTALLXSERVER4:%%lib/modules/input/vmmouse_drv.o_VMware +%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware diff --git a/emulators/vmware-tools5/Makefile b/emulators/vmware-tools5/Makefile index 6b376e402e01..e4664d39929c 100644 --- a/emulators/vmware-tools5/Makefile +++ b/emulators/vmware-tools5/Makefile @@ -9,9 +9,9 @@ PORTNAME= vmware MASTER_SITES= # bundled with VMware itself PKGNAMESUFFIX?= -tools -COMMENT=VMware tools for guest OS (for VMware 4.x, FreeBSD version) +COMMENT=VMware tools for guest OS (for VMware 5.x, FreeBSD version) -MASTERDIR= ${.CURDIR}/../vmware-guestd4 +MASTERDIR= ${.CURDIR}/../vmware-guestd5 DESCR= ${PKGDIR}/pkg-descr.tools PLIST= ${PKGDIR}/pkg-plist.tools diff --git a/emulators/vmware-tools6/Makefile b/emulators/vmware-tools6/Makefile index 6b376e402e01..e4664d39929c 100644 --- a/emulators/vmware-tools6/Makefile +++ b/emulators/vmware-tools6/Makefile @@ -9,9 +9,9 @@ PORTNAME= vmware MASTER_SITES= # bundled with VMware itself PKGNAMESUFFIX?= -tools -COMMENT=VMware tools for guest OS (for VMware 4.x, FreeBSD version) +COMMENT=VMware tools for guest OS (for VMware 5.x, FreeBSD version) -MASTERDIR= ${.CURDIR}/../vmware-guestd4 +MASTERDIR= ${.CURDIR}/../vmware-guestd5 DESCR= ${PKGDIR}/pkg-descr.tools PLIST= ${PKGDIR}/pkg-plist.tools |