Update to 3.6.1.

Convert to optionsNG.
Special note that this version now needs at-spi2-atk, which conflicts
with at-spi as used by orca from gnome2.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@17132 df743ca5-7f9a-e211-a948-0013205c9059

4 files changed, 59 insertions, 30 deletions

diff --git a/x11-toolkits/gtk30/Makefile b/x11-toolkits/gtk30/Makefile
index e53d796f4..72ed2c436 100644
--- a/x11-toolkits/gtk30/Makefile
+++ b/x11-toolkits/gtk30/Makefile
@@ -1,13 +1,9 @@
-# New ports collection makefile for:   gtk13
-# Date Created:			28 Sep 1997
-# Whom:				Vanilla I. Shu <vanilla@MinJe.com.TW>
-#
+# Created by: Vanilla I. Shu <vanilla@MinJe.com.TW>
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.47 2012/07/15 21:54:22 kwm Exp $
-#
+#   $MCom: ports/x11-toolkits/gtk30/Makefile,v 1.48 2012/08/27 17:49:26 kwm Exp $
 
 PORTNAME=	gtk
-PORTVERSION=	3.4.4
+PORTVERSION=	3.6.1
 PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
@@ -26,9 +22,11 @@ LATEST_LINK=	gtk30
 
 .if !defined(REFERENCE_PORT)
 
-BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
+BUILD_DEPENDS+=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection \
+		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 RUN_DEPENDS+=	${LOCALBASE}/share/mime/magic:${PORTSDIR}/misc/shared-mime-info \
-		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme
+		${LOCALBASE}/share/icons/hicolor/index.theme:${PORTSDIR}/misc/hicolor-icon-theme \
+		${LOCALBASE}/libdata/pkgconfig/atk-bridge-2.0.pc:${PORTSDIR}/accessibility/at-spi2-atk
 
 USE_GMAKE=	yes
 USE_PERL5_BUILD=yes
@@ -51,17 +49,14 @@ GLIB_SCHEMAS=	org.gtk.Demo.gschema.xml \
 
 MAN1=		gtk-query-immodules-3.0.1
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug=yes
-.endif
-
-OPTIONS=	CUPS "Enable cups printing support" on \
-		COLORD "Enable colord .. support" on
+OPTIONS_DEFINE=	CUPS COLORD DEBUG
+OPTIONS_DEFAULT=CUPS COLORD
+COLORD_DESC=	Color profile support
 
 .include <bsd.port.options.mk>
 
-.if defined(WITH_CUPS)
-LIB_DEPENDS+=	cups.2:${PORTSDIR}/print/cups-client
+.if ${PORT_OPTIONS:MCUPS}
+LIB_DEPENDS+=	cups:${PORTSDIR}/print/cups-client
 CONFIGURE_ARGS+=--enable-cups=auto
 PLIST_SUB+=	CUPS=""
 .else
@@ -69,8 +64,12 @@ CONFIGURE_ARGS+=--disable-cups
 PLIST_SUB+=	CUPS="@comment "
 .endif
 
-.if defined(WITH_COLORD)
-LIB_DEPENDS+=	colord.1:${PORTSDIR}/graphics/colord
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug=yes
+.endif
+
+.if ${PORT_OPTIONS:MCOLORD}
+LIB_DEPENDS+=	colord:${PORTSDIR}/graphics/colord
 CONFIGURE_ARGS+=--enable-colord
 .else
 CONFIGURE_ARGS+=--disable-colord
