Update to 3.6.0.

Use USES=pathfix instead of gnomehack.

Obtained from:	gnome team repo

3 files changed, 44 insertions, 7 deletions

diff --git a/x11-toolkits/gtkmm30/Makefile b/x11-toolkits/gtkmm30/Makefile
index 16fc24d6995a..751e5412b596 100644
--- a/x11-toolkits/gtkmm30/Makefile
+++ b/x11-toolkits/gtkmm30/Makefile
@@ -1,10 +1,10 @@
 # Created by: Martin Klaffenboeck <martin.klaffenboeck@gmx.at>
 # $FreeBSD$
-#   $MCom: ports/x11-toolkits/gtkmm30/Makefile,v 1.16 2011/05/09 18:18:38 kwm Exp $
+#   $MCom: ports/x11-toolkits/gtkmm30/Makefile,v 1.22 2012/10/21 16:52:21 kwm Exp $
 
 PORTNAME=	gtkmm
-PORTVERSION=	3.0.1
-PORTREVISION?=	1
+PORTVERSION=	3.6.0
+PORTREVISION?=	0
 CATEGORIES=	x11-toolkits
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome3
@@ -12,7 +12,7 @@ DIST_SUBDIR=	gnome3
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	C++ wrapper for Gtk+, Pango
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 LATEST_LINK=	gtkmm30
 
 .if !defined(REFERENCE_PORT)
@@ -24,7 +24,8 @@ USE_GETTEXT=	yes
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
-USE_GNOME=	gnomehack gtk30 ltverhack atkmm pangomm
+USES=		pathfix
+USE_GNOME=	gtk30 ltverhack glibmm cairomm atkmm pangomm
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--disable-documentation \
diff --git a/x11-toolkits/gtkmm30/distinfo b/x11-toolkits/gtkmm30/distinfo
index f116d5107ac8..6b9d42210629 100644
--- a/x11-toolkits/gtkmm30/distinfo
+++ b/x11-toolkits/gtkmm30/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome3/gtkmm-3.0.1.tar.bz2) = fb2d982095919e58ab5757042bf72e2a6243e77825c8ae6f46c41ab66cb68498
-SIZE (gnome3/gtkmm-3.0.1.tar.bz2) = 16486895
+SHA256 (gnome3/gtkmm-3.6.0.tar.xz) = 888154d5c8acec083aa15e8dab68d977a393ade7257f0630becfa9a223fa2359
+SIZE (gnome3/gtkmm-3.6.0.tar.xz) = 10111820
diff --git a/x11-toolkits/gtkmm30/pkg-plist b/x11-toolkits/gtkmm30/pkg-plist
index 687371a1a2c5..e4c94465dad8 100644
--- a/x11-toolkits/gtkmm30/pkg-plist
+++ b/x11-toolkits/gtkmm30/pkg-plist
@@ -1,4 +1,5 @@
 include/gdkmm-%%API_VERSION%%/gdkmm.h
+include/gdkmm-%%API_VERSION%%/gdkmm/applaunchcontext.h
 include/gdkmm-%%API_VERSION%%/gdkmm/color.h
 include/gdkmm-%%API_VERSION%%/gdkmm/cursor.h
 include/gdkmm-%%API_VERSION%%/gdkmm/device.h
@@ -13,6 +14,7 @@ include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimation.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbufanimationiter.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbufformat.h
 include/gdkmm-%%API_VERSION%%/gdkmm/pixbufloader.h
+include/gdkmm-%%API_VERSION%%/gdkmm/private/applaunchcontext_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/color_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/cursor_p.h
 include/gdkmm-%%API_VERSION%%/gdkmm/private/device_p.h
@@ -48,6 +50,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/accelkey.h
 include/gtkmm-%%API_VERSION%%/gtkmm/accellabel.h
 include/gtkmm-%%API_VERSION%%/gtkmm/accelmap.h
 include/gtkmm-%%API_VERSION%%/gtkmm/action.h
+include/gtkmm-%%API_VERSION%%/gtkmm/actionable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/actiongroup.h
 include/gtkmm-%%API_VERSION%%/gtkmm/activatable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/adjustment.h
@@ -56,6 +59,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/appchooser.h
 include/gtkmm-%%API_VERSION%%/gtkmm/appchooserbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/appchooserdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/appchooserwidget.h
+include/gtkmm-%%API_VERSION%%/gtkmm/application.h
+include/gtkmm-%%API_VERSION%%/gtkmm/applicationwindow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/arrow.h
 include/gtkmm-%%API_VERSION%%/gtkmm/aspectframe.h
 include/gtkmm-%%API_VERSION%%/gtkmm/assistant.h
@@ -88,6 +93,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/checkbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/checkmenuitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/clipboard.h
 include/gtkmm-%%API_VERSION%%/gtkmm/colorbutton.h
