Attachment #110683 for bug #151872





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}

MAINTAINER=		mbr@freebsd.org
COMMENT?=		Open VMware tools for FreeBSD VMware guests

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


.if ${OSVERSION} < 700000
BROKEN=		does not compile on 6.X
.elif ${OSVERSION} >= 900007
BROKEN=		does not compile
.endif

.if ${ARCH} == "sparc64"

Lines 1-3 Link Here

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

Lines 9-20 Link Here

(-)pkg-plist (-5 / +9 lines)
9	lib/open-vm-tools/plugins/vmsvc/libpowerOps.so	9	lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
10	lib/open-vm-tools/plugins/vmsvc/libtimeSync.so	10	lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
11	lib/open-vm-tools/plugins/vmsvc/libvmbackup.so	11	lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
		12	%%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
		13	%%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
12	lib/open-vm-tools/plugins/common/libhgfsServer.so	14	lib/open-vm-tools/plugins/common/libhgfsServer.so
13	lib/open-vm-tools/plugins/common/libhgfsServer.la	15	lib/open-vm-tools/plugins/common/libhgfsServer.la
14	lib/open-vm-tools/plugins/common/libvix.so	16	lib/open-vm-tools/plugins/common/libvix.so
15	lib/open-vm-tools/plugins/common/libvix.la	17	lib/open-vm-tools/plugins/common/libvix.la
16	%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so	18	%%X11%%lib/open-vm-tools/plugins/vmusr/libresolutionSet.so
17	%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so	19	%%X11%%lib/open-vm-tools/plugins/vmusr/libvixUser.so
		20	lib/libhgfs.a
		21	lib/libhgfs.la
		22	lib/libhgfs.so
		23	lib/libhgfs.so.0
18	lib/libvmtools.a	24	lib/libvmtools.a
19	lib/libvmtools.la	25	lib/libvmtools.la
20	lib/libvmtools.so	26	lib/libvmtools.so
Lines 23-29 Link Here
23	lib/libguestlib.la	29	lib/libguestlib.la
24	lib/libguestlib.so	30	lib/libguestlib.so
25	lib/libguestlib.so.0	31	lib/libguestlib.so.0
26	lib/pkgconfig/vmguestlib.pc	32	libdata/pkgconfig/vmguestlib.pc
27	lib/vmware-tools/modules/drivers/linker.hints	33	lib/vmware-tools/modules/drivers/linker.hints
28	lib/vmware-tools/modules/drivers/vmblock.ko	34	lib/vmware-tools/modules/drivers/vmblock.ko
29	lib/vmware-tools/modules/drivers/vmhgfs.ko	35	lib/vmware-tools/modules/drivers/vmhgfs.ko
Lines 36-44 Link Here
36	@exec mkdir -p %D/lib/vmware-tools/modules/input	42	@exec mkdir -p %D/lib/vmware-tools/modules/input
37	sbin/mount_vmhgfs	43	sbin/mount_vmhgfs
38	%%X11%%bin/vmware-toolbox	44	%%X11%%bin/vmware-toolbox
39	%%X11%%bin/vmware-user
40	%%X11%%bin/vmware-user-suid-wrapper	45	%%X11%%bin/vmware-user-suid-wrapper
41	%%X11%%share/applications/vmware-user.desktop
42	share/vmware-tools/poweroff-vm-default	46	share/vmware-tools/poweroff-vm-default
43	share/vmware-tools/poweron-vm-default	47	share/vmware-tools/poweron-vm-default
44	share/vmware-tools/resume-vm-default	48	share/vmware-tools/resume-vm-default
Lines 46-52 Link Here
46	share/vmware-tools/vm-support	50	share/vmware-tools/vm-support
47	share/open-vm-tools/messages/toolboxcmd_de.vmsg	51	share/open-vm-tools/messages/toolboxcmd_de.vmsg
48	share/open-vm-tools/messages/toolboxcmd_ja.vmsg	52	share/open-vm-tools/messages/toolboxcmd_ja.vmsg
49	share/open-vm-tools/messages/toolboxcmd_zh.vmsg	53	share/open-vm-tools/messages/toolboxcmd_zh_CN.vmsg
50	share/vmware-tools/statechange.subr	54	share/vmware-tools/statechange.subr
51	share/vmware-tools/scripts/vmware/network	55	share/vmware-tools/scripts/vmware/network
52	@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null \|\| true	56	@exec kldxref %D/lib/vmware-tools/modules/drivers 2>/dev/null \|\| true
Lines 66-72 Link Here
66	@dirrmtry share/vmware-tools/scripts/vmware	70	@dirrmtry share/vmware-tools/scripts/vmware
67	@dirrmtry share/vmware-tools/scripts	71	@dirrmtry share/vmware-tools/scripts
68	@dirrmtry share/vmware-tools	72	@dirrmtry share/vmware-tools
69	@dirrmtry lib/pkgconfig	73	@dirrmtry libdata/pkgconfig
70	%%X11%%@dirrmtry share/applications	74	%%X11%%@dirrmtry share/applications
71	@dirrm lib/open-vm-tools/plugins/common	75	@dirrm lib/open-vm-tools/plugins/common
72	@dirrm lib/open-vm-tools/plugins/vmsvc	76	@dirrm lib/open-vm-tools/plugins/vmsvc

