mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-30 05:40:06 +00:00
Code Issues Releases Activity

Fix some errors, including:

Browse Source 
- Build fix when WITH_VMWARE_GTK is set.
- Reorder pkg-plist so that @unexec vmware-guestd.sh successfully done.
- Create directories for server modules, since xserver may not be installed.

Even though this makes no "installed" content change, but bump
PORTREVISION since pkg-plist/pkg-plist.tools are changed.

PR:		93100
Submitted by:	Scot Hetzel, swhetzel at gmail dotcom
This commit is contained in:
Makoto Matsushita 2006-02-11 17:23:19 +00:00
parent b21cb2fa5f
commit a1f741f880
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=155765
8 changed files with 48 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
emulators/vmware-guestd5/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= vmware PORTNAME= vmware
PORTVERSION= ${VMWARE_VER}.${BUILD_VER} PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= # bundled with VMware Workstation MASTER_SITES= # bundled with VMware Workstation
PKGNAMESUFFIX?= -guestd PKGNAMESUFFIX?= -guestd
@ -35,6 +35,16 @@ IS_INTERACTIVE= yes
.if defined(VMWARE_X_PORTS) .if defined(VMWARE_X_PORTS)
USE_X_PREFIX= yes USE_X_PREFIX= yes
NO_BUILD= 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 .endif
RESTRICTED= "Not sure if we can redistribute this." RESTRICTED= "Not sure if we can redistribute this."
@ -80,17 +90,6 @@ PLIST_SUB+= INSTALLXSERVER4:="@comment "
PLIST_SUB+= INSTALLXVMMOUSE:="" PLIST_SUB+= INSTALLXVMMOUSE:=""
.endif .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 .else
VMWARE_KMODDIR= ${PREFIX}/lib/vmware-tools/modules VMWARE_KMODDIR= ${PREFIX}/lib/vmware-tools/modules
@ -178,6 +177,11 @@ do-install:
.if defined(WITH_VMWARE_GTK) .if defined(WITH_VMWARE_GTK)
${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
.endif .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 ${X_WINDOW_SYSTEM:L} == xfree86-3
.if ${BITS} == 32 .if ${BITS} == 32
${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware ${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
@ -192,6 +196,9 @@ do-install:
.endif .endif
.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 .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/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
${MKDIR} ${X11BASE}/lib/modules/drivers ; \
fi
.if ${BITS} == 32 .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.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 ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware

4
emulators/vmware-guestd5/pkg-plist
View File

@ -1,7 +1,7 @@
sbin/vmware-checkvm
sbin/vmware-guestd
@unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true @unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true
etc/rc.d/vmware-guestd.sh etc/rc.d/vmware-guestd.sh
sbin/vmware-checkvm
sbin/vmware-guestd
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko %%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules %%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules

2
emulators/vmware-guestd5/pkg-plist.tools
View File

@ -6,3 +6,5 @@ bin/vmware-toolbox-tcl
%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware %%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input

31
emulators/vmware-guestd6/Makefile
View File

@ -7,7 +7,7 @@
PORTNAME= vmware PORTNAME= vmware
PORTVERSION= ${VMWARE_VER}.${BUILD_VER} PORTVERSION= ${VMWARE_VER}.${BUILD_VER}
PORTREVISION?= 0 PORTREVISION?= 1
CATEGORIES= emulators CATEGORIES= emulators
MASTER_SITES= # bundled with VMware Workstation MASTER_SITES= # bundled with VMware Workstation
PKGNAMESUFFIX?= -guestd PKGNAMESUFFIX?= -guestd
@ -35,6 +35,16 @@ IS_INTERACTIVE= yes
.if defined(VMWARE_X_PORTS) .if defined(VMWARE_X_PORTS)
USE_X_PREFIX= yes USE_X_PREFIX= yes
NO_BUILD= 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 .endif
RESTRICTED= "Not sure if we can redistribute this." RESTRICTED= "Not sure if we can redistribute this."
@ -80,17 +90,6 @@ PLIST_SUB+= INSTALLXSERVER4:="@comment "
PLIST_SUB+= INSTALLXVMMOUSE:="" PLIST_SUB+= INSTALLXVMMOUSE:=""
.endif .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 .else
VMWARE_KMODDIR= ${PREFIX}/lib/vmware-tools/modules VMWARE_KMODDIR= ${PREFIX}/lib/vmware-tools/modules
@ -178,6 +177,11 @@ do-install:
.if defined(WITH_VMWARE_GTK) .if defined(WITH_VMWARE_GTK)
${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin ${INSTALL_PROGRAM} ${WRKSRC}/lib/bin${BITS}/vmware-toolbox-gtk ${X11BASE}/bin
.endif .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 ${X_WINDOW_SYSTEM:L} == xfree86-3
.if ${BITS} == 32 .if ${BITS} == 32
${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware ${INSTALL_PROGRAM} ${WRKSRC}/lib/configurator/XFree86-3/XF86_VMware_4.5 ${X11BASE}/bin/XF86_VMware
@ -192,6 +196,9 @@ do-install:
.endif .endif
.elif ${X_WINDOW_SYSTEM:L} == xfree86-4 .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/XF86Config-4 ${X11BASE}/etc/XF86Config-4_VMware
if [ ! -d ${X11BASE}/lib/modules/drivers ] ; then \
${MKDIR} ${X11BASE}/lib/modules/drivers ; \
fi
.if ${BITS} == 32 .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.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 ${INSTALL_DATA} ${WRKSRC}/lib/configurator/XFree86-4/4.2.x/vmmouse_drv.o ${X11BASE}/lib/modules/input/vmmouse_drv.o_VMware

4
emulators/vmware-guestd6/pkg-plist
View File

@ -1,7 +1,7 @@
sbin/vmware-checkvm
sbin/vmware-guestd
@unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true @unexec %D/etc/rc.d/vmware-guestd.sh forcestop 2>/dev/null || true
etc/rc.d/vmware-guestd.sh etc/rc.d/vmware-guestd.sh
sbin/vmware-checkvm
sbin/vmware-guestd
%%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko %%VMWARE_VMMEMCTL:%%lib/vmware-tools/modules/vmmemctl.ko
%%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko %%VMWARE_VMXNET:%%lib/vmware-tools/modules/vmxnet.ko
%%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules %%VMWARE_KMODDIR:%%@dirrmtry lib/vmware-tools/modules

2
emulators/vmware-guestd6/pkg-plist.tools
View File

@ -6,3 +6,5 @@ bin/vmware-toolbox-tcl
%%INSTALLXSERVER4:%%etc/XF86Config-4_VMware %%INSTALLXSERVER4:%%etc/XF86Config-4_VMware
%%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware %%INSTALLXSERVER4:%%lib/modules/drivers/vmware_drv.o_VMware
%%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware %%INSTALLXVMMOUSE:%%lib/modules/input/vmmouse_drv.o_VMware
%%INSTALLXSERVER4:%%@dirrmtry lib/modules/drivers
%%INSTALLXVMMOUSE:%%@dirrmtry lib/modules/input

2
emulators/vmware-tools5/Makefile
View File

@ -6,7 +6,7 @@
# #
PORTNAME= vmware PORTNAME= vmware
PORTREVISION?= 0 PORTREVISION?= 1
MASTER_SITES= # bundled with VMware Workstation MASTER_SITES= # bundled with VMware Workstation
PKGNAMESUFFIX?= -tools PKGNAMESUFFIX?= -tools

2
emulators/vmware-tools6/Makefile
View File

@ -6,7 +6,7 @@
# #
PORTNAME= vmware PORTNAME= vmware
PORTREVISION?= 0 PORTREVISION?= 1
MASTER_SITES= # bundled with VMware Workstation MASTER_SITES= # bundled with VMware Workstation
PKGNAMESUFFIX?= -tools PKGNAMESUFFIX?= -tools