From mat@aragorn.in.absolight.net  Tue Nov 12 13:18:13 2013
Return-Path: <mat@aragorn.in.absolight.net>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1])
	(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by hub.freebsd.org (Postfix) with ESMTPS id 3CF66843;
	Tue, 12 Nov 2013 13:18:13 +0000 (UTC)
Received: from prod2.absolight.net (mx3.absolight.net [IPv6:2a01:678:2:100::25])
	(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
	(No client certificate requested)
	by mx1.freebsd.org (Postfix) with ESMTPS id BB6DC2B12;
	Tue, 12 Nov 2013 13:18:12 +0000 (UTC)
Received: from prod2.absolight.net (localhost [127.0.0.1])
	by prod2.absolight.net (Postfix) with ESMTP id 03349BDC30;
	Tue, 12 Nov 2013 14:18:11 +0100 (CET)
Received: from gw.in.absolight.net (gw-ecl.in.absolight.net [79.143.241.69])
	(using TLSv1 with cipher DHE-RSA-CAMELLIA256-SHA (256/256 bits))
	(Client CN "gw.in.absolight.net", Issuer "CA Cert Signing Authority" (not verified))
	by prod2.absolight.net (Postfix) with ESMTPSA id B86A4BDC24;
	Tue, 12 Nov 2013 14:18:10 +0100 (CET)
Received: from aragorn.in.absolight.net (aragorn.in.absolight.net [79.143.241.225])
	by gw.in.absolight.net (Postfix) with ESMTP id D25BE6122;
	Tue, 12 Nov 2013 14:18:09 +0100 (CET)
Received: by aragorn.in.absolight.net (Postfix, from userid 1000)
	id 3AE9014269C; Tue, 12 Nov 2013 14:18:09 +0100 (CET)
Message-Id: <20131112131809.3AE9014269C@aragorn.in.absolight.net>
Date: Tue, 12 Nov 2013 14:18:09 +0100 (CET)
From: Mathieu Arnold <mat@FreeBSD.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: swills@FreeBSD.org
Subject: [PATCH] emulators/open-vm-tools: Convert to new options framework
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         183893
>Category:       ports
>Synopsis:       [PATCH] emulators/open-vm-tools: Convert to new options framework
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    swills
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Nov 12 13:20:00 UTC 2013
>Closed-Date:    Sat Nov 16 14:19:06 UTC 2013
>Last-Modified:  Sat Nov 16 23:30:00 UTC 2013
>Originator:     Mathieu Arnold
>Release:        FreeBSD 9.2-RELEASE i386
>Organization:
Absolight
>Environment:
System: FreeBSD aragorn.in.absolight.net 9.2-RELEASE FreeBSD 9.2-RELEASE #0 r255898: Fri Sep 27 03:52:52 UTC
>Description:
- Convert to new options framework
- Pet portlint

Port maintainer (swills@FreeBSD.org) is cc'd.

Generated with FreeBSD Port Tools 0.99_9 (mode: change, diff: SVN)
>How-To-Repeat:
>Fix:

--- open-vm-tools-425873_4,1.patch begins here ---
Index: open-vm-tools/Makefile
===================================================================
--- open-vm-tools/Makefile	(revision 333567)
+++ open-vm-tools/Makefile	(working copy)
@@ -18,6 +18,28 @@
 RELEASE_VER=		8.6.0
 BUILD_VER=		425873
 
+OPTIONS_DEFINE=	X11 LIBNOTIFY UNITY FUSE DNET ICU
+OPTIONS_DEFAULT=	X11 LIBNOTIFY FUSE DNET ICU
+OPTIONS_SUB=
+
+DNET_DESC=	libdnet support
+LIBNOTIFY_DESC=	Desktop notification support
+UNITY_DESC=	liburiparser support
+
+X11_CONFIGURE_WITH=	x gtk2 gtkmm
+X11_LDFLAGS=		-L${LOCALBASE}/lib
+X11_USE=		xorg=x11,ice,sm,xext,xineramaproto,xinerama,xrandr,xrender,xtst \
+			gnome=gtk20,gtkmm24
+X11_USES=		fuse
+LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
+UNITY_CONFIGURE_ENV=	CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
+UNITY_LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
+UNITY_CONFIGURE_ENABLE=	unity
+DNET_CONFIGURE_WITH=	dnet
+DNET_LIB_DEPENDS=		libdnet.so:${PORTSDIR}/net/libdnet
+ICU_CONFIGURE_WITH=	icu
+ICU_LIB_DEPENDS=		libicuuc.so:${PORTSDIR}/devel/icu
+
 WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
 GNU_CONFIGURE=		yes
 USES=			pkgconfig kmod
@@ -29,53 +52,20 @@
 SSP_UNSAFE=		kernel module does not support ssp
 
 CONFIGURE_ARGS+=	--without-procps --sysconfdir=${LOCALBASE}/etc
-.if defined(WITHOUT_X11)
-CONFIGURE_ARGS+=	--without-x --without-gtk2 --without-gtkmm
-PLIST_SUB+=		X11="@comment "
-CONFLICTS=		open-vm-tools-[0-9]*
-.else
-.if !defined(WITHOUT_LIBNOTIFY)
-LIB_DEPENDS+=		libnotify.so:${PORTSDIR}/devel/libnotify
-.endif
-.if defined(WITH_UNITY)
-CONFIGURE_ENV+=		CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
-LIB_DEPENDS+=		liburiparser.so:${PORTSDIR}/net/uriparser
-.else
-CONFIGURE_ARGS+=	--disable-unity
-.endif
-CONFIGURE_ARGS+=	--with-x
-LDFLAGS+=		-L${LOCALBASE}/lib
-USE_XORG=		x11 ice sm xext xineramaproto xinerama xrandr xrender \
-			xtst
-USE_GNOME+=		gtk20 gtkmm24
-PLIST_SUB+=		X11=""
-CONFLICTS=		open-vm-tools-nox11-[0-9]*
-.endif
 
-.if !defined(WITHOUT_FUSE)
-USES+=		fuse
-PLIST_SUB+=	FUSE=""
-.else
-PLIST_SUB+=	FUSE="@comment "
-.endif
-
 CONFLICTS+=		vmware-guestd[0-9]* vmware-tools[0-9]*
 SUB_FILES=		pkg-message
 
-.if defined(WITHOUT_DNET)
-CONFIGURE_ARGS+=	--without-dnet
-.else
-LIB_DEPENDS+=		libdnet.so:${PORTSDIR}/net/libdnet
-.endif
+USE_RC_SUBR=		vmware-guestd vmware-kmod
 
-.if defined(WITHOUT_ICU)
-CONFIGURE_ARGS+=	--without-icu
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MX11}
+CONFLICTS=		open-vm-tools-nox11-[0-9]*
 .else
-LIB_DEPENDS+=		libicuuc.so:${PORTSDIR}/devel/icu
+CONFLICTS=		open-vm-tools-[0-9]*
 .endif
 
-USE_RC_SUBR=		vmware-guestd vmware-kmod
-
 .include <bsd.port.pre.mk>
 
 .if ${ARCH} == "sparc64"
@@ -83,7 +73,7 @@
 .endif
 
 post-build:
-	(cd ${WRKSRC}/modules && env ${MAKE_ENV} ${MAKE} ${MAKE_ARGS})
+	cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
Index: open-vm-tools/pkg-plist
===================================================================
--- open-vm-tools/pkg-plist	(revision 333567)
+++ open-vm-tools/pkg-plist	(working copy)
@@ -47,9 +47,9 @@
 share/vmware-tools/resume-vm-default
 share/vmware-tools/suspend-vm-default
 share/vmware-tools/vm-support
-share/open-vm-tools/messages/de/toolbox.vmsg
-share/open-vm-tools/messages/ja/toolbox.vmsg
-share/open-vm-tools/messages/zh_CN/toolbox.vmsg
+%%DATADIR%%/messages/de/toolbox.vmsg
+%%DATADIR%%/messages/ja/toolbox.vmsg
+%%DATADIR%%/messages/zh_CN/toolbox.vmsg
 share/vmware-tools/statechange.subr
 share/vmware-tools/scripts/vmware/network
 @unexec if test -f %D/share/vmware-tools/tools.conf; then rm -f %D/share/vmware-tools/tools.conf; fi
@@ -58,14 +58,14 @@
 @dirrmtry lib/vmware-tools/modules
 @dirrmtry lib/vmware-tools
 @dirrmtry etc/vmware-tools
-@dirrmtry share/open-vm-tools/messages/de
-@dirrmtry share/open-vm-tools/messages/ja
-@dirrmtry share/open-vm-tools/messages/zh_CN
-@dirrmtry share/open-vm-tools/messages
-@dirrmtry share/open-vm-tools/scripts/vmware
-@dirrmtry share/open-vm-tools/scripts
-@dirrmtry share/open-vm-tools/tests
-@dirrmtry share/open-vm-tools
+@dirrmtry %%DATADIR%%/messages/de
+@dirrmtry %%DATADIR%%/messages/ja
+@dirrmtry %%DATADIR%%/messages/zh_CN
+@dirrmtry %%DATADIR%%/messages
+@dirrmtry %%DATADIR%%/scripts/vmware
+@dirrmtry %%DATADIR%%/scripts
+@dirrmtry %%DATADIR%%/tests
+@dirrmtry %%DATADIR%%
 @dirrmtry share/vmware-tools/scripts/vmware
 @dirrmtry share/vmware-tools/scripts
 @dirrmtry share/vmware-tools
Index: open-vm-tools-nox11/Makefile
===================================================================
--- open-vm-tools-nox11/Makefile	(revision 333567)
+++ open-vm-tools-nox11/Makefile	(working copy)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 MASTERDIR=      ${.CURDIR}/../open-vm-tools
-WITHOUT_X11=    yes
 PKGNAMESUFFIX=	-nox11
+OPTIONS_EXCLUDE=	X11
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
--- open-vm-tools-425873_4,1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->swills 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Nov 12 13:20:10 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=183893 
State-Changed-From-To: open->closed 
State-Changed-By: swills 
State-Changed-When: Sat Nov 16 14:19:05 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183893: commit references a PR
Date: Sat, 16 Nov 2013 14:19:05 +0000 (UTC)

 Author: swills
 Date: Sat Nov 16 14:18:54 2013
 New Revision: 333999
 URL: http://svnweb.freebsd.org/changeset/ports/333999
 
 Log:
   - Convert to new options framework
   - Pet portlint
   
   PR:		ports/183893
   Submitted by:	mat
 
 Modified:
   head/emulators/open-vm-tools/Makefile
   head/emulators/open-vm-tools/pkg-plist
 
 Modified: head/emulators/open-vm-tools/Makefile
 ==============================================================================
 --- head/emulators/open-vm-tools/Makefile	Sat Nov 16 13:51:34 2013	(r333998)
 +++ head/emulators/open-vm-tools/Makefile	Sat Nov 16 14:18:54 2013	(r333999)
 @@ -18,6 +18,28 @@ LICENSE_FILE=		${WRKSRC}/COPYING
  RELEASE_VER=		9.2.3
  BUILD_VER=		1031360
  
 +OPTIONS_DEFINE=	X11 LIBNOTIFY UNITY FUSE DNET ICU
 +OPTIONS_DEFAULT=	X11 LIBNOTIFY FUSE DNET ICU
 +OPTIONS_SUB=
 +
 +DNET_DESC=	libdnet support
 +LIBNOTIFY_DESC=	Desktop notification support
 +UNITY_DESC=	liburiparser support
 +
 +X11_CONFIGURE_WITH=	x gtk2 gtkmm
 +X11_LDFLAGS=		-L${LOCALBASE}/lib
 +X11_USE=		xorg=x11,ice,sm,xext,xineramaproto,xinerama,xrandr,xrender,xtst \
 +			gnome=gtk20,gtkmm24
 +X11_USES=		fuse
 +LIBNOTIFY_LIB_DEPENDS=	libnotify.so:${PORTSDIR}/devel/libnotify
 +UNITY_CONFIGURE_ENV=	CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
 +UNITY_LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
 +UNITY_CONFIGURE_ENABLE=	unity
 +DNET_CONFIGURE_WITH=	dnet
 +DNET_LIB_DEPENDS=		libdnet.so:${PORTSDIR}/net/libdnet
 +ICU_CONFIGURE_WITH=	icu
 +ICU_LIB_DEPENDS=		libicuuc.so:${PORTSDIR}/devel/icu
 +
  WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
  GNU_CONFIGURE=		yes
  USES=			pkgconfig kmod
 @@ -29,47 +51,20 @@ KMODDIR=		${PREFIX}/lib/vmware-tools/mod
  SSP_UNSAFE=		kernel module does not support ssp
  
  CONFIGURE_ARGS+=	--without-procps --sysconfdir=${LOCALBASE}/etc
 -.if defined(WITHOUT_X11)
 -CONFIGURE_ARGS+=	--without-x --without-gtk2 --without-gtkmm
 -PLIST_SUB+=		X11="@comment "
 -CONFLICTS=		open-vm-tools-[0-9]*
 -.else
 -.if !defined(WITHOUT_LIBNOTIFY)
 -LIB_DEPENDS+=		libnotify.so:${PORTSDIR}/devel/libnotify
 -.endif
 -CONFIGURE_ARGS+=	--with-x
 -LDFLAGS+=		-L${LOCALBASE}/lib
 -USE_XORG=		x11 ice sm xext xineramaproto xinerama xrandr xrender \
 -			xtst
 -USE_GNOME+=		gtk20 gtkmm24
 -PLIST_SUB+=		X11=""
 -CONFLICTS=		open-vm-tools-nox11-[0-9]*
 -.endif
 -
 -.if !defined(WITHOUT_FUSE)
 -USES+=		fuse
 -PLIST_SUB+=	FUSE=""
 -.else
 -PLIST_SUB+=	FUSE="@comment "
 -.endif
  
  CONFLICTS+=		vmware-guestd[0-9]* vmware-tools[0-9]*
  SUB_FILES=		pkg-message
  
 -.if defined(WITHOUT_DNET)
 -CONFIGURE_ARGS+=	--without-dnet
 -.else
 -LIB_DEPENDS+=		libdnet.so:${PORTSDIR}/net/libdnet
 -.endif
 +USE_RC_SUBR=		vmware-guestd vmware-kmod
 +
 +.include <bsd.port.options.mk>
  
 -.if defined(WITHOUT_ICU)
 -CONFIGURE_ARGS+=	--without-icu
 +.if ${PORT_OPTIONS:MX11}
 +CONFLICTS=		open-vm-tools-nox11-[0-9]*
  .else
 -LIB_DEPENDS+=		libicuuc.so:${PORTSDIR}/devel/icu
 +CONFLICTS=		open-vm-tools-[0-9]*
  .endif
  
 -USE_RC_SUBR=		vmware-guestd vmware-kmod
 -
  .include <bsd.port.pre.mk>
  
  .if ${ARCH} == "sparc64"
 @@ -77,7 +72,7 @@ IGNORE=		not yet ported to sparc64
  .endif
  
  post-build:
 -	(cd ${WRKSRC}/modules && env ${MAKE_ENV} ${MAKE} ${MAKE_ARGS})
 +	cd ${WRKSRC}/modules && ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_ARGS}
  
  post-install:
  	${MKDIR} ${STAGEDIR}${PREFIX}/lib/vmware-tools/modules/drivers
 
 Modified: head/emulators/open-vm-tools/pkg-plist
 ==============================================================================
 --- head/emulators/open-vm-tools/pkg-plist	Sat Nov 16 13:51:34 2013	(r333998)
 +++ head/emulators/open-vm-tools/pkg-plist	Sat Nov 16 14:18:54 2013	(r333999)
 @@ -52,14 +52,6 @@ share/vmware-tools/scripts/vmware/networ
  @dirrmtry lib/vmware-tools/modules/input
  @dirrmtry lib/vmware-tools/modules
  @dirrmtry lib/vmware-tools
 -@dirrmtry share/open-vm-tools/messages/de
 -@dirrmtry share/open-vm-tools/messages/ja
 -@dirrmtry share/open-vm-tools/messages/zh_CN
 -@dirrmtry share/open-vm-tools/messages
 -@dirrmtry share/open-vm-tools/scripts/vmware
 -@dirrmtry share/open-vm-tools/scripts
 -@dirrmtry share/open-vm-tools/tests
 -@dirrmtry share/open-vm-tools
  @dirrmtry share/vmware-tools/scripts/vmware
  @dirrmtry share/vmware-tools/scripts
  @dirrmtry share/vmware-tools
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/183893: commit references a PR
Date: Sat, 16 Nov 2013 23:22:31 +0000 (UTC)

 Author: swills
 Date: Sat Nov 16 23:22:22 2013
 New Revision: 334036
 URL: http://svnweb.freebsd.org/changeset/ports/334036
 
 Log:
   - Update to 9.4.0
   - Commit open-vm-tools-nox11 part of conversion to optionsNG missed in last
     commit [1]
   - Fix plist issue with open-vm-tools-nox11 with optionsNG enabled
   
   PR:		ports/183893 [1]
   Submitted by:	mat
 
 Added:
   head/emulators/open-vm-tools/files/patch-vm_basic_asm.h   (contents, props changed)
 Deleted:
   head/emulators/open-vm-tools/files/patch-hostinfoPosix.c
 Modified:
   head/emulators/open-vm-tools-nox11/Makefile   (contents, props changed)
   head/emulators/open-vm-tools/Makefile
   head/emulators/open-vm-tools/distinfo
   head/emulators/open-vm-tools/files/patch-vmmemctl-os.c
   head/emulators/open-vm-tools/pkg-plist
 
 Modified: head/emulators/open-vm-tools-nox11/Makefile
 ==============================================================================
 --- head/emulators/open-vm-tools-nox11/Makefile	Sat Nov 16 22:35:22 2013	(r334035)
 +++ head/emulators/open-vm-tools-nox11/Makefile	Sat Nov 16 23:22:22 2013	(r334036)
 @@ -2,8 +2,7 @@
  # $FreeBSD$
  
  MASTERDIR=      ${.CURDIR}/../open-vm-tools
 -WITHOUT_X11=    yes
  PKGNAMESUFFIX=	-nox11
 +OPTIONS_UNSET=	X11
  
 -NO_STAGE=	yes
  .include "${MASTERDIR}/Makefile"
 
 Modified: head/emulators/open-vm-tools/Makefile
 ==============================================================================
 --- head/emulators/open-vm-tools/Makefile	Sat Nov 16 22:35:22 2013	(r334035)
 +++ head/emulators/open-vm-tools/Makefile	Sat Nov 16 23:22:22 2013	(r334036)
 @@ -3,10 +3,10 @@
  
  PORTNAME=		open-vm-tools
  PORTVERSION=		${BUILD_VER}
 -PORTREVISION=		4
 +PORTREVISION=		0
  PORTEPOCH=		1
  CATEGORIES=		emulators
 -MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.2.x
 +MASTER_SITES=		SF/${PORTNAME}/${PORTNAME}/stable-9.4.x
  DISTNAME=		open-vm-tools-${RELEASE_VER}-${BUILD_VER}
  
  MAINTAINER=		swills@FreeBSD.org
 @@ -15,16 +15,16 @@ COMMENT?=		Open VMware tools for FreeBSD
  LICENSE=		LGPL21
  LICENSE_FILE=		${WRKSRC}/COPYING
  
 -RELEASE_VER=		9.2.3
 -BUILD_VER=		1031360
 +RELEASE_VER=		9.4.0
 +BUILD_VER=		1280544
  
 -OPTIONS_DEFINE=	X11 LIBNOTIFY UNITY FUSE DNET ICU
 +OPTIONS_DEFINE=		X11 LIBNOTIFY UNITY FUSE DNET ICU
  OPTIONS_DEFAULT=	X11 LIBNOTIFY FUSE DNET ICU
  OPTIONS_SUB=
  
 -DNET_DESC=	libdnet support
 -LIBNOTIFY_DESC=	Desktop notification support
 -UNITY_DESC=	liburiparser support
 +DNET_DESC=		libdnet support
 +LIBNOTIFY_DESC=		Desktop notification support
 +UNITY_DESC=		liburiparser support
  
  X11_CONFIGURE_WITH=	x gtk2 gtkmm
  X11_LDFLAGS=		-L${LOCALBASE}/lib
 @@ -36,9 +36,9 @@ UNITY_CONFIGURE_ENV=	CUSTOM_URIPARSER_CP
  UNITY_LIB_DEPENDS=	liburiparser.so:${PORTSDIR}/net/uriparser
  UNITY_CONFIGURE_ENABLE=	unity
  DNET_CONFIGURE_WITH=	dnet
 -DNET_LIB_DEPENDS=		libdnet.so:${PORTSDIR}/net/libdnet
 +DNET_LIB_DEPENDS=	libdnet.so:${PORTSDIR}/net/libdnet
  ICU_CONFIGURE_WITH=	icu
 -ICU_LIB_DEPENDS=		libicuuc.so:${PORTSDIR}/devel/icu
 +ICU_LIB_DEPENDS=	libicuuc.so:${PORTSDIR}/devel/icu
  
  WRKSRC=			${WRKDIR}/open-vm-tools-${RELEASE_VER}-${BUILD_VER}
  GNU_CONFIGURE=		yes
 
 Modified: head/emulators/open-vm-tools/distinfo
 ==============================================================================
 --- head/emulators/open-vm-tools/distinfo	Sat Nov 16 22:35:22 2013	(r334035)
 +++ head/emulators/open-vm-tools/distinfo	Sat Nov 16 23:22:22 2013	(r334036)
 @@ -1,2 +1,2 @@
 -SHA256 (open-vm-tools-9.2.3-1031360.tar.gz) = 1a004ea1675101fd44cddda299e2e9ac254388769b69f41b7ff5d1797549c8f1
 -SIZE (open-vm-tools-9.2.3-1031360.tar.gz) = 3565935
 +SHA256 (open-vm-tools-9.4.0-1280544.tar.gz) = 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399
 +SIZE (open-vm-tools-9.4.0-1280544.tar.gz) = 3659504
 
 Added: head/emulators/open-vm-tools/files/patch-vm_basic_asm.h
 ==============================================================================
 --- /dev/null	00:00:00 1970	(empty, because file is newly added)
 +++ head/emulators/open-vm-tools/files/patch-vm_basic_asm.h	Sat Nov 16 23:22:22 2013	(r334036)
 @@ -0,0 +1,11 @@
 +--- lib/include/vm_basic_asm.h.orig	2013-11-13 03:22:29.000000000 +0000
 ++++ lib/include/vm_basic_asm.h	2013-11-13 03:24:26.000000000 +0000
 +@@ -208,7 +208,7 @@
 + GetCallerEFlags(void)
 + {
 +    unsigned long flags;
 +-   asm volatile("pushf; pop %0" : "=r"(flags));
 ++   __asm__ volatile("pushf; pop %0" : "=r"(flags));
 +    return flags;
 + }
 + 
 
 Modified: head/emulators/open-vm-tools/files/patch-vmmemctl-os.c
 ==============================================================================
 --- head/emulators/open-vm-tools/files/patch-vmmemctl-os.c	Sat Nov 16 22:35:22 2013	(r334035)
 +++ head/emulators/open-vm-tools/files/patch-vmmemctl-os.c	Sat Nov 16 23:22:22 2013	(r334036)
 @@ -1,5 +1,5 @@
 ---- modules/freebsd/vmmemctl/os.c.orig	2011-09-21 20:25:15.000000000 +0200
 -+++ modules/freebsd/vmmemctl/os.c	2013-10-19 11:01:27.000000000 +0200
 +--- modules/freebsd/vmmemctl/os.c.orig	2013-09-23 15:51:10.000000000 +0000
 ++++ modules/freebsd/vmmemctl/os.c	2013-11-16 19:55:06.152925027 +0000
  @@ -37,9 +37,11 @@
   #include <sys/param.h>
   #include <sys/systm.h>
 @@ -12,7 +12,33 @@
   #include <sys/sysctl.h>
   
   #include <vm/vm.h>
 -@@ -264,14 +266,23 @@
 +@@ -295,7 +297,13 @@
 + Mapping
 + OS_MapPageHandle(PageHandle handle)     // IN
 + {
 ++
 ++#if __FreeBSD_version >= 1000042
 ++   vm_offset_t res = kva_alloc(PAGE_SIZE);
 ++#else
 +    vm_offset_t res = kmem_alloc_nofault(kernel_map, PAGE_SIZE);
 ++#endif
 ++
 +    vm_page_t page = (vm_page_t)handle;
 + 
 +    if (!res) {
 +@@ -352,7 +360,11 @@
 + OS_UnmapPage(Mapping mapping)           // IN
 + {
 +    pmap_qremove((vm_offset_t)mapping, 1);
 ++#if __FreeBSD_version >= 1000042
 ++   kva_free((vm_offset_t)mapping, PAGE_SIZE);
 ++#else
 +    kmem_free(kernel_map, (vm_offset_t)mapping, PAGE_SIZE);
 ++#endif
 + }
 + 
 + 
 +@@ -369,14 +381,23 @@
      p->size = (p->size + sizeof(unsigned long) - 1) & 
                            ~(sizeof(unsigned long) - 1);
   
 @@ -29,14 +55,14 @@
   os_pmap_free(os_pmap *p) // IN
   {
  +#if __FreeBSD_version >= 1000042
 -+   kmem_free(kernel_arena, (vm_offset_t)p->bitmap, p->size);
 ++   kva_free((vm_offset_t)p->bitmap, p->size);
  +#else
      kmem_free(kernel_map, (vm_offset_t)p->bitmap, p->size);
  +#endif
      p->size = 0;
      p->bitmap = NULL;
   }
 -@@ -344,12 +355,31 @@
 +@@ -449,12 +470,31 @@
      os_state *state = &global_state;
      os_pmap *pmap = &state->pmap;
   
 @@ -73,7 +99,7 @@
   }
   
   
 -@@ -361,8 +391,19 @@
 +@@ -466,8 +506,19 @@
      os_state *state = &global_state;
      os_pmap *pmap = &state->pmap;
   
 @@ -93,7 +119,7 @@
         return NULL;
      }
   
 -@@ -383,6 +424,11 @@
 +@@ -488,6 +539,11 @@
      if (!page) {
         os_pmap_putindex(pmap, pindex);
      }
 
 Modified: head/emulators/open-vm-tools/pkg-plist
 ==============================================================================
 --- head/emulators/open-vm-tools/pkg-plist	Sat Nov 16 22:35:22 2013	(r334035)
 +++ head/emulators/open-vm-tools/pkg-plist	Sat Nov 16 23:22:22 2013	(r334036)
 @@ -4,7 +4,7 @@ bin/vmware-rpctool
  bin/vmware-xferlogs
  bin/vmtoolsd
  bin/vmware-toolbox-cmd
 -%%FUSE%%bin/vmware-vmblock-fuse
 +%%X11%%%%FUSE%%bin/vmware-vmblock-fuse
  lib/open-vm-tools/plugins/vmsvc/libguestInfo.so
  lib/open-vm-tools/plugins/vmsvc/libpowerOps.so
  lib/open-vm-tools/plugins/vmsvc/libtimeSync.so
 _______________________________________________
 svn-ports-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-ports-all
 To unsubscribe, send any mail to "svn-ports-all-unsubscribe@freebsd.org"
 
>Unformatted:
