3 files changed, 66 insertions, 39 deletions

diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 5f81c77dfe04..60c8ae60ec14 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk2hs
-PORTVERSION=	0.9.7
-PORTREVISION=	1
+PORTVERSION=	0.9.9
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -16,14 +15,10 @@ PKGNAMEPREFIX=	hs-
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	A GTK2 Binding for Haskell
 
-BUILD_DEPENDS=	ghc-6.2.2:${PORTSDIR}/lang/ghc \
+BUILD_DEPENDS=	ghc-6.4:${PORTSDIR}/lang/ghc \
 		${X11BASE}/lib/mozilla/libxpcom.so:${PORTSDIR}/www/mozilla
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
-BROKEN=		Broken dependency
-DEPRECATED=	${BROKEN}
-EXPIRATION_DATE=2005-09-22
-
 USE_GNOME=	gtk20 libglade2 gtksourceview gconf2
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
diff --git a/x11-toolkits/hs-gtk2hs/distinfo b/x11-toolkits/hs-gtk2hs/distinfo
index a0a81ca85c01..308264c3df84 100644
--- a/x11-toolkits/hs-gtk2hs/distinfo
+++ b/x11-toolkits/hs-gtk2hs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk2hs-0.9.7.tar.gz) = af4476dec61c82bd522b537155282fb9
-SIZE (gtk2hs-0.9.7.tar.gz) = 546945
+MD5 (gtk2hs-0.9.9.tar.gz) = 3276545190248d40c683cd42f51a1b6e
+SIZE (gtk2hs-0.9.9.tar.gz) = 765222
diff --git a/x11-toolkits/hs-gtk2hs/pkg-plist b/x11-toolkits/hs-gtk2hs/pkg-plist
index 3ac4ca25e98e..9ad90eaa7b8a 100644
--- a/x11-toolkits/hs-gtk2hs/pkg-plist
+++ b/x11-toolkits/hs-gtk2hs/pkg-plist
@@ -1,65 +1,79 @@
-lib/gtk2hs/glib.pkg
-lib/gtk2hs/gtk.pkg
-lib/gtk2hs/mogul.pkg
-lib/gtk2hs/glade.pkg
-lib/gtk2hs/gconf.pkg
-lib/gtk2hs/sourceview.pkg
-lib/gtk2hs/mozembed.pkg
+lib/gtk2hs/gconf.package.conf
+lib/gtk2hs/glade.package.conf
+lib/gtk2hs/glib.package.conf
+lib/gtk2hs/gtk.package.conf
+lib/gtk2hs/mogul.package.conf
+lib/gtk2hs/mozembed.package.conf
+lib/gtk2hs/sourceview.package.conf
+lib/gtk2hs/libHSgconf.a
 lib/gtk2hs/libHSglib.a
+lib/gtk2hs/libHSglade.a
 lib/gtk2hs/libHSgtk.a
 lib/gtk2hs/libHSmogul.a
-lib/gtk2hs/libHSglade.a
-lib/gtk2hs/libHSgconf.a
-lib/gtk2hs/libHSsourceview.a
 lib/gtk2hs/libHSmozembed.a
-lib/gtk2hs/imports/glib/System/Glib/Types.hi
+lib/gtk2hs/libHSsourceview.a
+lib/gtk2hs/imports/gconf/System/Gnome/GConf/Signals.hi
+lib/gtk2hs/imports/glib/System/Glib/Attributes.hi
+lib/gtk2hs/imports/glib/System/Glib/FFI.hi
+lib/gtk2hs/imports/glib/System/Glib/Flags.hi
+lib/gtk2hs/imports/glib/System/Glib/GError.hi
+lib/gtk2hs/imports/glib/System/Glib/GList.hi
+lib/gtk2hs/imports/glib/System/Glib/GObject.hi
 lib/gtk2hs/imports/glib/System/Glib/GType.hi
 lib/gtk2hs/imports/glib/System/Glib/GValue.hi
 lib/gtk2hs/imports/glib/System/Glib/GValueTypes.hi
-lib/gtk2hs/imports/glib/System/Glib/GObject.hi
-lib/gtk2hs/imports/glib/System/Glib/GError.hi
-lib/gtk2hs/imports/glib/System/Glib/GList.hi
 lib/gtk2hs/imports/glib/System/Glib/GParameter.hi
+lib/gtk2hs/imports/glib/System/Glib/GTypeConstants.hi
+lib/gtk2hs/imports/glib/System/Glib/Properties.hi
+lib/gtk2hs/imports/glib/System/Glib/Signals.hi
 lib/gtk2hs/imports/glib/System/Glib/StoreValue.hi
