From owner-svn-ports-head@freebsd.org  Sun Aug  9 15:51:34 2015
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5819E99D159;
 Sun,  9 Aug 2015 15:51:34 +0000 (UTC)
 (envelope-from olivierd@FreeBSD.org)
Received: from repo.freebsd.org (repo.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 47F5B171A;
 Sun,  9 Aug 2015 15:51:34 +0000 (UTC)
 (envelope-from olivierd@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.70])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id t79FpYTB001789;
 Sun, 9 Aug 2015 15:51:34 GMT (envelope-from olivierd@FreeBSD.org)
Received: (from olivierd@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t79FpYbH001788;
 Sun, 9 Aug 2015 15:51:34 GMT (envelope-from olivierd@FreeBSD.org)
Message-Id: <201508091551.t79FpYbH001788@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: olivierd set sender to
 olivierd@FreeBSD.org using -f
From: Olivier Duchateau <olivierd@FreeBSD.org>
Date: Sun, 9 Aug 2015 15:51:34 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r393797 - head/x11/xfce4-taskmanager
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.20
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: Sun, 09 Aug 2015 15:51:34 -0000

Author: olivierd
Date: Sun Aug  9 15:51:33 2015
New Revision: 393797
URL: https://svnweb.freebsd.org/changeset/ports/393797

Log:
  Rewrite options helper
  
  Obtained from:	Xfce devel repo

Modified:
  head/x11/xfce4-taskmanager/Makefile

Modified: head/x11/xfce4-taskmanager/Makefile
==============================================================================
--- head/x11/xfce4-taskmanager/Makefile	Sun Aug  9 15:45:51 2015	(r393796)
+++ head/x11/xfce4-taskmanager/Makefile	Sun Aug  9 15:51:33 2015	(r393797)
@@ -16,20 +16,17 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
 USES=		gettext gmake pkgconfig tar:bzip2
-USE_GNOME=	glib20 cairo intltool intlhack
+USE_GNOME=	gtk20 glib20 cairo intltool intlhack
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-OPTIONS_SINGLE=	GTK
-OPTIONS_SINGLE_GTK=	GTK2 GTK3
-OPTIONS_DEFAULT=	GTK2
-
-GTK2_USE=		GNOME=gtk20,libwnck
-GTK2_CONFIGURE_ON=	--enable-wnck --disable-wnck3
-GTK3_USE=		GNOME=gtk20,gtk30,libwnck3
+OPTIONS_DEFINE=	GTK3
+GTK3_USE=	gnome=gtk30,libwnck3
 GTK3_CONFIGURE_ON=	--enable-gtk3 --enable-wnck3 --disable-wnck
+GTK3_USE_OFF=	gnome=libwnck
+GTK3_CONFIGURE_OFF=	--enable-wnck --disable-wnck3
 
-CONFIGURE_ARGS=	--disable-gksu
+CONFIGURE_ARGS+=	--disable-gksu
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|prefix)/$$(DATADIRNAME)|datadir)|' \