From d24bde30b9f2e5e4f658d0fec9c438ea36e621f8 Mon Sep 17 00:00:00 2001
From: bjs <bjs@pkgsrc.org>
Date: Fri, 5 Sep 2008 04:34:46 +0000
Subject: Change == -> = to appease the portability check (in configure). Also,
 define FMTTIME to PRId32 on NetBSD to fix build on NetBSD/amd64.

---
 sysutils/open-vm-tools/Makefile         |  3 ++-
 sysutils/open-vm-tools/distinfo         |  6 +++---
 sysutils/open-vm-tools/patches/patch-aa | 13 +++++++++++--
 sysutils/open-vm-tools/patches/patch-ax | 13 +++++++++++--
 4 files changed, 27 insertions(+), 8 deletions(-)

(limited to 'sysutils')

diff --git a/sysutils/open-vm-tools/Makefile b/sysutils/open-vm-tools/Makefile
index 6e3330b4534..a507ec9f47c 100644
--- a/sysutils/open-vm-tools/Makefile
+++ b/sysutils/open-vm-tools/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.6 2008/08/31 06:36:47 scottr Exp $
+# $NetBSD: Makefile,v 1.7 2008/09/05 04:34:46 bjs Exp $
 
 DISTNAME=	open-vm-tools-2008.08.08-109361
 PKGNAME=	open-vm-tools-2008.08.08.109361
+PKGREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=open-vm-tools/}
 
diff --git a/sysutils/open-vm-tools/distinfo b/sysutils/open-vm-tools/distinfo
index d64b849c843..c773040b0ef 100644
--- a/sysutils/open-vm-tools/distinfo
+++ b/sysutils/open-vm-tools/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2008/08/31 06:36:47 scottr Exp $
+$NetBSD: distinfo,v 1.3 2008/09/05 04:34:46 bjs Exp $
 
 SHA1 (open-vm-tools-2008.08.08-109361.tar.gz) = 1c44c3524cd9cbc5870f1c6065b03a6b31859a25
 RMD160 (open-vm-tools-2008.08.08-109361.tar.gz) = 4ea0a6aa2edda2bc404c865dc5b58f3a177ae411
 Size (open-vm-tools-2008.08.08-109361.tar.gz) = 2971141 bytes
-SHA1 (patch-aa) = 2905e5340f371a5585ce867b29c7d65632a2ee68
+SHA1 (patch-aa) = 113fdbeafe3131558167fb6c4abc9c44786d420b
 SHA1 (patch-ab) = 66ab38809e1ab7b1b0dfd51b88d93a8f0faa2fad
 SHA1 (patch-ac) = bb3bd4900d7fe64cb2bf79c3680a0dfac753bc95
 SHA1 (patch-ad) = dbb64d3c063f9bf89483dd1d3c945d4502cefc2d
@@ -26,7 +26,7 @@ SHA1 (patch-at) = 659b97c50168fa74f3e6a8ffe2bafae0420f0d49
 SHA1 (patch-au) = 31eeee4521020952ef51b29351802efd9fe4297f
 SHA1 (patch-av) = b61f165fd9a6e5241795e2e69aa73caba32539a8
 SHA1 (patch-aw) = 82788d7ab312ee07abf3e159028b440d41912a14
-SHA1 (patch-ax) = c2ecb902dc8d8bcbe833f7b8841d4697f8f33d60
+SHA1 (patch-ax) = 4906da20bc5ce40fe273b8cc008381dfdda544fe
 SHA1 (patch-ay) = c9c7a7f9871fdc3213bafce05a7433db862ac4a4
 SHA1 (patch-az) = 2a8494c8cbfb0270a5fdd46e0c5ccaf19fc5f94f
 SHA1 (patch-ba) = cb0433af4a7c5c9a9010edbc15998577c44c92ae
diff --git a/sysutils/open-vm-tools/patches/patch-aa b/sysutils/open-vm-tools/patches/patch-aa
index cf184473f12..215e4d85744 100644
--- a/sysutils/open-vm-tools/patches/patch-aa
+++ b/sysutils/open-vm-tools/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.2 2008/08/31 06:36:47 scottr Exp $
+$NetBSD: patch-aa,v 1.3 2008/09/05 04:34:46 bjs Exp $
 
---- configure.orig	2008-08-08 02:02:06.000000000 -0500
+--- configure.orig	2008-08-08 03:02:06.000000000 -0400
 +++ configure
 @@ -2251,6 +2251,9 @@ case "$host_os" in
     linux*)
@@ -12,3 +12,12 @@ $NetBSD: patch-aa,v 1.2 2008/08/31 06:36:47 scottr Exp $
     freebsd*)
        os="freebsd"
        ;;
+@@ -23967,7 +23970,7 @@ test -n "$DNET_CONFIG" || DNET_CONFIG="n
+ 
+ 		GUESTD_LDADD="$GUESTD_LDADD $DNET_LIBS"
+ 		VMWARE_USER_LDADD="$VMWARE_USER_LDADD $DNET_LIBS"
+-		if test "$DNET_CONFIG" == dumbnet-config; then
++		if test "$DNET_CONFIG" = dumbnet-config; then
+ 
+ cat >>confdefs.h <<\_ACEOF
+ #define DNET_IS_DUMBNET 1
diff --git a/sysutils/open-vm-tools/patches/patch-ax b/sysutils/open-vm-tools/patches/patch-ax
index 48a4c640c5d..b20dce0143f 100644
--- a/sysutils/open-vm-tools/patches/patch-ax
+++ b/sysutils/open-vm-tools/patches/patch-ax
@@ -1,6 +1,6 @@
-$NetBSD: patch-ax,v 1.2 2008/08/31 06:36:48 scottr Exp $
+$NetBSD: patch-ax,v 1.3 2008/09/05 04:34:46 bjs Exp $
 
---- lib/include/vm_basic_types.h.orig	2008-08-08 02:01:52.000000000 -0500
+--- lib/include/vm_basic_types.h.orig	2008-08-08 03:01:52.000000000 -0400
 +++ lib/include/vm_basic_types.h
 @@ -41,7 +41,7 @@
  #include "includeCheck.h"
@@ -39,3 +39,12 @@ $NetBSD: patch-ax,v 1.2 2008/08/31 06:36:48 scottr Exp $
  #   ifdef _BSD_SIZE_T_
  #      undef _BSD_SIZE_T_
  #      ifdef VM_I386
+@@ -825,6 +826,8 @@ typedef void * UserVA;
+  */
+ #if defined(__FreeBSD__) && (__FreeBSD__ + 0) && ((__FreeBSD__ + 0) >= 5)
+ #   define FMTTIME FMTSZ"d"
++#elif defined (__NetBSD__)
++#   define FMTTIME PRId32
+ #else
+ #   define FMTTIME "ld"
+ #endif
-- 
cgit v1.2.3