Date: Thu, 21 Mar 2013 15:56:54 -0700 (PDT) From: William Grzybowski <william88@gmail.com> To: FreeBSD-gnats-submit@freebsd.org Subject: ports/177213: [PATCH] emulators/open-vm-tools: options ng Message-ID: <514b9036.4888ec0a.052c.4180@mx.google.com> Resent-Message-ID: <201303212300.r2LN00eZ088985@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 177213
>Category: ports
>Synopsis: [PATCH] emulators/open-vm-tools: options ng
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: update
>Submitter-Id: current-users
>Arrival-Date: Thu Mar 21 23:00:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: William Grzybowski
>Release: FreeBSD 9.1-RELEASE amd64
>Organization:
>Environment:
>Description:
Convert to options ng
>How-To-Repeat:
>Fix:
See attached patch
--- open-vm-tools.patch begins here ---
Index: Makefile
===================================================================
--- Makefile (revision 314859)
+++ Makefile (working copy)
@@ -24,22 +24,29 @@
USE_PKGCONFIG= build
CPPFLAGS+= -Wno-deprecated-declarations
+OPTIONS_DEFINE= X11 NOTIFY UNITY FUSE DNET ICU
+OPTIONS_DEFAULT=X11 NOTIFY FUSE DNET ICU
+
+DNET_DESC= libdnet support
+
+.include <bsd.port.options.mk>
+
CONFIGURE_ARGS+= --without-procps --sysconfdir=${LOCALBASE}/etc
-.if defined(WITHOUT_X11)
+.if ! ${PORT_OPTIONS:MX11}
LIB_DEPENDS+= glib-2.0:${PORTSDIR}/devel/glib20
CONFIGURE_ARGS+= --without-x --without-gtk2 --without-gtkmm
PLIST_SUB+= X11="@comment "
CONFLICTS= open-vm-tools-[0-9]*
.else
-.if !defined(WITHOUT_LIBNOTIFY)
+. if ${PORT_OPTIONS:MNOTIFY}
LIB_DEPENDS+= notify.4:${PORTSDIR}/devel/libnotify
-.endif
-.if defined(WITH_UNITY)
+. endif
+. if ${PORT_OPTIONS:MUNITY}
CONFIGURE_ENV+= CUSTOM_URIPARSER_CPPFLAGS="-I${LOCALBASE}/include/uriparser"
LIB_DEPENDS+= uriparser.1:${PORTSDIR}/net/uriparser
-.else
+. else
CONFIGURE_ARGS+= --disable-unity
-.endif
+. endif
LIB_DEPENDS+= gtkmm-2.4:${PORTSDIR}/x11-toolkits/gtkmm24
CONFIGURE_ARGS+= --with-x
LDFLAGS+= -L${LOCALBASE}/lib
@@ -50,7 +57,7 @@
CONFLICTS= open-vm-tools-nox11-[0-9]*
.endif
-.if !defined(WITHOUT_FUSE)
+.if ${PORT_OPTIONS:MFUSE}
USES= fuse
PLIST_SUB+= FUSE=""
.else
@@ -60,16 +67,16 @@
CONFLICTS+= vmware-guestd[0-9]* vmware-tools[0-9]*
SUB_FILES= pkg-message
-.if defined(WITHOUT_DNET)
+.if ${PORT_OPTIONS:MDNET}
+LIB_DEPENDS+= dnet:${PORTSDIR}/net/libdnet
+.else
CONFIGURE_ARGS+= --without-dnet
-.else
-LIB_DEPENDS+= dnet:${PORTSDIR}/net/libdnet
.endif
-.if defined(WITHOUT_ICU)
+.if ${PORT_OPTIONS:MICU}
+LIB_DEPENDS+= icuuc:${PORTSDIR}/devel/icu
+.else
CONFIGURE_ARGS+= --without-icu
-.else
-LIB_DEPENDS+= icuuc:${PORTSDIR}/devel/icu
.endif
USE_RC_SUBR= vmware-guestd vmware-kmod
--- open-vm-tools.patch ends here ---
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?514b9036.4888ec0a.052c.4180>