Date: Tue, 2 Nov 2010 02:18:18 +0900 From: Yamaguchi Hirohisa <umq@ueo.co.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/151872: [patch] emulators/open-vm-tools fix build under CURRENT and unbreak Message-ID: <AB4EC31A-841D-4730-A758-4DABCD6BBB1A@ueo.co.jp> Resent-Message-ID: <201011011740.oA1He9QK027498@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 151872
>Category: ports
>Synopsis: [patch] emulators/open-vm-tools fix build under CURRENT =
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: change-request
>Submitter-Id: current-users
>Arrival-Date: Mon Nov 01 17:40:09 UTC 2010
>Closed-Date:
>Last-Modified:
>Originator: Hirohisa Yamaguchi
>Release: FreeBSD 9.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD 9c-test.****.org 9.0-CURRENT FreeBSD 9.0-CURRENT #1: Fri =
Oct 22 09:08:28 JST 2010 =
root@9c-test.****.org:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
emulators/open-vm-tools does not build under CURRENT
>How-To-Repeat:
# cd emulators/open-vm-tools
# make build
>Fix:
the patch follows:
diff -Npru ports/emulators/open-vm-tools/Makefile =
ports.orig/emulators/open-vm-tools/Makefile
--- ports/emulators/open-vm-tools/Makefile 2010-11-02 =
01:49:04.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/Makefile 2010-11-02 =
01:02:50.000000000 +0900
@@ -7,7 +7,6 @@
=20
PORTNAME=3D open-vm-tools
PORTVERSION=3D ${BUILD_VER}
-PORTREVISION=3D 1
CATEGORIES=3D emulators kld
MASTER_SITES=3D =
SF/${PORTNAME}/${PORTNAME}/${RELEASE_DATE}
DISTNAME=3D open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
@@ -15,9 +14,11 @@ DISTNAME=3D open-vm-tools-${RELEASE_DATE}
MAINTAINER=3D mbr@freebsd.org
COMMENT?=3D Open VMware tools for FreeBSD VMware guests
=20
-RELEASE_DATE=3D 2010.04.25
-BUILD_VER=3D 253928
+RELEASE_DATE=3D 2010.10.18
+BUILD_VER=3D 313025
=20
+LICENSE=3D LGPL21
+LICENSE_FILE=3D ${WRKSRC}/COPYING
WRKSRC=3D =
${WRKDIR}/open-vm-tools-${RELEASE_DATE}-${BUILD_VER}
GNU_CONFIGURE=3D yes
USE_LDCONFIG=3D yes
@@ -78,8 +79,6 @@ USE_RC_SUBR=3D vmware-guestd.sh =
vmware-km
=20
.if ${OSVERSION} < 700000
BROKEN=3D does not compile on 6.X
-.elif ${OSVERSION} >=3D 900007
-BROKEN=3D does not compile
.endif
=20
.if ${ARCH} =3D=3D "sparc64"
diff -Npru ports/emulators/open-vm-tools/distinfo =
ports.orig/emulators/open-vm-tools/distinfo
--- ports/emulators/open-vm-tools/distinfo 2010-11-02 =
01:49:41.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/distinfo 2010-11-02 =
01:00:35.000000000 +0900
@@ -1,3 +1,2 @@
-MD5 (open-vm-tools-2010.04.25-253928.tar.gz) =3D =
da0ed15d29f4a1f6eca21e8aeeabb476
-SHA256 (open-vm-tools-2010.04.25-253928.tar.gz) =3D =
ad09ed494670547ef728051109069f83efc441896828dd4f0c50804538110ed6
-SIZE (open-vm-tools-2010.04.25-253928.tar.gz) =3D 3513471
+SHA256 (open-vm-tools-2010.10.18-313025.tar.gz) =3D =
cbf3f1a7e5229309a8440a424969dfe523c307a183d6aff9aa56a7d0d8e05d3c
+SIZE (open-vm-tools-2010.10.18-313025.tar.gz) =3D 3565621
diff -Npru ports/emulators/open-vm-tools/files/patch-guestApp.c =
ports.orig/emulators/open-vm-tools/files/patch-guestApp.c
--- ports/emulators/open-vm-tools/files/patch-guestApp.c =
2010-01-03 01:29:44.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/files/patch-guestApp.c =
2010-11-02 01:00:35.000000000 +0900
@@ -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 ""
+--- ./lib/guestApp/guestApp.c.orig 2010-10-20 05:19:54.000000000 =
+0900
++++ ./lib/guestApp/guestApp.c 2010-10-29 19:31:03.000000000 +0900
+@@ -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
=20
/*
diff -Npru ports/emulators/open-vm-tools/files/patch-hostinfoPosix.c =
ports.orig/emulators/open-vm-tools/files/patch-hostinfoPosix.c
--- ports/emulators/open-vm-tools/files/patch-hostinfoPosix.c =
1970-01-01 09:00:00.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/files/patch-hostinfoPosix.c =
2010-11-02 01:00:35.000000000 +0900
@@ -0,0 +1,10 @@
+--- ./lib/misc/hostinfoPosix.c.orig 2010-10-20 05:19:54.000000000 =
+0900
++++ ./lib/misc/hostinfoPosix.c 2010-10-29 19:46:10.000000000 +0900
+@@ -31,7 +31,6 @@
+ #include <sys/wait.h>
+ #include <signal.h>
+ #include <sys/time.h>
+-#include <sys/timeb.h>
+ #include <pwd.h>
+ #include <pthread.h>
+ #include <sys/resource.h>
diff -Npru ports/emulators/open-vm-tools/files/patch-services-Makefile =
ports.orig/emulators/open-vm-tools/files/patch-services-Makefile
--- ports/emulators/open-vm-tools/files/patch-services-Makefile =
2010-01-03 01:29:44.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/files/patch-services-Makefile =
2010-11-02 01:00:35.000000000 +0900
@@ -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 @@
+--- ./services/Makefile.am.orig 2010-10-20 05:19:54.000000000 =
+0900
++++ ./services/Makefile.am 2010-10-29 19:38:19.000000000 +0900
+@@ -20,6 +20,5 @@
SUBDIRS +=3D plugins
=20
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
-+
=20
---- 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 @@
+--- ./services/Makefile.in.orig 2010-10-20 05:20:06.000000000 =
+0900
++++ ./services/Makefile.in 2010-10-29 19:43:30.000000000 +0900
+@@ -642,8 +642,7 @@
=20
=20
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
-+
+=20
# 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:
diff -Npru ports/emulators/open-vm-tools/files/patch-vm_basic_types.h =
ports.orig/emulators/open-vm-tools/files/patch-vm_basic_types.h
--- ports/emulators/open-vm-tools/files/patch-vm_basic_types.h =
1970-01-01 09:00:00.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/files/patch-vm_basic_types.h =
2010-11-02 01:00:35.000000000 +0900
@@ -0,0 +1,10 @@
+--- ./lib/include/vm_basic_types.h.orig 2010-10-20 =
05:19:54.000000000 +0900
++++ ./lib/include/vm_basic_types.h 2010-10-29 20:11:03.000000000 =
+0900
+@@ -333,6 +333,7 @@
+ #define FMTPD ""
+ #endif
+ #elif defined(__linux__) \
++ || (defined(__clang__)) \
+ || (defined(_POSIX_C_SOURCE) && _POSIX_C_SOURCE >=3D 200112L) \
+ || (defined(_POSIX_VERSION) && _POSIX_VERSION >=3D 200112L) \
+ || (defined(_POSIX2_VERSION) && _POSIX2_VERSION >=3D 200112L)
diff -Npru ports/emulators/open-vm-tools/files/patch-vmhgfs-Makefile =
ports.orig/emulators/open-vm-tools/files/patch-vmhgfs-Makefile
--- ports/emulators/open-vm-tools/files/patch-vmhgfs-Makefile =
1970-01-01 09:00:00.000000000 +0900
+++ ports.orig/emulators/open-vm-tools/files/patch-vmhgfs-Makefile =
2010-11-02 01:00:35.000000000 +0900
@@ -0,0 +1,26 @@
+--- ./modules/freebsd/vmhgfs/Makefile.orig 2010-10-20 =
05:19:54.000000000 +0900
++++ ./modules/freebsd/vmhgfs/Makefile 2010-10-27 08:30:00.000000000 =
+0900
+@@ -90,22 +90,7 @@
+ CFLAGS +=3D -Ishared
+ .endif
+=20
+-#
+-# 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 :=3D -Wall
+-CWARNFLAGS +=3D -Werror
+-CWARNFLAGS +=3D -Wno-redundant-decls
+-CWARNFLAGS +=3D -Wnested-externs
+-CWARNFLAGS +=3D -Wstrict-prototypes
+-CWARNFLAGS +=3D -Wno-missing-prototypes
+-CWARNFLAGS +=3D -Wpointer-arith
+-CWARNFLAGS +=3D -Winline
+-CWARNFLAGS +=3D -Wcast-qual
+-
+ EXPORT_SYMS =3D NO
+=20
++.include <bsd.own.mk>
+ .include <bsd.kmod.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
and unbreak
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?AB4EC31A-841D-4730-A758-4DABCD6BBB1A>