From owner-svn-ports-head@FreeBSD.ORG  Thu Jul  3 16:09:40 2014
Return-Path: <owner-svn-ports-head@FreeBSD.ORG>
Delivered-To: svn-ports-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id A081F3CB;
 Thu,  3 Jul 2014 16:09:40 +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))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 8DEA02954;
 Thu,  3 Jul 2014 16:09:40 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63G9enn034539;
 Thu, 3 Jul 2014 16:09:40 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63G9eKO034538;
 Thu, 3 Jul 2014 16:09:40 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407031609.s63G9eKO034538@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 3 Jul 2014 16:09:40 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360397 - head/x11-wm/plank
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.18
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Jul 2014 16:09:40 -0000

Author: adamw
Date: Thu Jul  3 16:09:40 2014
New Revision: 360397
URL: http://svnweb.freebsd.org/changeset/ports/360397
QAT: https://qat.redports.org/buildarchive/r360397/

Log:
  Avoid unnecessary bsd.port.options.mk inclusion by using
  OPTIONS helpers.
  
  Approved by:	portmgr (blanket)

Modified:
  head/x11-wm/plank/Makefile

Modified: head/x11-wm/plank/Makefile
==============================================================================
--- head/x11-wm/plank/Makefile	Thu Jul  3 16:09:21 2014	(r360396)
+++ head/x11-wm/plank/Makefile	Thu Jul  3 16:09:40 2014	(r360397)
@@ -22,6 +22,7 @@ GNU_CONFIGURE=	yes
 USE_GNOME=	glib20 gtk30 gdkpixbuf2 libxml2 libwnck3
 USE_XORG=	x11
 INSTALLS_ICONS=	yes
+OPTIONS_SUB=	yes
 
 OPTIONS_DEFINE=	NLS DBUSMENU
 DBUSMENU_DESC=	DBusMenu protocol
@@ -30,23 +31,10 @@ CONFIGURE_ARGS=	--enable-gee-0.8 \
 	--disable-benchmark \
 	--disable-headless-tests
 
-.include <bsd.port.options.mk>
+NLS_USES=		gettext
+NLS_CONFIGURE_ENABLE=	nls
 
-.if ${PORT_OPTIONS:MNLS}
-USES+=	gettext
-CONFIGURE_ARGS+=--enable-nls
-PLIST_SUB+=	NLS=""
-.else
-CONFIGURE_ARGS+=--disable-nls
-PLIST_SUB+=	NLS="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MDBUSMENU}
-# Need GTK3 support
-LIB_DEPENDS+=	libdbusmenu-gtk3.so:${PORTSDIR}/devel/libdbusmenu
-CONFIGURE_ARGS+=--enable-dbusmenu
-.else
-CONFIGURE_ARGS+=--disable-dbusmenu
-.endif
+DBUSMENU_LIB_DEPENDS=		libdbusmenu-gtk3.so:${PORTSDIR}/devel/libdbusmenu
+DBUSMENU_CONFIGURE_ENABLE=	dbusmenu
 
 .include <bsd.port.mk>