From 33b9356402d003150fb3c2955035937e4776b768 Mon Sep 17 00:00:00 2001
From: wiz <wiz>
Date: Wed, 14 Aug 2013 20:17:08 +0000
Subject: Add option for gtk3. Rename "gtk" option to gtk2. Change default from
 gtk to gtk3.

Correct a comment while here.

Bump PKGREVISION.
---
 editors/emacs24/Makefile   |  4 ++--
 editors/emacs24/options.mk | 30 ++++++++++++++++++++----------
 2 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/editors/emacs24/Makefile b/editors/emacs24/Makefile
index 01137f0da55..c1d94ff8996 100644
--- a/editors/emacs24/Makefile
+++ b/editors/emacs24/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2013/07/05 13:33:40 ryoon Exp $
+# $NetBSD: Makefile,v 1.19 2013/08/14 20:17:08 wiz Exp $
 
 CONFLICTS+=	emacs24-nox11-[0-9]*
-PKGREVISION=	4
+PKGREVISION=	5
 
 .include "../../editors/emacs24/Makefile.common"
 
diff --git a/editors/emacs24/options.mk b/editors/emacs24/options.mk
index d9ab5b538a6..534e5d7f3ab 100644
--- a/editors/emacs24/options.mk
+++ b/editors/emacs24/options.mk
@@ -1,14 +1,16 @@
-# $NetBSD: options.mk,v 1.1 2012/06/16 21:03:42 dholland Exp $
-#
+# $NetBSD: options.mk,v 1.2 2013/08/14 20:17:08 wiz Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.emacs
 PKG_SUPPORTED_OPTIONS=	dbus xft2 svg
 PKG_OPTIONS_OPTIONAL_GROUPS+= window-system
 PKG_OPTIONS_GROUP.window-system= x11 nextstep
 PKG_OPTIONS_OPTIONAL_GROUPS+= toolkit
-PKG_OPTIONS_GROUP.toolkit= gtk motif xaw
+PKG_OPTIONS_GROUP.toolkit= gtk2 gtk3 motif xaw
 PKG_SUGGESTED_OPTIONS=	dbus svg x11 xft2
 
+# remove after pkgsrc-2013Q4
+PKG_OPTIONS_LEGACY_OPTS=	gtk:gtk2
+
 .include "../../mk/bsd.options.mk"
 
 ###
@@ -32,18 +34,18 @@ CONFIGURE_ARGS+=	--without-rsvg
 ###
 ### Any of the "toolkit" options with no window-system option implies "x11"
 ###
-.if !empty(PKG_OPTIONS:Mgtk) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mxft2)
+.if !empty(PKG_OPTIONS:Mgtk2) || !empty(PKG_OPTIONS:Mgtk3) || !empty(PKG_OPTIONS:Mmotif) || !empty(PKG_OPTIONS:Mxaw) || !empty(PKG_OPTIONS:Mxft2)
 .  if empty(PKG_OPTIONS:Mx11) && empty(PKG_OPTIONS:Mnextstep)
 PKG_OPTIONS+=		x11
 .  endif
 .endif
 
 ###
-### Default to using the Xaw X11 toolkit if none is specified.
+### Default to using GTK if none is specified.
 ###
 .if !empty(PKG_OPTIONS:Mx11)
-.  if empty(PKG_OPTIONS:Mgtk) && empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
-PKG_OPTIONS+=		gtk
+.  if empty(PKG_OPTIONS:Mgtk2) && empty(PKG_OPTIONS:Mgtk3) && empty(PKG_OPTIONS:Mmotif) && empty(PKG_OPTIONS:Mxaw)
+PKG_OPTIONS+=		gtk3
 .  endif
 .endif
 
@@ -80,12 +82,20 @@ CONFIGURE_ARGS+=	--without-xft --without-otf --without-m17n-flt
 .  endif
 
 ###
-### Support using GTK X11 widgets.
+### Support using GTK3 X11 widgets.
+###
+.  if !empty(PKG_OPTIONS:Mgtk3)
+USE_TOOLS+=		pkg-config
+.include "../../x11/gtk3/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-x-toolkit=gtk3
+
+###
+### Support using GTK2 X11 widgets.
 ###
-.  if !empty(PKG_OPTIONS:Mgtk)
+.  elif !empty(PKG_OPTIONS:Mgtk2)
 USE_TOOLS+=		pkg-config
 .include "../../x11/gtk2/buildlink3.mk"
-CONFIGURE_ARGS+=	--with-x-toolkit=gtk
+CONFIGURE_ARGS+=	--with-x-toolkit=gtk2
 
 ###
 ### Support using Motif X11 widgets.
-- 
cgit v1.2.3