From owner-svn-ports-head@FreeBSD.ORG Sat Nov 16 14:18:55 2013 Return-Path: Delivered-To: svn-ports-head@freebsd.org 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 824DA39F; Sat, 16 Nov 2013 14:18:55 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 707B9233E; Sat, 16 Nov 2013 14:18:55 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rAGEIt51031789; Sat, 16 Nov 2013 14:18:55 GMT (envelope-from swills@svn.freebsd.org) Received: (from swills@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rAGEIt15031787; Sat, 16 Nov 2013 14:18:55 GMT (envelope-from swills@svn.freebsd.org) Message-Id: <201311161418.rAGEIt15031787@svn.freebsd.org> From: Steve Wills Date: Sat, 16 Nov 2013 14:18:55 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r333999 - head/emulators/open-vm-tools X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 16 Nov 2013 14:18:55 -0000 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 -.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 .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