+include/gtkmm-%%API_VERSION%%/gtkmm/colorchooser.h
+include/gtkmm-%%API_VERSION%%/gtkmm/colorchooserdialog.h
 include/gtkmm-%%API_VERSION%%/gtkmm/colorselection.h
 include/gtkmm-%%API_VERSION%%/gtkmm/combobox.h
 include/gtkmm-%%API_VERSION%%/gtkmm/comboboxtext.h
@@ -109,10 +116,19 @@ include/gtkmm-%%API_VERSION%%/gtkmm/filechooserwidget.h
 include/gtkmm-%%API_VERSION%%/gtkmm/filefilter.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fixed.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fontbutton.h
+include/gtkmm-%%API_VERSION%%/gtkmm/fontchooser.h
+include/gtkmm-%%API_VERSION%%/gtkmm/fontchooserdialog.h
+include/gtkmm-%%API_VERSION%%/gtkmm/fontchooserwidget.h
 include/gtkmm-%%API_VERSION%%/gtkmm/fontselection.h
 include/gtkmm-%%API_VERSION%%/gtkmm/frame.h
 include/gtkmm-%%API_VERSION%%/gtkmm/grid.h
 include/gtkmm-%%API_VERSION%%/gtkmm/handlebox.h
+include/gtkmm-%%API_VERSION%%/gtkmm/hvbox.h
+include/gtkmm-%%API_VERSION%%/gtkmm/hvbuttonbox.h
+include/gtkmm-%%API_VERSION%%/gtkmm/hvpaned.h
+include/gtkmm-%%API_VERSION%%/gtkmm/hvscale.h
+include/gtkmm-%%API_VERSION%%/gtkmm/hvscrollbar.h
+include/gtkmm-%%API_VERSION%%/gtkmm/hvseparator.h
 include/gtkmm-%%API_VERSION%%/gtkmm/iconfactory.h
 include/gtkmm-%%API_VERSION%%/gtkmm/iconinfo.h
 include/gtkmm-%%API_VERSION%%/gtkmm/iconset.h
@@ -125,12 +141,14 @@ include/gtkmm-%%API_VERSION%%/gtkmm/infobar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/invisible.h
 include/gtkmm-%%API_VERSION%%/gtkmm/label.h
 include/gtkmm-%%API_VERSION%%/gtkmm/layout.h
+include/gtkmm-%%API_VERSION%%/gtkmm/levelbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/linkbutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/liststore.h
 include/gtkmm-%%API_VERSION%%/gtkmm/listviewtext.h
 include/gtkmm-%%API_VERSION%%/gtkmm/main.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menu.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menubar.h
+include/gtkmm-%%API_VERSION%%/gtkmm/menubutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menuitem.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menushell.h
 include/gtkmm-%%API_VERSION%%/gtkmm/menutoolbutton.h
@@ -157,6 +175,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/aboutdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accelgroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/accellabel_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/action_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/actionable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/actiongroup_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/activatable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/adjustment_p.h
@@ -165,6 +184,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/appchooser_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/appchooserbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/appchooserdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/appchooserwidget_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/application_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/applicationwindow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/arrow_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/aspectframe_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/assistant_p.h
@@ -195,6 +216,8 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/checkbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/checkmenuitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/clipboard_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/colorbutton_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/colorchooser_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/colorchooserdialog_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/colorselection_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/combobox_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/comboboxtext_p.h
@@ -216,10 +239,19 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/filechooserwidget_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/filefilter_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fixed_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fontbutton_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/fontchooser_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/fontchooserdialog_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/fontchooserwidget_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/fontselection_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/frame_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/grid_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/handlebox_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/hvbox_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/hvbuttonbox_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/hvpaned_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/hvscale_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/hvscrollbar_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/hvseparator_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/iconfactory_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/iconinfo_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/iconset_p.h
@@ -232,11 +264,13 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/infobar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/invisible_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/label_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/layout_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/levelbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/linkbutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/liststore_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/main_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menu_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menubar_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/menubutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menuitem_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menushell_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/menutoolbutton_p.h
@@ -279,6 +313,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/private/scalebutton_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollable_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrollbar_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/scrolledwindow_p.h
+include/gtkmm-%%API_VERSION%%/gtkmm/private/searchentry_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/selectiondata_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/separator_p.h
 include/gtkmm-%%API_VERSION%%/gtkmm/private/separatormenuitem_p.h
@@ -355,6 +390,7 @@ include/gtkmm-%%API_VERSION%%/gtkmm/scalebutton.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollable.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrollbar.h
 include/gtkmm-%%API_VERSION%%/gtkmm/scrolledwindow.h
+include/gtkmm-%%API_VERSION%%/gtkmm/searchentry.h
 include/gtkmm-%%API_VERSION%%/gtkmm/selectiondata.h
 include/gtkmm-%%API_VERSION%%/gtkmm/selectiondata_private.h
 include/gtkmm-%%API_VERSION%%/gtkmm/separator.h