Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 3 Jul 2014 16:05:43 +0000 (UTC)
From:      Adam Weinberger <adamw@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r360393 - head/devel/libdbusmenu
Message-ID:  <201407031605.s63G5hHk033466@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407031605.s63G5hHk033466>