From umq@ueo.co.jp  Mon Nov  1 17:31:32 2010
Return-Path: <umq@ueo.co.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 928DA1065670
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  1 Nov 2010 17:31:32 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from msa04a.plala.or.jp (msa04.plala.or.jp [58.93.240.4])
	by mx1.freebsd.org (Postfix) with ESMTP id 139378FC21
	for <FreeBSD-gnats-submit@freebsd.org>; Mon,  1 Nov 2010 17:31:31 +0000 (UTC)
Received: from terpsichore.kaumoge.org ([114.188.33.149])
          by msa01b.plala.or.jp with ESMTP
          id <20101101171820.PQNJ1037.msa01b.plala.or.jp@terpsichore.kaumoge.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 2 Nov 2010 02:18:20 +0900
Received: from hestia.kaumoge.org (hestia.kaumoge.org [192.168.24.126])
	by terpsichore.kaumoge.org (8.14.3/8.14.2/20080818) with ESMTP id oA1HIJtA064066
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 2 Nov 2010 02:18:20 +0900 (JST)
	(envelope-from umq@ueo.co.jp)
Message-Id: <AB4EC31A-841D-4730-A758-4DABCD6BBB1A@ueo.co.jp>
Date: Tue, 2 Nov 2010 02:18:18 +0900
From: Yamaguchi Hirohisa <umq@ueo.co.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [patch] emulators/open-vm-tools fix build under CURRENT and unbreak

>Number:         151872
>Category:       ports
>Synopsis:       [patch] emulators/open-vm-tools fix build under CURRENT =
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mbr
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Mon Nov 01 17:40:09 UTC 2010
>Closed-Date:    Tue Nov 16 00:02:24 UTC 2010
>Last-Modified:  Tue Nov 16 00:02:24 UTC 2010
>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:
Responsible-Changed-From-To: freebsd-ports-bugs->mbr 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Mon Nov 1 17:40:17 UTC 2010 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151872 

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: FreeBSD-gnats-submit@FreeBSD.org, freebsd-ports-bugs@FreeBSD.org,
        mbr@FreeBSD.org
