Mon Feb 20 09:19:27 2017 UTC ()
Fix no-x11 option and add option to disable icu. Bump rev.


(tnn)
diff -r1.67 -r1.68 pkgsrc/sysutils/open-vm-tools/Makefile
diff -r1.4 -r1.5 pkgsrc/sysutils/open-vm-tools/options.mk
cvs diff -r1.67 -r1.68 pkgsrc/sysutils/open-vm-tools/Makefile (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/Makefile 2017/02/12 06:26:01 1.67
+++ pkgsrc/sysutils/open-vm-tools/Makefile 2017/02/20 09:19:27 1.68
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.67 2017/02/12 06:26:01 ryoon Exp $ 1# $NetBSD: Makefile,v 1.68 2017/02/20 09:19:27 tnn Exp $
2 2
3DISTNAME= open-vm-tools-10.1.0-4449150 3DISTNAME= open-vm-tools-10.1.0-4449150
4PKGNAME= open-vm-tools-10.1.0 4PKGNAME= open-vm-tools-10.1.0
5PKGREVISION= 2 5PKGREVISION= 3
6CATEGORIES= sysutils 6CATEGORIES= sysutils
7MASTER_SITES= https://github.com/vmware/open-vm-tools/files/590760/ 7MASTER_SITES= https://github.com/vmware/open-vm-tools/files/590760/
8 8
9MAINTAINER= agc@NetBSD.org 9MAINTAINER= agc@NetBSD.org
10HOMEPAGE= https://github.com/vmware/open-vm-tools 10HOMEPAGE= https://github.com/vmware/open-vm-tools
11COMMENT= Open source VMware tools 11COMMENT= Open source VMware tools
12LICENSE= gnu-lgpl-v2.1 12LICENSE= gnu-lgpl-v2.1
13 13
14ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64 14ONLY_FOR_PLATFORM= NetBSD-*-i386 NetBSD-*-x86_64
15 15
16WRKSRC= ${WRKDIR}/${DISTNAME}/open-vm-tools 16WRKSRC= ${WRKDIR}/${DISTNAME}/open-vm-tools
17 17
18GCC_REQD+= 4.8 18GCC_REQD+= 4.8
@@ -57,19 +57,17 @@ pre-configure: @@ -57,19 +57,17 @@ pre-configure:
57_WRAP_EXTRA_ARGS.CC+= -Wno-error=unused-local-typedef 57_WRAP_EXTRA_ARGS.CC+= -Wno-error=unused-local-typedef
58CWRAPPERS_APPEND.cc+= -Wno-error=unused-local-typedef 58CWRAPPERS_APPEND.cc+= -Wno-error=unused-local-typedef
59.elif !empty(PKGSRC_COMPILER:Mgcc) && empty(CC_VERSION:U:Mgcc-[1-3].*) && empty(CC_VERSION:U:Mgcc-4.[0-7]*) 59.elif !empty(PKGSRC_COMPILER:Mgcc) && empty(CC_VERSION:U:Mgcc-[1-3].*) && empty(CC_VERSION:U:Mgcc-4.[0-7]*)
60_WRAP_EXTRA_ARGS.CC+= -Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable 60_WRAP_EXTRA_ARGS.CC+= -Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable
61CWRAPPERS_APPEND.cc+= -Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable 61CWRAPPERS_APPEND.cc+= -Wno-error=unused-local-typedefs -Wno-error=unused-but-set-variable
62.endif 62.endif
63 63
64.include "../../archivers/libmspack/buildlink3.mk" 64.include "../../archivers/libmspack/buildlink3.mk"
65.include "../../devel/glib2/buildlink3.mk" 65.include "../../devel/glib2/buildlink3.mk"
66.include "../../mk/fuse.buildlink3.mk" 66.include "../../mk/fuse.buildlink3.mk"
67.include "../../net/libdnet/buildlink3.mk" 67.include "../../net/libdnet/buildlink3.mk"
68.include "../../security/openssl/buildlink3.mk" 68.include "../../security/openssl/buildlink3.mk"
69.include "../../security/xml-security-c/buildlink3.mk" 69.include "../../security/xml-security-c/buildlink3.mk"
70.include "../../textproc/icu/buildlink3.mk" 
71.include "../../x11/libXtst/buildlink3.mk" 
72 70
73.include "options.mk" 71.include "options.mk"
74 72
75.include "../../mk/bsd.pkg.mk" 73.include "../../mk/bsd.pkg.mk"
cvs diff -r1.4 -r1.5 pkgsrc/sysutils/open-vm-tools/options.mk (expand / switch to unified diff)

--- pkgsrc/sysutils/open-vm-tools/options.mk 2016/11/21 00:14:16 1.4
+++ pkgsrc/sysutils/open-vm-tools/options.mk 2017/02/20 09:19:27 1.5
@@ -1,17 +1,24 @@ @@ -1,17 +1,24 @@
1# $NetBSD: options.mk,v 1.4 2016/11/21 00:14:16 pho Exp $ 1# $NetBSD: options.mk,v 1.5 2017/02/20 09:19:27 tnn Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.open-vm-tools 3PKG_OPTIONS_VAR= PKG_OPTIONS.open-vm-tools
4PKG_SUPPORTED_OPTIONS= x11 4PKG_SUPPORTED_OPTIONS= icu x11
5PKG_SUGGESTED_OPTIONS= x11 5PKG_SUGGESTED_OPTIONS= icu x11
6 6
7.include "../../mk/bsd.options.mk" 7.include "../../mk/bsd.options.mk"
8 8
 9.if !empty(PKG_OPTIONS:Micu)
 10.include "../../textproc/icu/buildlink3.mk"
 11.else
 12CONFIGURE_ARGS+= --without-icu
 13.endif
 14
9.if !empty(PKG_OPTIONS:Mx11) 15.if !empty(PKG_OPTIONS:Mx11)
10PLIST_SRC+= PLIST.x11 16PLIST_SRC+= PLIST.x11
11MESSAGE_SRC+= MESSAGE.x11 17MESSAGE_SRC+= MESSAGE.x11
12. include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk" 18. include "../../graphics/gdk-pixbuf2-xlib/buildlink3.mk"
13. include "../../x11/gtkmm/buildlink3.mk" 
14. include "../../sysutils/desktop-file-utils/desktopdb.mk" 19. include "../../sysutils/desktop-file-utils/desktopdb.mk"
 20. include "../../x11/gtkmm/buildlink3.mk"
 21. include "../../x11/libXtst/buildlink3.mk"
15.else 22.else
16CONFIGURE_ARGS+= --without-x 23CONFIGURE_ARGS+= --without-x
17.endif 24.endif