Lines 1-11 Link Here

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

Added Link Here

(-)files/patch-hostinfoPosix.c (+10 lines)
1	--- ./lib/misc/hostinfoPosix.c.orig 2010-04-28 03:17:27.000000000 +0900
2	+++ ./lib/misc/hostinfoPosix.c 2010-11-11 22:37:23.000000000 +0900
3	@@ -31,7 +31,6 @@
4	#include <sys/wait.h>
5	#include <signal.h>
6	#include <sys/time.h>
7	-#include <sys/timeb.h>
8	#include <pwd.h>
9	#include <pthread.h>
10	#include <sys/resource.h>




--- ./libguestlib/Makefile.am.orig	2010-04-28 03:17:28.000000000 +0900
+++ ./libguestlib/Makefile.am	2010-11-11 22:21:38.000000000 +0900
@@ -41,7 +41,7 @@
 
 EXTRA_DIST = vmguestlib.pc.in
 
-pkgconfigdir   = $(libdir)/pkgconfig
+pkgconfigdir   = $(DESTDIR)$(prefix)/libdata/pkgconfig
 pkgconfig_DATA = vmguestlib.pc
 
 $(pkgconfig_DATA): $(top_builddir)/config.status
--- ./libguestlib/Makefile.in.orig	2010-04-28 03:18:19.000000000 +0900
+++ ./libguestlib/Makefile.in	2010-11-11 22:22:04.000000000 +0900
@@ -298,7 +298,7 @@
 	$(top_srcdir)/lib/include/vmSessionId.h \
 	$(top_srcdir)/lib/include/vm_basic_types.h
 EXTRA_DIST = vmguestlib.pc.in
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
 pkgconfig_DATA = vmguestlib.pc
 all: all-am
 

Added Link Here

(-)files/patch-scripts-network (+10 lines)
1	--- ./scripts/freebsd/network.orig 2010-04-28 03:17:28.000000000 +0900
2	+++ ./scripts/freebsd/network 2010-11-11 22:18:23.000000000 +0900
3	@@ -59,6 +59,7 @@
4
5	for intf in `list_net_interfaces dhcp`; do
6	/etc/rc.d/netif $1 $intf
7	+ /etc/rc.d/dhclient $1 $intf
8	ec=$?
9
10	# Failure to stop an interface should not interfere with suspend.




--- 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,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
@@ -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:

Added Link Here

(-)files/patch-vm_basic_types.h (+10 lines)
1	--- ./lib/include/vm_basic_types.h.orig 2010-10-20 05:19:54.000000000 +0900
2	+++ ./lib/include/vm_basic_types.h 2010-10-29 20:11:03.000000000 +0900
3	@@ -333,6 +333,7 @@
4	#define FMTPD ""
5	#endif
6	#elif defined(__linux__) \
7	+ \|\| (defined(__clang__)) \
8	\|\| (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >= 200112L) \
9	\|\| (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
10	\|\| (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)




--- ./modules/freebsd/vmhgfs/Makefile.orig	2010-10-20 05:19:54.000000000 +0900
+++ ./modules/freebsd/vmhgfs/Makefile	2010-11-11 23:06:07.000000000 +0900
@@ -90,22 +90,7 @@
    CFLAGS += -Ishared
 .endif
 
-#
-# FreeBSD's kernel module build system defines a bunch of additional warning
-# flags for the compiler in addition to -Wall -Werror.  However, some of these,
-# like -Wredundant-decls, are overkill.  To get around this, I copied their list
-# of warning flags, but explicitly disabled a few.
-#
-CWARNFLAGS := -Wall
-CWARNFLAGS += -Werror
-CWARNFLAGS += -Wno-redundant-decls
-CWARNFLAGS += -Wnested-externs
-CWARNFLAGS += -Wstrict-prototypes
-CWARNFLAGS += -Wno-missing-prototypes
-CWARNFLAGS += -Wpointer-arith
-CWARNFLAGS += -Winline
-CWARNFLAGS += -Wcast-qual
-
 EXPORT_SYMS = NO
 
+.include <bsd.own.mk>
 .include <bsd.kmod.mk>

Return to bug 151872

Lines 7-13 Link Here

(-)Makefile (-5 / +4 lines)
7		7
8	PORTNAME= open-vm-tools	8	PORTNAME= open-vm-tools
9	PORTVERSION= ${BUILD_VER}	9	PORTVERSION= ${BUILD_VER}
10	PORTREVISION= 1
11	CATEGORIES= emulators kld	10	CATEGORIES= emulators kld
12	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}	11	MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
13	DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}	12	DISTNAME= open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
Lines 15-23 Link Here
15	MAINTAINER= mbr@freebsd.org	14	MAINTAINER= mbr@freebsd.org
16	COMMENT?= Open VMware tools for FreeBSD VMware guests	15	COMMENT?= Open VMware tools for FreeBSD VMware guests
17		16
18	RELEASE_DATE= 2010.04.25	17	RELEASE_DATE= 2010.10.18
19	BUILD_VER= 253928	18	BUILD_VER= 313025
20		19
		20	LICENSE= LGPL21
		21	LICENSE_FILE= ${WRKSRC}/COPYING