Cc:  
Subject: Re: ports/151872: [patch] emulators/open-vm-tools fix build under CURRENT and unbreak
Date: Tue, 02 Nov 2010 07:21:39 +0900

 Hi,
 
 The patch submitted previously was corrupted by mailer.
 re-attaching it again.
 
 At Mon, 1 Nov 2010 17:40:09 GMT,
 FreeBSD-gnats-submit@FreeBSD.org wrote:
 > http://www.freebsd.org/cgi/query-pr.cgi?pr=151872
 > 
 > >Category:       ports
 > >Responsible:    freebsd-ports-bugs
 > >Synopsis:       [patch] emulators/open-vm-tools fix build under CURRENT =
 > >Arrival-Date:   Mon Nov 01 17:40:09 UTC 2010
 
 -- 
 
    Hirohisa Yamaguchi
      <umq@ueo.co.jp>
 
 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 @@
  
  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}
  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-km
  
  .if ${OSVERSION} < 700000
  BROKEN=		does not compile on 6.X
 -.elif ${OSVERSION} >= 900007
 -BROKEN=		does not compile
  .endif
  
  .if ${ARCH} == "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) = da0ed15d29f4a1f6eca21e8aeeabb476
 -SHA256 (open-vm-tools-2010.04.25-253928.tar.gz) = ad09ed494670547ef728051109069f83efc441896828dd4f0c50804538110ed6
 -SIZE (open-vm-tools-2010.04.25-253928.tar.gz) = 3513471
 +SHA256 (open-vm-tools-2010.10.18-313025.tar.gz) = cbf3f1a7e5229309a8440a424969dfe523c307a183d6aff9aa56a7d0d8e05d3c
 +SIZE (open-vm-tools-2010.10.18-313025.tar.gz) = 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
   
   /*
 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 += 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 @@
 +--- ./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 @@
   
   
   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:
 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 >= 200112L) \
 +       || (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
 +       || (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 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 += -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>

From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: bug-followup@FreeBSD.org, mbr@FreeBSD.org
Cc:  
Subject: Re: ports/151872: [patch] emulators/open-vm-tools fix build under CURRENT and unbreak
Date: Sat, 13 Nov 2010 14:37:39 +0900

 --Multipart_Sat_Nov_13_14:37:38_2010-1
 Content-Type: text/plain; charset=US-ASCII
 
 Here's a revised patch contains:
  + update pkg-plist
  + dhclient fix in ports/149116
  + pkgconfig fix in ports/150913
 
 -- 
 
 	Hirohisa Yamaguchi
 	  <umq@ueo.co.jp>
 
 --Multipart_Sat_Nov_13_14:37:38_2010-1
 Content-Type: application/octet-stream; type=patch
 Content-Disposition: attachment; filename="emulators_open-vm-tools.patch"
 Content-Transfer-Encoding: 7bit
 
 cvs diff: Diffing .
 Index: Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/emulators/open-vm-tools/Makefile,v
 retrieving revision 1.42
 diff -u -r1.42 Makefile
 --- Makefile	14 Sep 2010 03:20:15 -0000	1.42
 +++ Makefile	13 Nov 2010 05:07:07 -0000
 @@ -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 @@
  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 @@
  
  .if ${OSVERSION} < 700000
  BROKEN=		does not compile on 6.X
 -.elif ${OSVERSION} >= 900007
 -BROKEN=		does not compile
  .endif
  
  .if ${ARCH} == "sparc64"
 Index: distinfo
 ===================================================================
 RCS file: /home/ncvs/ports/emulators/open-vm-tools/distinfo,v
 retrieving revision 1.10
 diff -u -r1.10 distinfo
 --- distinfo	6 Jun 2010 14:55:58 -0000	1.10
 +++ distinfo	13 Nov 2010 05:07:07 -0000
 @@ -1,3 +1,2 @@
 -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
 +SHA256 (open-vm-tools-2010.10.18-313025.tar.gz) = cbf3f1a7e5229309a8440a424969dfe523c307a183d6aff9aa56a7d0d8e05d3c
 +SIZE (open-vm-tools-2010.10.18-313025.tar.gz) = 3565621
 Index: pkg-plist
 ===================================================================
 RCS file: /home/ncvs/ports/emulators/open-vm-tools/pkg-plist,v
 retrieving revision 1.25
 diff -u -r1.25 pkg-plist
 --- pkg-plist	6 Jun 2010 19:31:13 -0000	1.25
 +++ pkg-plist	13 Nov 2010 05:07:08 -0000
 @@ -9,12 +9,18 @@
  lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
  lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
  lib/open-vm-tools/plugins/vmsvc/libvmbackup.so
 +%%X11%%lib/open-vm-tools/plugins/vmusr/libdesktopEvents.so
 +%%X11%%lib/open-vm-tools/plugins/vmusr/libdndcp.so
  lib/open-vm-tools/plugins/common/libhgfsServer.so
  lib/open-vm-tools/plugins/common/libhgfsServer.la
  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
 +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.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 @@
  @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/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 @@
  @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
 cvs diff: Diffing files
 Index: files/patch-guestApp.c
 ===================================================================
 RCS file: /home/ncvs/ports/emulators/open-vm-tools/files/patch-guestApp.c,v
 retrieving revision 1.2
 diff -u -r1.2 patch-guestApp.c
 --- files/patch-guestApp.c	2 Jan 2010 16:29:44 -0000	1.2
 +++ files/patch-guestApp.c	13 Nov 2010 05:07:08 -0000
 @@ -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
   
   /*
 Index: files/patch-hostinfoPosix.c
 ===================================================================
 RCS file: files/patch-hostinfoPosix.c
 diff -N files/patch-hostinfoPosix.c
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-hostinfoPosix.c	13 Nov 2010 05:07:08 -0000
 @@ -0,0 +1,10 @@
 +--- ./lib/misc/hostinfoPosix.c.orig	2010-04-28 03:17:27.000000000 +0900
 ++++ ./lib/misc/hostinfoPosix.c	2010-11-11 22:37:23.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>
 Index: files/patch-libguestlib-Makefile
 ===================================================================
 RCS file: files/patch-libguestlib-Makefile
 diff -N files/patch-libguestlib-Makefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-libguestlib-Makefile	13 Nov 2010 05:07:08 -0000
 @@ -0,0 +1,22 @@
 +--- ./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
 + 
 Index: files/patch-scripts-network
 ===================================================================
 RCS file: files/patch-scripts-network
 diff -N files/patch-scripts-network
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-scripts-network	13 Nov 2010 05:07:08 -0000
 @@ -0,0 +1,10 @@
 +--- ./scripts/freebsd/network.orig	2010-04-28 03:17:28.000000000 +0900
 ++++ ./scripts/freebsd/network	2010-11-11 22:18:23.000000000 +0900
 +@@ -59,6 +59,7 @@
 + 
 +       for intf in `list_net_interfaces dhcp`; do
 +          /etc/rc.d/netif $1 $intf
 ++         /etc/rc.d/dhclient $1 $intf
 +          ec=$?
 + 
 +          # Failure to stop an interface should not interfere with suspend.
 Index: files/patch-services-Makefile
 ===================================================================
 RCS file: /home/ncvs/ports/emulators/open-vm-tools/files/patch-services-Makefile,v
 retrieving revision 1.3
 diff -u -r1.3 patch-services-Makefile
 --- files/patch-services-Makefile	2 Jan 2010 16:29:44 -0000	1.3
 +++ files/patch-services-Makefile	13 Nov 2010 05:07:08 -0000
 @@ -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:
 Index: files/patch-vm_basic_types.h
 ===================================================================
 RCS file: files/patch-vm_basic_types.h
 diff -N files/patch-vm_basic_types.h
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-vm_basic_types.h	13 Nov 2010 05:07:08 -0000
 @@ -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 >= 200112L) \
 +       || (defined(_POSIX_VERSION) && _POSIX_VERSION >= 200112L) \
 +       || (defined(_POSIX2_VERSION) && _POSIX2_VERSION >= 200112L)
 Index: files/patch-vmhgfs-Makefile
 ===================================================================
 RCS file: files/patch-vmhgfs-Makefile
 diff -N files/patch-vmhgfs-Makefile
 --- /dev/null	1 Jan 1970 00:00:00 -0000
 +++ files/patch-vmhgfs-Makefile	13 Nov 2010 05:07:08 -0000
 @@ -0,0 +1,26 @@
 +--- ./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>
 
 --Multipart_Sat_Nov_13_14:37:38_2010-1--

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/151872: commit references a PR
Date: Mon, 15 Nov 2010 23:57:55 +0000 (UTC)

 mbr         2010-11-15 23:57:51 UTC
 
   FreeBSD ports repository
 
   Modified files:
     emulators/open-vm-tools Makefile distinfo pkg-plist 
     emulators/open-vm-tools/files patch-guestApp.c 
                                   patch-services-Makefile 
   Log:
   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>
   
   Revision  Changes    Path
   1.43      +4 -5      ports/emulators/open-vm-tools/Makefile
   1.11      +3 -3      ports/emulators/open-vm-tools/distinfo
   1.3       +5 -5      ports/emulators/open-vm-tools/files/patch-guestApp.c
   1.4       +3 -5      ports/emulators/open-vm-tools/files/patch-services-Makefile
   1.26      +9 -5      ports/emulators/open-vm-tools/pkg-plist
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: mbr 
State-Changed-When: Tue Nov 16 00:02:01 UTC 2010 
State-Changed-Why:  
Committed, thanks ! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=151872 
>Unformatted:
 and unbreak
