From owner-svn-ports-all@FreeBSD.ORG  Thu Jul  3 16:05:43 2014
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@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 9A249E36;
 Thu,  3 Jul 2014 16:05:43 +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 8784C28DE;
 Thu,  3 Jul 2014 16:05:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s63G5hRA033467;
 Thu, 3 Jul 2014 16:05:43 GMT (envelope-from adamw@svn.freebsd.org)
Received: (from adamw@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s63G5hHk033466;
 Thu, 3 Jul 2014 16:05:43 GMT (envelope-from adamw@svn.freebsd.org)
Message-Id: <201407031605.s63G5hHk033466@svn.freebsd.org>
From: Adam Weinberger <adamw@FreeBSD.org>
Date: Thu, 3 Jul 2014 16:05:43 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r360393 - head/devel/libdbusmenu
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 03 Jul 2014 16:05:43 -0000

Author: adamw
Date: Thu Jul  3 16:05:42 2014
New Revision: 360393
URL: http://svnweb.freebsd.org/changeset/ports/360393
QAT: https://qat.redports.org/buildarchive/r360393/

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

Modified:
  head/devel/libdbusmenu/Makefile

Modified: head/devel/libdbusmenu/Makefile
==============================================================================
--- head/devel/libdbusmenu/Makefile	Thu Jul  3 16:03:50 2014	(r360392)
+++ head/devel/libdbusmenu/Makefile	Thu Jul  3 16:05:42 2014	(r360393)
@@ -26,6 +26,7 @@ USE_XORG=	x11
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	VERSION="0.4"
+OPTIONS_SUB=	yes
 
 OPTIONS_SINGLE=	GTK
 OPTIONS_SINGLE_GTK=	GTK2 GTK3
@@ -39,22 +40,13 @@ CONFIGURE_ARGS=	--disable-scrollkeeper \
 	--disable-nls \
 	--enable-vala \
 	--without-omf-dir \
-	--without-help-dir
+	--without-help-dir \
+	--enable-gtk
 
-.include <bsd.port.options.mk>
+GTK2_USE=		GNOME=gtk20
+GTK2_CONFIGURE_ON=	--with-gtk=2
 
-.if ${PORT_OPTIONS:MGTK2}
-USE_GNOME+=	gtk20
-CONFIGURE_ARGS+=--enable-gtk --with-gtk=2
-PLIST_SUB+=	GTK2=""
-PLIST_SUB+=	GTK3="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MGTK3}
-USE_GNOME+=	gtk30
-CONFIGURE_ARGS+=--enable-gtk --with-gtk=3
-PLIST_SUB+=	GTK2="@comment "
-PLIST_SUB+=	GTK3=""
-.endif
+GTK3_USE=		GNOME=gtk30
+GTK3_CONFIGURE_ON=	--with-gtk=3
 
 .include <bsd.port.mk>