-lib/gtk2hs/imports/glib/System/Glib/FFI.hi
+lib/gtk2hs/imports/glib/System/Glib/Types.hi
 lib/gtk2hs/imports/glib/System/Glib/UTFString.hi
 lib/gtk2hs/imports/glib/System/Glib.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Types.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Description.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Enums.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Layout.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Rendering.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Markup.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeModel.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeViewColumn.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Rendering.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Pango/Types.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/CellView.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/CellRenderer.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/CellRendererPixbuf.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/CellRendererText.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/CellRendererToggle.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/IconView.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/ListStore.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeIter.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeModel.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeModelSort.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreePath.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeRowReference.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeSelection.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeStore.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeView.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/CellRenderer.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/TreeList/TreeViewColumn.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextIter.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextBuffer.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextMark.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextTag.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextTagTable.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Multiline/TextView.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Region.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/DrawWindow.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Drawable.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Enums.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Events.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/GC.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Gdk.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Enums.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Keys.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Pixbuf.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Events.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/DrawWindow.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/PixbufData.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Pixmap.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Gdk/Region.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Bin.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Box.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/ButtonBox.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Container.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/ContainerChildProperties.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Misc.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Object.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Paned.hi
@@ -68,6 +82,11 @@ lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Scale.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Widget.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Scrollbar.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract/Separator.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ActionMenuToolbar/Action.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ActionMenuToolbar/ActionGroup.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ActionMenuToolbar/RadioAction.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ActionMenuToolbar/ToggleAction.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ActionMenuToolbar/UIManager.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Buttons/Button.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Buttons/CheckButton.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Buttons/RadioButton.hi
@@ -111,16 +130,22 @@ lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/Menu.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuBar.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuItem.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuShell.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/MenuToolButton.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/OptionMenu.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioMenuItem.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/RadioToolButton.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/SeparatorMenuItem.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/SeparatorToolItem.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/TearoffMenuItem.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToggleToolButton.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolButton.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/ToolItem.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/MenuComboToolbar/Toolbar.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/Adjustment.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/Arrow.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/Calendar.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/DrawingArea.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/EventBox.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/GArrow.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/HandleBox.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/SizeGroup.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Misc/Tooltips.hi
@@ -131,21 +156,27 @@ lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Ornaments/VSeparator.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Scrolling/HScrollbar.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Scrolling/ScrolledWindow.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Scrolling/VScrollbar.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/ColorButton.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/ColorSelection.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/ColorSelectionDialog.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FileChooserButton.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FileFilter.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FileSelection.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FontButton.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FontSelection.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FontSelectionDialog.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FileChooser.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FileChooserWidget.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Selectors/FileChooserDialog.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/AboutDialog.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/Dialog.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/FileSel.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/Window.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Windows/WindowGroup.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Embedding/Embedding.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Embedding/Plug.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Embedding/Socket.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Embedding/Embedding.hi
-lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Types.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Signals.hi
+lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Types.hi
 lib/gtk2hs/imports/gtk/Graphics/UI/Gtk.hi
 lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/GetWidget.hi
 lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/MDialog.hi
@@ -155,8 +186,8 @@ lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul/WidgetTable.hi
 lib/gtk2hs/imports/mogul/Graphics/UI/Gtk/Mogul.hi
 lib/gtk2hs/imports/glade/Graphics/UI/Gtk/Glade/Types.hi
 lib/gtk2hs/imports/glade/Graphics/UI/Gtk/Glade.hi
-lib/gtk2hs/imports/gconf/System/Gnome/GConf/GConfValue.hi
 lib/gtk2hs/imports/gconf/System/Gnome/GConf/GConfClient.hi
+lib/gtk2hs/imports/gconf/System/Gnome/GConf/GConfValue.hi
 lib/gtk2hs/imports/gconf/System/Gnome/GConf/Types.hi
 lib/gtk2hs/imports/gconf/System/Gnome/GConf.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceBuffer.hi
@@ -167,9 +198,9 @@ lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceMarker.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceStyleScheme.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceTag.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceTagTable.hi
+lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceTagStyle.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceView.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/Types.hi
-lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView/SourceTagStyle.hi
 lib/gtk2hs/imports/sourceview/Graphics/UI/Gtk/SourceView.hi
 lib/gtk2hs/imports/mozembed/Graphics/UI/Gtk/MozEmbed/Types.hi
 lib/gtk2hs/imports/mozembed/Graphics/UI/Gtk/MozEmbed.hi
@@ -211,6 +242,7 @@ lib/gtk2hs/HSmozembed.o
 @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Embedding
 @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Display
 @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Buttons
+@dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/ActionMenuToolbar
 @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk/Abstract
 @dirrm lib/gtk2hs/imports/gtk/Graphics/UI/Gtk
 @dirrm lib/gtk2hs/imports/gtk/Graphics/UI