diff --git a/x11-toolkits/gtk30/distinfo b/x11-toolkits/gtk30/distinfo
index 3ce1f948b..768dfb453 100644
--- a/x11-toolkits/gtk30/distinfo
+++ b/x11-toolkits/gtk30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtk+-3.4.4.tar.xz) = f154e460075034da4c0ce89c320025dcd459da2a1fdf32d92a09522eaca242c7
-SIZE (gnome3/gtk+-3.4.4.tar.xz) = 12854476
+SHA256 (gnome3/gtk+-3.6.1.tar.xz) = fe6c89ae40145b077d7291105e81d4f876be01bf21ddfb9cba449f6be49d7996
+SIZE (gnome3/gtk+-3.6.1.tar.xz) = 13282048
diff --git a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
index 281bb69f5..6eefe2bc7 100644
--- a/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
+++ b/x11-toolkits/gtk30/files/patch-docs_reference_gtk_Makefile.in
@@ -1,12 +1,10 @@
---- docs/reference/gtk/Makefile.in.orig	2011-02-01 22:06:23.000000000 +0000
-+++ docs/reference/gtk/Makefile.in	2011-02-01 22:07:12.000000000 +0000
-@@ -735,8 +735,7 @@ CLEANFILES = $(SCANOBJ_FILES) $(REPORT_F
- 
+--- docs/reference/gtk/Makefile.in.orig	2012-09-25 07:07:36.000000000 +0000
++++ docs/reference/gtk/Makefile.in	2012-09-25 07:08:14.000000000 +0000
+@@ -822,7 +822,6 @@
  ########################################################################
  man_MANS = \
--	gtk-query-immodules-3.0.1	\
--	gtk-update-icon-cache.1
-+	gtk-query-immodules-3.0.1
+ 	gtk-query-immodules-3.0.1	\
+-	gtk-update-icon-cache.1		\
+ 	gtk-launch.1
  
- MAINTAINERCLEANFILES = $(man_MANS) $(BUILT_SOURCES)
- all: all-am
+ @ENABLE_MAN_TRUE@XSLTPROC_FLAGS = \
diff --git a/x11-toolkits/gtk30/pkg-plist b/x11-toolkits/gtk30/pkg-plist
index 983245dda..a7b16ff8a 100644
--- a/x11-toolkits/gtk30/pkg-plist
+++ b/x11-toolkits/gtk30/pkg-plist
@@ -1,3 +1,4 @@
+bin/gtk-launch
 bin/gtk-query-immodules-3.0
 bin/gtk3-demo
 bin/gtk3-demo-application
@@ -173,12 +174,14 @@ include/gtk-3.0/gtk/gtkinfobar.h
 include/gtk-3.0/gtk/gtkinvisible.h
 include/gtk-3.0/gtk/gtklabel.h
 include/gtk-3.0/gtk/gtklayout.h
+include/gtk-3.0/gtk/gtklevelbar.h
 include/gtk-3.0/gtk/gtklinkbutton.h
 include/gtk-3.0/gtk/gtkliststore.h
 include/gtk-3.0/gtk/gtklockbutton.h
 include/gtk-3.0/gtk/gtkmain.h
 include/gtk-3.0/gtk/gtkmenu.h
 include/gtk-3.0/gtk/gtkmenubar.h
+include/gtk-3.0/gtk/gtkmenubutton.h
 include/gtk-3.0/gtk/gtkmenuitem.h
 include/gtk-3.0/gtk/gtkmenushell.h
 include/gtk-3.0/gtk/gtkmenutoolbutton.h
@@ -217,6 +220,7 @@ include/gtk-3.0/gtk/gtkscalebutton.h
 include/gtk-3.0/gtk/gtkscrollable.h
 include/gtk-3.0/gtk/gtkscrollbar.h
 include/gtk-3.0/gtk/gtkscrolledwindow.h
+include/gtk-3.0/gtk/gtksearchentry.h
 include/gtk-3.0/gtk/gtkselection.h
 include/gtk-3.0/gtk/gtkseparator.h
 include/gtk-3.0/gtk/gtkseparatormenuitem.h
@@ -354,6 +358,7 @@ share/gir-1.0/Gtk-3.0.gir
 share/gtk-3.0/demo/alphatest.png
 share/gtk-3.0/demo/apple-red.png
 share/gtk-3.0/demo/application.c
+share/gtk-3.0/demo/application.ui
 share/gtk-3.0/demo/appwindow.c
 share/gtk-3.0/demo/assistant.c
 share/gtk-3.0/demo/background.jpg
@@ -363,6 +368,17 @@ share/gtk-3.0/demo/changedisplay.c
 share/gtk-3.0/demo/clipboard.c
 share/gtk-3.0/demo/colorsel.c
 share/gtk-3.0/demo/combobox.c
+share/gtk-3.0/demo/css_accordion.c
+share/gtk-3.0/demo/css_accordion.css
+share/gtk-3.0/demo/css_basics.c
+share/gtk-3.0/demo/css_basics.css
+share/gtk-3.0/demo/css_multiplebgs.c
+share/gtk-3.0/demo/css_multiplebgs.css
+share/gtk-3.0/demo/css_pixbufs.c
+share/gtk-3.0/demo/css_pixbufs.css
+share/gtk-3.0/demo/css_shadows.c
+share/gtk-3.0/demo/css_shadows.css
+share/gtk-3.0/demo/cssview.css
 share/gtk-3.0/demo/demo.ui
 share/gtk-3.0/demo/dialog.c
 share/gtk-3.0/demo/drawingarea.c
@@ -370,6 +386,7 @@ share/gtk-3.0/demo/editable_cells.c
 share/gtk-3.0/demo/entry_buffer.c
 share/gtk-3.0/demo/entry_completion.c
 share/gtk-3.0/demo/expander.c
+share/gtk-3.0/demo/fancy.css
 share/gtk-3.0/demo/floppybuddy.gif
 share/gtk-3.0/demo/gnome-applets.png
 share/gtk-3.0/demo/gnome-calendar.png
@@ -380,6 +397,8 @@ share/gtk-3.0/demo/gnome-gimp.png
 share/gtk-3.0/demo/gnome-gmush.png
 share/gtk-3.0/demo/gnome-gsame.png
 share/gtk-3.0/demo/gnu-keys.png
+share/gtk-3.0/demo/gtk-logo-24.png
+share/gtk-3.0/demo/gtk-logo-48.png
 share/gtk-3.0/demo/gtk-logo-rgb.gif
 share/gtk-3.0/demo/hypertext.c
 share/gtk-3.0/demo/iconview.c
@@ -389,6 +408,7 @@ share/gtk-3.0/demo/infobar.c
 share/gtk-3.0/demo/links.c
 share/gtk-3.0/demo/list_store.c
 share/gtk-3.0/demo/menus.c
+share/gtk-3.0/demo/menus.ui
 share/gtk-3.0/demo/offscreen_window.c
 share/gtk-3.0/demo/offscreen_window2.c
 share/gtk-3.0/demo/overlay.c
@@ -396,6 +416,7 @@ share/gtk-3.0/demo/panes.c
 share/gtk-3.0/demo/pickers.c
 share/gtk-3.0/demo/pixbufs.c
 share/gtk-3.0/demo/printing.c
+share/gtk-3.0/demo/reset.css
 share/gtk-3.0/demo/rotated_text.c
 share/gtk-3.0/demo/search_entry.c
 share/gtk-3.0/demo/sizegroup.c
@@ -403,6 +424,9 @@ share/gtk-3.0/demo/spinner.c
 share/gtk-3.0/demo/stock_browser.c
 share/gtk-3.0/demo/textscroll.c
 share/gtk-3.0/demo/textview.c
+share/gtk-3.0/demo/theming_custom_css.c
+share/gtk-3.0/demo/theming_style_classes.c
+share/gtk-3.0/demo/theming.ui
 share/gtk-3.0/demo/toolpalette.c
 share/gtk-3.0/demo/transparent.c
 share/gtk-3.0/demo/tree_store.c
@@ -512,12 +536,16 @@ share/locale/kg/LC_MESSAGES/gtk30-properties.mo
 share/locale/kg/LC_MESSAGES/gtk30.mo
 share/locale/kk/LC_MESSAGES/gtk30-properties.mo
 share/locale/kk/LC_MESSAGES/gtk30.mo
+share/locale/km/LC_MESSAGES/gtk30-properties.mo
+share/locale/km/LC_MESSAGES/gtk30.mo
 share/locale/kn/LC_MESSAGES/gtk30-properties.mo
 share/locale/kn/LC_MESSAGES/gtk30.mo
 share/locale/ko/LC_MESSAGES/gtk30-properties.mo
 share/locale/ko/LC_MESSAGES/gtk30.mo
 share/locale/ku/LC_MESSAGES/gtk30-properties.mo
 share/locale/ku/LC_MESSAGES/gtk30.mo
+share/locale/ky/LC_MESSAGES/gtk30-properties.mo
+share/locale/ky/LC_MESSAGES/gtk30.mo
 share/locale/lg/LC_MESSAGES/gtk30-properties.mo
 share/locale/lg/LC_MESSAGES/gtk30.mo
 share/locale/li/LC_MESSAGES/gtk30-properties.mo
@@ -677,8 +705,12 @@ share/themes/Emacs/gtk-3.0/gtk-keys.css
 @dirrmtry share/locale/mai
 @dirrmtry share/locale/lg/LC_MESSAGES
 @dirrmtry share/locale/lg
+@dirrmtry share/locale/ky/LC_MESSAGES
+@dirrmtry share/locale/ky
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
+@dirrmtry share/locale/km/LC_MESSAGES
+@dirrmtry share/locale/km
 @dirrmtry share/locale/kk/LC_MESSAGES
 @dirrmtry share/locale/kk
 @dirrmtry share/locale/kg/LC_MESSAGES