Upgrade to build 313025, release date 2010.10.18

Fix build on HEAD
Fix dhclient resume
Fix pkgconfig

PR:		151872, 149116, 150913
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp>
This commit is contained in:
Martin Blapp 2010-11-15 23:57:51 +00:00
parent 6a4a84d0fc
commit 8a737de735
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=264609
5 changed files with 24 additions and 23 deletions

View File

@ -7,7 +7,6 @@
PORTNAME= open-vm-tools
PORTVERSION= ${BUILD_VER}
PORTREVISION= 1
CATEGORIES= emulators kld
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
@ -15,9 +14,11 @@ DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
MAINTAINER= mbr@freebsd.org
COMMENT?= Open VMware tools for FreeBSD VMware guests
RELEASE_DATE= 2010.04.25
BUILD_VER= 253928
RELEASE_DATE= 2010.10.18
BUILD_VER= 313025
LICENSE= LGPL21
LICENSE_FILE= ${WRKSRC}/COPYING
WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
@ -78,8 +79,6 @@ USE_RC_SUBR= vmware-guestd.sh vmware-kmod.sh
.if ${OSVERSION} < 700000
BROKEN= does not compile on 6.X
.elif ${OSVERSION} >= 900007
BROKEN= does not compile
.endif
.if ${ARCH} == "sparc64"

View File

@ -1,3 +1,3 @@
MD5 (open-vm-tools-2010.04.25-253928.tar.gz) = da0ed15d29f4a1f6eca21e8aeeabb476
SHA256 (open-vm-tools-2010.04.25-253928.tar.gz) = ad09ed494670547ef728051109069f83efc441896828dd4f0c50804538110ed6
SIZE (open-vm-tools-2010.04.25-253928.tar.gz) = 3513471
MD5 (open-vm-tools-2010.10.18-313025.tar.gz) = 2e3762950356d436dc5ccec51a2b78db
SHA256 (open-vm-tools-2010.10.18-313025.tar.gz) = cbf3f1a7e5229309a8440a424969dfe523c307a183d6aff9aa56a7d0d8e05d3c
SIZE (open-vm-tools-2010.10.18-313025.tar.gz) = 3565621

View File

@ -1,11 +1,11 @@
--- lib/guestApp/guestApp.c.orig 2008-05-29 10:42:37.000000000 +0300
+++ lib/guestApp/guestApp.c 2008-05-29 10:43:09.000000000 +0300
@@ -73,7 +73,7 @@
#elif defined(_WIN32)
#define GUESTAPP_TOOLS_INSTALL_PATH ""
@@ -65,7 +65,7 @@
#elif defined __APPLE__
# define GUESTAPP_TOOLS_INSTALL_PATH "/Library/Application Support/VMware Tools"
#else
-#define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools"
+#define GUESTAPP_TOOLS_INSTALL_PATH "/usr/local/share/vmware-tools"
-# define GUESTAPP_TOOLS_INSTALL_PATH "/etc/vmware-tools"
+# define GUESTAPP_TOOLS_INSTALL_PATH "/usr/local/share/vmware-tools"
#endif
/*

View File

@ -1,24 +1,22 @@
--- services/Makefile.am.orig 2009-02-28 20:48:46.000000000 +0100
+++ services/Makefile.am 2009-02-28 20:49:28.000000000 +0100
@@ -20,6 +20,6 @@
@@ -20,6 +20,5 @@
SUBDIRS += plugins
install-exec-local:
- mkdir -p $(DESTDIR)/etc/vmware-tools
- ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
+ mkdir -p $(prefix)/etc/vmware-tools
+
--- services/Makefile.in.orig 2009-02-28 20:48:52.000000000 +0100
+++ services/Makefile.in 2009-02-28 20:49:46.000000000 +0100
@@ -576,8 +576,8 @@
@@ -642,8 +642,7 @@
install-exec-local:
- mkdir -p $(DESTDIR)/etc/vmware-tools
- ln -sf `dirname $(VMSVC_PLUGIN_INSTALLDIR)` $(DESTDIR)/etc/vmware-tools/plugins
+ mkdir -p $(prefix)/etc/vmware-tools
+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:

View File

@ -15,6 +15,12 @@ lib/open-vm-tools/plugins/common/libvix.so
lib/open-vm-tools/plugins/common/libvix.la
%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
%%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
%%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
lib/libhgfs.a
lib/libhgfs.la
lib/libhgfs.so
lib/libhgfs.so.0
lib/libvmtools.a
lib/libvmtools.la
lib/libvmtools.so
@ -23,7 +29,7 @@ lib/libguestlib.a
lib/libguestlib.la
lib/libguestlib.so
lib/libguestlib.so.0
lib/pkgconfig/vmguestlib.pc
libdata/pkgconfig/vmguestlib.pc
lib/vmware-tools/modules/drivers/linker.hints
lib/vmware-tools/modules/drivers/vmblock.ko
lib/vmware-tools/modules/drivers/vmhgfs.ko
@ -36,9 +42,7 @@ include/vmGuestLib/vm_basic_types.h
@exec mkdir -p %D/lib/vmware-tools/modules/input
sbin/mount_vmhgfs
%%X11%%bin/vmware-toolbox
%%X11%%bin/vmware-user
%%X11%%bin/vmware-user-suid-wrapper
%%X11%%share/applications/vmware-user.desktop
share/vmware-tools/poweroff-vm-default
share/vmware-tools/poweron-vm-default
share/vmware-tools/resume-vm-default
@ -46,7 +50,7 @@ share/vmware-tools/suspend-vm-default
share/vmware-tools/vm-support
share/open-vm-tools/messages/toolboxcmd_de.vmsg
share/open-vm-tools/messages/toolboxcmd_ja.vmsg
share/open-vm-tools/messages/toolboxcmd_zh.vmsg
share/open-vm-tools/messages/toolboxcmd_zh_CN.vmsg
share/vmware-tools/statechange.subr
share/vmware-tools/scripts/vmware/network
@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null || true
@ -66,7 +70,7 @@ share/vmware-tools/scripts/vmware/network
@dirrmtry share/vmware-tools/scripts/vmware
@dirrmtry share/vmware-tools/scripts
@dirrmtry share/vmware-tools
@dirrmtry lib/pkgconfig
@dirrmtry libdata/pkgconfig
%%X11%%@dirrmtry share/applications
@dirrm lib/open-vm-tools/plugins/common
@dirrm lib/open-vm-tools/plugins/vmsvc