CVS commit: pkgsrc/sysutils/open-vm-tools

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Mon Feb 20 09:19:27 UTC 2017

Modified Files:
        pkgsrc/sysutils/open-vm-tools: Makefile options.mk

Log Message:
Fix no-x11 option and add option to disable icu. Bump rev.


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/sysutils/open-vm-tools/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/sysutils/open-vm-tools/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/open-vm-tools/Makefile
diff -u pkgsrc/sysutils/open-vm-tools/Makefile:1.67 pkgsrc/sysutils/open-vm-tools/Makefile:1.68
--- pkgsrc/sysutils/open-vm-tools/Makefile:1.67 Sun Feb 12 06:26:01 2017
+++ pkgsrc/sysutils/open-vm-tools/Makefile      Mon Feb 20 09:19:27 2017
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.67 2017/02/12 06:26:01 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2017/02/20 09:19:27 tnn Exp $
 
 DISTNAME=      open-vm-tools-10.1.0-4449150
 PKGNAME=       open-vm-tools-10.1.0
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    sysutils
 MASTER_SITES=  https://github.com/vmware/open-vm-tools/files/590760/
 
@@ -67,8 +67,6 @@ CWRAPPERS_APPEND.cc+= -Wno-error=unused-
 .include "../../net/libdnet/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../security/xml-security-c/buildlink3.mk"
-.include "../../textproc/icu/buildlink3.mk"
-.include "../../x11/libXtst/buildlink3.mk"
 
 .include "options.mk"
 

Index: pkgsrc/sysutils/open-vm-tools/options.mk
diff -u pkgsrc/sysutils/open-vm-tools/options.mk:1.4 pkgsrc/sysutils/open-vm-tools/options.mk:1.5
--- pkgsrc/sysutils/open-vm-tools/options.mk:1.4        Mon Nov 21 00:14:16 2016
+++ pkgsrc/sysutils/open-vm-tools/options.mk    Mon Feb 20 09:19:27 2017
@@ -1,17 +1,24 @@
-# $NetBSD: options.mk,v 1.4 2016/11/21 00:14:16 pho Exp $
+# $NetBSD: options.mk,v 1.5 2017/02/20 09:19:27 tnn Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.open-vm-tools
-PKG_SUPPORTED_OPTIONS= x11
-PKG_SUGGESTED_OPTIONS= x11
+PKG_SUPPORTED_OPTIONS= icu x11
+PKG_SUGGESTED_OPTIONS= icu x11
 
 .include "../../mk/bsd.options.mk"
 
+.if !empty(PKG_OPTIONS:Micu)
+.include "../../textproc/icu/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=               --without-icu
+.endif
+
 .if !empty(PKG_OPTIONS:Mx11)
 PLIST_SRC+=    PLIST.x11
 MESSAGE_SRC+=  MESSAGE.x11
 .  include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
-.  include "../../x11/gtkmm/buildlink3.mk"
 .  include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.  include "../../x11/gtkmm/buildlink3.mk"
+.  include "../../x11/libXtst/buildlink3.mk"
 .else
 CONFIGURE_ARGS+=               --without-x
 .endif