Index: head/emulators/open-vm-tools/Makefile =================================================================== --- head/emulators/open-vm-tools/Makefile (revision 516082) +++ head/emulators/open-vm-tools/Makefile (revision 516083) @@ -1,92 +1,93 @@ # Created by: mbr@FreeBSD.org # $FreeBSD$ PORTNAME= open-vm-tools PORTVERSION= ${RELEASE_VER} DISTVERSIONPREFIX= stable- +PORTREVISION= 1 PORTEPOCH= 2 CATEGORIES= emulators MAINTAINER= jpaetzel@FreeBSD.org COMMENT?= Open VMware tools for FreeBSD VMware guests LICENSE= LGPL21 LICENSE_FILE= ${WRKSRC}/COPYING ONLY_FOR_ARCHS= amd64 i386 LIB_DEPENDS= libmspack.so:archivers/libmspack \ libdnet.so:net/libdnet RELEASE_VER= 11.0.1 BUILD_VER= 14773994 OPTIONS_DEFINE= LIBNOTIFY OPENSSL X11 OPTIONS_DEFAULT= LIBNOTIFY OPENSSL X11 OPTIONS_SUB= LIBNOTIFY_DESC= Desktop notification support X11_CONFIGURE_WITH= x gtk2 gtkmm X11_USE= xorg=ice,sm,x11,xext,xi,xinerama,xorgproto,xrandr,xrender,xtst \ gnome=gdkpixbuf2,gtk20,gtkmm24 X11_LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libfreetype.so:print/freetype2 LIBNOTIFY_LIB_DEPENDS= libnotify.so:devel/libnotify OPENSSL_CONFIGURE_WITH= ssl WRKSRC_SUBDIR= open-vm-tools GNU_CONFIGURE= yes USES= autoreconf fuse gettext-runtime kmod libtool localbase pathfix pkgconfig gnome USE_GNOME= glib20 USE_GITHUB= yes GH_ACCOUNT= vmware USE_LDCONFIG= yes CPPFLAGS+= -Wno-deprecated-declarations SSP_UNSAFE= kernel module does not support ssp CONFIGURE_ARGS+= --without-icu \ --disable-vgauth \ --sysconfdir=${PREFIX}/etc CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]* USE_RC_SUBR= vmware-guestd vmware-kmod INSTALL_TARGET= install-strip .include .if ${PORT_OPTIONS:MX11} CONFLICTS+= open-vm-tools-nox11-[0-9]* .else CONFLICTS+= open-vm-tools-[0-9]* .endif CONFIGURE_ENV+= SYSDIR=${SRC_BASE}/sys .include post-patch: @${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@"\ ${WRKSRC}/lib/guestApp/guestApp.c post-build: cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS} post-install: ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers ${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/input ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmblock.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmblock.ko ${INSTALL_DATA} ${WRKSRC}/modules/freebsd/vmmemctl.ko ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers/vmmemctl.ko ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/vmware/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/scripts/ ${MKDIR} ${STAGEDIR}${PREFIX}/share/open-vm-tools/tests/ ${MKDIR} ${STAGEDIR}${PREFIX}/etc/rc.conf.d .include Index: head/emulators/open-vm-tools/files/vmware-kmod.in =================================================================== --- head/emulators/open-vm-tools/files/vmware-kmod.in (revision 516082) +++ head/emulators/open-vm-tools/files/vmware-kmod.in (revision 516083) @@ -1,88 +1,73 @@ #!/bin/sh # # $FreeBSD$ # # PROVIDE: vmware-kmod # REQUIRE: FILESYSTEMS ldconfig # BEFORE: netif . /etc/rc.subr # Global checkvm_cmd="%%PREFIX%%/bin/vmware-checkvm > /dev/null" # Functions vmware_mod_load() { echo -n "Loading $1 kernel module: " kldstat -n %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko >/dev/null 2>&1 if [ "$?" = "0" ]; then echo "already loaded." else kldload %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko >/dev/null 2>&1 if [ "$?" = "0" ]; then echo "done." else echo "failed." return 1 fi fi } vmware_mod_status() { echo -n "Checking $1 kernel module: " kldstat -n %%PREFIX%%/lib/vmware-tools/modules/drivers/$1.ko >/dev/null 2>&1 if [ "$?" = "0" ]; then echo "loaded." else echo "not loaded" return 1 fi } # VMware kernel module: vmmemctl kernel_mod="vmmemctl" name="vmware_guest_${kernel_mod}" rcvar=vmware_guest_${kernel_mod}_enable extra_commands="status" status_cmd="vmware_mod_status ${kernel_mod}" start_precmd="${checkvm_cmd}" start_cmd="vmware_mod_load ${kernel_mod}" stop_precmd="${checkvm_cmd}" stop_cmd=":" load_rc_config $name : ${vmware_guest_kmod_enable:="YES"} : ${vmware_guest_vmmemctl_enable:=$vmware_guest_kmod_enable} run_rc_command "$1" -# VMware kernel module: vmxnet -kernel_mod="vmxnet" -name="vmware_guest_${kernel_mod}" -rcvar=vmware_guest_${kernel_mod}_enable -extra_commands="status" -status_cmd="vmware_mod_status ${kernel_mod}" -start_precmd="${checkvm_cmd}" -start_cmd="vmware_mod_load ${kernel_mod}" -stop_precmd="${checkvm_cmd}" -stop_cmd=":" - -load_rc_config $name -: ${vmware_guest_vmxnet_enable:=$vmware_guest_kmod_enable} -run_rc_command "$1" - # VMware kernel module: vmblock kernel_mod="vmblock" name="vmware_guest_${kernel_mod}" rcvar=vmware_guest_${kernel_mod}_enable extra_commands="status" status_cmd="vmware_mod_status ${kernel_mod}" start_precmd="${checkvm_cmd}" start_cmd="vmware_mod_load ${kernel_mod}" stop_precmd="${checkvm_cmd}" stop_cmd=":" load_rc_config $name : ${vmware_guest_vmblock_enable:=$vmware_guest_kmod_enable} run_rc_command "$1"