Import of pkgsrc-2014Q1

sysutils/open-vm-tools/Makefile

@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.40 2013/06/06 12:55:05 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2014/02/12 23:18:40 tron Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
-PKGREVISION=	31
+PKGREVISION=	35
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-vm-tools/}
 

sysutils/open-vm-tools/PLIST.common

@@ -1,11 +1,10 @@
-@comment $NetBSD: PLIST.common,v 1.1 2008/08/31 06:36:47 scottr Exp $
+@comment $NetBSD: PLIST.common,v 1.2 2014/03/11 14:05:15 jperkin Exp $
 bin/vmware-checkvm
 bin/vmware-hgfsclient
 bin/vmware-toolbox-cmd
 bin/vmware-xferlogs
 lib/libguestlib.la
 sbin/vmware-guestd
-share/examples/rc.d/vmtools
 share/examples/vmware-tools/poweroff-vm-default
 share/examples/vmware-tools/poweron-vm-default
 share/examples/vmware-tools/resume-vm-default

sysutils/open-vm-tools/distinfo

@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2013/04/01 12:25:16 joerg Exp $
+$NetBSD: distinfo,v 1.8 2013/11/11 16:42:38 joerg Exp $
 
 SHA1 (open-vm-tools-2008.08.08-109361.tar.gz) = 1c44c3524cd9cbc5870f1c6065b03a6b31859a25
 RMD160 (open-vm-tools-2008.08.08-109361.tar.gz) = 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411
@@ -52,7 +52,7 @@ SHA1 (patch-bv) = 180df7c4a5fb7544b6d9014f567a4f31e6c2a38d
 SHA1 (patch-bw) = c242890caa3cc720d18eec612aca6e46c69c5b04
 SHA1 (patch-bx) = deeea5eefae750b046d7a9c81679125e26fb82fa
 SHA1 (patch-by) = c6018a330fdabefd3fc60d3e6e6c95bdf4f7f2bc
-SHA1 (patch-checkvm_checkvm.c) = 142e34b40937add51db4f2255f47da23402a3720
+SHA1 (patch-checkvm_checkvm.c) = 1da596cf11ccb9af1ba39013775a3a6b3a85345f
 SHA1 (patch-configure.ac) = d39767cc2006088203341782fca7895c2710fd55
 SHA1 (patch-guestd_Makefile.am) = 4855efa62b6633e23c11e3ea184f60f4c6952244
 SHA1 (patch-hgfsclient_Makefile.am) = 3b6adf9e4d88bcce2c191260b669615537927e28

sysutils/open-vm-tools/patches/patch-checkvm_checkvm.c

@@ -1,8 +1,39 @@
-$NetBSD: patch-checkvm_checkvm.c,v 1.1 2012/12/25 21:02:15 joerg Exp $
+$NetBSD: patch-checkvm_checkvm.c,v 1.2 2013/11/11 16:42:38 joerg Exp $
 
 --- checkvm/checkvm.c.orig	2012-12-25 19:48:10.000000000 +0000
 +++ checkvm/checkvm.c
-@@ -77,7 +77,7 @@ getVersion(uint32 *version)
+@@ -46,30 +46,6 @@ VM_EMBED_VERSION(CHECKVM_VERSION_STRING)
+ #ifdef __GNUC__
+ 
+ /*
+- *  outl and inl: Output or input a 32-bit word
+- */
+-static __inline__ void
+-outl(
+-    const uint32 port,
+-    uint32       val
+-)
+-{
+-  __asm__ volatile("out%L0 (%%dx)" : :"a" (val), "d" (port));
+-}
+-
+-static __inline__ uint32
+-inl(
+-    const uint32 port
+-)
+-{
+-  uint32 ret;
+-
+-  __asm__ volatile("in%L0 (%%dx)" : "=a" (ret) : "d" (port));
+-  return ret;
+-}
+-
+-
+-/*
+  *  getVersion  -  Read VM version & product code through backdoor
+  */
+ void
+@@ -77,7 +53,7 @@ getVersion(uint32 *version)
  {
     uint32 eax, ebx, ecx, edx;
     
@@ -11,7 +42,7 @@ $NetBSD: patch-checkvm_checkvm.c,v 1.1 2012/12/25 21:02:15 joerg Exp $
     	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
  		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETVERSION),
  		    "2"(BDOOR_PORT) : "memory");
-@@ -94,7 +94,7 @@ getHWVersion(uint32 *hwVersion)
+@@ -94,7 +70,7 @@ getHWVersion(uint32 *hwVersion)
  {
     uint32 eax, ebx, ecx, edx;
     
@@ -20,7 +51,7 @@ $NetBSD: patch-checkvm_checkvm.c,v 1.1 2012/12/25 21:02:15 joerg Exp $
     	            "=a"(eax), "=c"(ecx), "=d"(edx), "=b"(ebx) :
  		    "0"(BDOOR_MAGIC), "1"(BDOOR_CMD_GETHWVERSION),
  		    "2"(BDOOR_PORT) : "memory");
-@@ -110,7 +110,7 @@ getScreenSize(uint32 *screensize)
+@@ -110,7 +86,7 @@ getScreenSize(uint32 *screensize)
  {
     uint32 eax, ebx, ecx, edx;