21	WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}	22	WRKSRC= ${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
22	GNU_CONFIGURE= yes	23	GNU_CONFIGURE= yes
23	USE_LDCONFIG= yes	24	USE_LDCONFIG= yes
Lines 78-85 Link Here
78		79
79	.if ${OSVERSION} < 700000	80	.if ${OSVERSION} < 700000
80	BROKEN= does not compile on 6.X	81	BROKEN= does not compile on 6.X
81	.elif ${OSVERSION} >= 900007
82	BROKEN= does not compile
83	.endif	82	.endif
84		83
85	.if ${ARCH} == "sparc64"	84	.if ${ARCH} == "sparc64"

Added Link Here

(-)files/patch-libguestlib-Makefile (+22 lines)
1	--- ./libguestlib/Makefile.am.orig 2010-04-28 03:17:28.000000000 +0900
2	+++ ./libguestlib/Makefile.am 2010-11-11 22:21:38.000000000 +0900
3	@@ -41,7 +41,7 @@
4
5	EXTRA_DIST = vmguestlib.pc.in
6
7	-pkgconfigdir = $(libdir)/pkgconfig
8	+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
9	pkgconfig_DATA = vmguestlib.pc
10
11	$(pkgconfig_DATA): $(top_builddir)/config.status
12	--- ./libguestlib/Makefile.in.orig 2010-04-28 03:18:19.000000000 +0900
13	+++ ./libguestlib/Makefile.in 2010-11-11 22:22:04.000000000 +0900
14	@@ -298,7 +298,7 @@
15	$(top_srcdir)/lib/include/vmSessionId.h \
16	$(top_srcdir)/lib/include/vm_basic_types.h
17	EXTRA_DIST = vmguestlib.pc.in
18	-pkgconfigdir = $(libdir)/pkgconfig
19	+pkgconfigdir = $(DESTDIR)$(prefix)/libdata/pkgconfig
20	pkgconfig_DATA = vmguestlib.pc
21	all: all-am
22

Lines 1-24 Link Here

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

Added Link Here

(-)files/patch-vmhgfs-Makefile (+26 lines)
1	--- ./modules/freebsd/vmhgfs/Makefile.orig 2010-10-20 05:19:54.000000000 +0900
2	+++ ./modules/freebsd/vmhgfs/Makefile 2010-11-11 23:06:07.000000000 +0900
3	@@ -90,22 +90,7 @@
4	CFLAGS += -Ishared
5	.endif
6
7	-#
8	-# FreeBSD's kernel module build system defines a bunch of additional warning
9	-# flags for the compiler in addition to -Wall -Werror. However, some of these,
10	-# like -Wredundant-decls, are overkill. To get around this, I copied their list
11	-# of warning flags, but explicitly disabled a few.
12	-#
13	-CWARNFLAGS := -Wall
14	-CWARNFLAGS += -Werror
15	-CWARNFLAGS += -Wno-redundant-decls
16	-CWARNFLAGS += -Wnested-externs
17	-CWARNFLAGS += -Wstrict-prototypes
18	-CWARNFLAGS += -Wno-missing-prototypes
19	-CWARNFLAGS += -Wpointer-arith
20	-CWARNFLAGS += -Winline
21	-CWARNFLAGS += -Wcast-qual
22	-
23	EXPORT_SYMS = NO
24
25	+.include <bsd.own.mk>
26	.include <bsd.kmod.mk>