5 files changed, 224 insertions, 161 deletions

diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index bc51e480afdb..8fda420d52f1 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gtk2hs
-PORTVERSION=	0.9.5
-PORTREVISION=	1
+PORTVERSION=	0.9.6
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -19,11 +18,10 @@ COMMENT=	A GTK2 Binding for Haskell
 BUILD_DEPENDS=	ghc-6.2.2:${PORTSDIR}/lang/ghc
 RUN_DEPENDS=	ghc-6.2.2:${PORTSDIR}/lang/ghc
 
-USE_GNOME=	gtk20 libglade gtksourceview
+USE_GNOME=	gtk20 libglade2 gtksourceview
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-c2hs=no
 USE_GMAKE=	yes
-MAKE_ENV+=	BUILDDOCS=no
 
 GHC_VERSION=	`${LOCALBASE}/bin/ghc --numeric-version`
 PLIST_SUB+=	GHC_VERSION="${GHC_VERSION}"
diff --git a/x11-toolkits/hs-gtk2hs/distinfo b/x11-toolkits/hs-gtk2hs/distinfo
index 61546b0e27eb..16e7f872bbe1 100644
--- a/x11-toolkits/hs-gtk2hs/distinfo
+++ b/x11-toolkits/hs-gtk2hs/distinfo
@@ -1,2 +1,2 @@
-MD5 (gtk2hs-0.9.5.tar.gz) = cfbf29ce7ea5621e82856081aa246ef8
-SIZE (gtk2hs-0.9.5.tar.gz) = 436231
+MD5 (gtk2hs-0.9.6.tar.gz) = fdd2d08d9789d1011b44a1df048c95b9
+SIZE (gtk2hs-0.9.6.tar.gz) = 457131
diff --git a/x11-toolkits/hs-gtk2hs/files/patch-Makefile b/x11-toolkits/hs-gtk2hs/files/patch-Makefile
new file mode 100644
index 000000000000..076e7f0d3c73
--- /dev/null
+++ b/x11-toolkits/hs-gtk2hs/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- Makefile.orig	Tue Jan 11 13:23:20 2005
++++ Makefile	Tue Jan 11 13:23:26 2005
+@@ -26,7 +26,7 @@
+ 	     demo/hello demo/buttonbox
+ 
+ ifeq ($(GTK_VERSION_2_4),yes)
+-MAKE_APPS += demo/filechooser
++#MAKE_APPS += demo/filechooser
+ endif
+ 
+ ifeq ($(strip $(ENABLE_LIBGLADE)),yes)
diff --git a/x11-toolkits/hs-gtk2hs/files/patch-pthread b/x11-toolkits/hs-gtk2hs/files/patch-pthread
new file mode 100644
index 000000000000..a968011773a1
--- /dev/null
+++ b/x11-toolkits/hs-gtk2hs/files/patch-pthread
@@ -0,0 +1,21 @@
+--- gconf/Makefile.orig	Tue Jan 11 14:27:55 2005
++++ gconf/Makefile	Tue Jan 11 15:47:48 2005
+@@ -29,6 +29,7 @@
+ EXTRA_CPPFLAGS	= $(GCONF_CFLAGS)
+ 
+ EXTRA_LIBS	= $(GCONF_LIBS)
++EXTRALD_FLAGS	= -pthread
+ 
+ NEEDPACKAGES = gtk2
+ 
+--- mk/library.mk.orig	Tue Jan 11 15:49:48 2005
++++ mk/library.mk	Tue Jan 11 15:50:08 2005
+@@ -46,7 +46,7 @@
+ 	  package_deps		= [$(call makeTextList,$(NEEDPACKAGES))],\
+ 	  extra_ghc_opts	= [$(call makeTextList,$(EXTRAHC_FLAGS))],\
+ 	  extra_cc_opts		= [],\
+-	  extra_ld_opts		= [$(call makeTextList,\
++	  extra_ld_opts		= [$(call makeTextList,$(EXTRALD_FLAGS)\
+           $(addprefix -Wl$(COMMA),\
+ 	  $(addprefix --subsystem$(SPACE),$(SUBSYSTEM))) \
+ 	  $(addprefix -u ,$(EXTRA_SYMBOLS)))]} | \
diff --git a/x11-toolkits/hs-gtk2hs/pkg-plist b/x11-toolkits/hs-gtk2hs/pkg-plist
index 6266ce7705e1..0c0c051e2308 100644
--- a/x11-toolkits/hs-gtk2hs/pkg-plist
+++ b/x11-toolkits/hs-gtk2hs/pkg-plist
@@ -1,161 +1,194 @@
-lib/glade.conf
-lib/glade2hs.o
-lib/gtk2.conf
-lib/gtk2hs.o
-lib/libglade2hs.a
-lib/libsourceview.a
-lib/hi/AccelLabel.hi
-lib/hi/Adjustment.hi
-lib/hi/Alignment.hi
-lib/hi/AspectFrame.hi
-lib/hi/Box.hi
-lib/hi/Button.hi
-lib/hi/Calendar.hi
-lib/hi/CellRenderer.hi
-lib/hi/CellRendererPixbuf.hi
-lib/hi/CellRendererText.hi
-lib/hi/CellRendererToggle.hi
-lib/hi/CheckButton.hi
-lib/hi/CheckMenuItem.hi
-lib/hi/Combo.hi
-lib/hi/Container.hi
-lib/hi/Container_stub.h
-lib/hi/Dialog.hi
-lib/hi/DrawWindow.hi
-lib/hi/Drawable.hi
-lib/hi/DrawingArea.hi
-lib/hi/Embedding.hi
-lib/hi/Entry.hi
-lib/hi/Enums.hi
-lib/hi/EventBox.hi
-lib/hi/Events.hi
-lib/hi/FFI.hi
-lib/hi/FileSel.hi
-lib/hi/Frame.hi
-lib/hi/GArrow.hi
-lib/hi/GC.hi
-lib/hi/GList.hi
-lib/hi/GObject.hi
-lib/hi/GObject_stub.h
-lib/hi/GType.hi
-lib/hi/GValue.hi
-lib/hi/GValueTypes.hi
-lib/hi/Gdk.hi
-lib/hi/GdkEnums.hi
-lib/hi/General.hi
-lib/hi/General_stub.h
-lib/hi/GetWidget.hi
-lib/hi/Glade.hi
-lib/hi/GladeType.hi
-lib/hi/Gtk.hi
-lib/hi/HBox.hi
-lib/hi/HPaned.hi
-lib/hi/HScale.hi
-lib/hi/HScrollbar.hi
-lib/hi/HSeparator.hi
-lib/hi/HandleBox.hi
-lib/hi/Hierarchy.hi
-lib/hi/IconFactory.hi
-lib/hi/Image.hi
-lib/hi/ImageMenuItem.hi
-lib/hi/Keys.hi
-lib/hi/Label.hi
-lib/hi/Layout.hi
-lib/hi/ListStore.hi
-lib/hi/LocalControl.hi
-lib/hi/LocalData.hi
-lib/hi/MDialog.hi
-lib/hi/Markup.hi
-lib/hi/Menu.hi
-lib/hi/MenuBar.hi
-lib/hi/MenuItem.hi
-lib/hi/MenuShell.hi
-lib/hi/Misc.hi
-lib/hi/Mogul.hi
-lib/hi/NewWidget.hi
-lib/hi/Notebook.hi
-lib/hi/Object.hi
-lib/hi/OptionMenu.hi
-lib/hi/Paned.hi
-lib/hi/PangoLayout.hi
-lib/hi/PangoTypes.hi
-lib/hi/Pixbuf.hi
-lib/hi/Plug.hi
-lib/hi/ProgressBar.hi
-lib/hi/RadioButton.hi
-lib/hi/RadioMenuItem.hi
-lib/hi/Range.hi
-lib/hi/Region.hi
-lib/hi/Rendering.hi
-lib/hi/Scale.hi
-lib/hi/Scrollbar.hi
-lib/hi/ScrolledWindow.hi
-lib/hi/Separator.hi
-lib/hi/Signal.hi
-lib/hi/Signal_stub.h
-lib/hi/Socket.hi
-lib/hi/SourceBuffer.hi
-lib/hi/SourceIter.hi
-lib/hi/SourceLanguage.hi
-lib/hi/SourceLanguagesManager.hi
-lib/hi/SourceMarker.hi
-lib/hi/SourceStyleScheme.hi
-lib/hi/SourceTag.hi
-lib/hi/SourceTagStyle.hi
-lib/hi/SourceTagTable.hi
-lib/hi/SourceView.hi
-lib/hi/SourceViewType.hi
-lib/hi/SpinButton.hi
-lib/hi/Statusbar.hi
-lib/hi/StockItems.hi
-lib/hi/StoreValue.hi
-lib/hi/Structs.hi
-lib/hi/Style.hi
-lib/hi/Table.hi
-lib/hi/TearoffMenuItem.hi
-lib/hi/TextBuffer.hi
-lib/hi/TextIter.hi
-lib/hi/TextIter_stub.h
-lib/hi/TextMark.hi
-lib/hi/TextTag.hi
-lib/hi/TextTagTable.hi
-lib/hi/TextView.hi
-lib/hi/ToggleButton.hi
-lib/hi/Toolbar.hi
-lib/hi/Tooltips.hi
-lib/hi/TreeList.hi
-lib/hi/TreeModel.hi
-lib/hi/TreeModelSort.hi
-lib/hi/TreeSelection.hi
-lib/hi/TreeSelection_stub.h
-lib/hi/TreeStore.hi
-lib/hi/TreeView.hi
-lib/hi/TreeViewColumn.hi
-lib/hi/TreeView_stub.h
-lib/hi/VBox.hi
-lib/hi/VPaned.hi
-lib/hi/VScale.hi
-lib/hi/VScrollbar.hi
-lib/hi/VSeparator.hi
-lib/hi/Viewport.hi
-lib/hi/Widget.hi
-lib/hi/WidgetTable.hi
-lib/hi/Window.hi
-lib/hi/sourceview.h
-lib/libgtk2hs.a
-lib/libmogul.a
-lib/mogul.conf
-lib/mogul.o
-lib/sourceview.conf
-lib/sourceview.o
-@dirrm lib/hi
-@exec %D/bin/ghc-pkg -i %D/lib/glade.conf -a -g
-@exec %D/bin/ghc-pkg -i %D/lib/gtk2.conf -a -g
-@exec %D/bin/ghc-pkg -i %D/lib/mogul.conf -a -g
-@exec %D/bin/ghc-pkg -i %D/lib/sourceview.conf -a -g
+lib/gtk2hs/gtk2/hi/Scrollbar.hi
+lib/gtk2hs/gtk2/hi/Separator.hi
+lib/gtk2hs/gtk2/hi/FFI.hi
+lib/gtk2hs/gtk2/hi/Gtk.hi
+lib/gtk2hs/gtk2/hi/CellRenderer.hi
+lib/gtk2hs/gtk2/hi/DrawWindow.hi
+lib/gtk2hs/gtk2/hi/Markup.hi
+lib/gtk2hs/gtk2/hi/LocalControl.hi
+lib/gtk2hs/gtk2/hi/LocalData.hi
+lib/gtk2hs/gtk2/hi/Hierarchy.hi
+lib/gtk2hs/gtk2/hi/Signal.hi
+lib/gtk2hs/gtk2/hi/GValue.hi
+lib/gtk2hs/gtk2/hi/GList.hi
+lib/gtk2hs/gtk2/hi/GObject.hi
+lib/gtk2hs/gtk2/hi/PangoTypes.hi
+lib/gtk2hs/gtk2/hi/TreeModel.hi
+lib/gtk2hs/gtk2/hi/TreeViewColumn.hi
+lib/gtk2hs/gtk2/hi/TextIter.hi
+lib/gtk2hs/gtk2/hi/Region.hi
+lib/gtk2hs/gtk2/hi/Bin.hi
+lib/gtk2hs/gtk2/hi/Box.hi
+lib/gtk2hs/gtk2/hi/ButtonBox.hi
+lib/gtk2hs/gtk2/hi/Misc.hi
+lib/gtk2hs/gtk2/hi/Container.hi
+lib/gtk2hs/gtk2/hi/FileChooser.hi
+lib/gtk2hs/gtk2/hi/Object.hi
+lib/gtk2hs/gtk2/hi/Paned.hi
+lib/gtk2hs/gtk2/hi/Range.hi
+lib/gtk2hs/gtk2/hi/Scale.hi
+lib/gtk2hs/gtk2/hi/Widget.hi
+lib/gtk2hs/gtk2/hi/Button.hi
+lib/gtk2hs/gtk2/hi/CheckButton.hi
+lib/gtk2hs/gtk2/hi/RadioButton.hi
+lib/gtk2hs/gtk2/hi/ToggleButton.hi
+lib/gtk2hs/gtk2/hi/AccelLabel.hi
+lib/gtk2hs/gtk2/hi/Image.hi
+lib/gtk2hs/gtk2/hi/Label.hi
+lib/gtk2hs/gtk2/hi/ProgressBar.hi
+lib/gtk2hs/gtk2/hi/Statusbar.hi
+lib/gtk2hs/gtk2/hi/Editable.hi
+lib/gtk2hs/gtk2/hi/Entry.hi
+lib/gtk2hs/gtk2/hi/EntryCompletion.hi
+lib/gtk2hs/gtk2/hi/HScale.hi
+lib/gtk2hs/gtk2/hi/SpinButton.hi
+lib/gtk2hs/gtk2/hi/VScale.hi
+lib/gtk2hs/gtk2/hi/Enums.hi
+lib/gtk2hs/gtk2/hi/General.hi
+lib/gtk2hs/gtk2/hi/IconFactory.hi
+lib/gtk2hs/gtk2/hi/Style.hi
+lib/gtk2hs/gtk2/hi/Alignment.hi
+lib/gtk2hs/gtk2/hi/AspectFrame.hi
+lib/gtk2hs/gtk2/hi/Expander.hi
+lib/gtk2hs/gtk2/hi/Fixed.hi
+lib/gtk2hs/gtk2/hi/HBox.hi
+lib/gtk2hs/gtk2/hi/HButtonBox.hi
+lib/gtk2hs/gtk2/hi/HPaned.hi
+lib/gtk2hs/gtk2/hi/Layout.hi
+lib/gtk2hs/gtk2/hi/Notebook.hi
+lib/gtk2hs/gtk2/hi/Table.hi
+lib/gtk2hs/gtk2/hi/VBox.hi
+lib/gtk2hs/gtk2/hi/VButtonBox.hi
+lib/gtk2hs/gtk2/hi/VPaned.hi
+lib/gtk2hs/gtk2/hi/CheckMenuItem.hi
+lib/gtk2hs/gtk2/hi/Combo.hi
+lib/gtk2hs/gtk2/hi/ComboBox.hi
+lib/gtk2hs/gtk2/hi/ComboBoxEntry.hi
+lib/gtk2hs/gtk2/hi/ImageMenuItem.hi
+lib/gtk2hs/gtk2/hi/Menu.hi
+lib/gtk2hs/gtk2/hi/MenuBar.hi
+lib/gtk2hs/gtk2/hi/MenuItem.hi
+lib/gtk2hs/gtk2/hi/MenuShell.hi
+lib/gtk2hs/gtk2/hi/OptionMenu.hi
+lib/gtk2hs/gtk2/hi/RadioMenuItem.hi
+lib/gtk2hs/gtk2/hi/TearoffMenuItem.hi
+lib/gtk2hs/gtk2/hi/ToolItem.hi
+lib/gtk2hs/gtk2/hi/Toolbar.hi
+lib/gtk2hs/gtk2/hi/Adjustment.hi
+lib/gtk2hs/gtk2/hi/Calendar.hi
+lib/gtk2hs/gtk2/hi/DrawingArea.hi
+lib/gtk2hs/gtk2/hi/EventBox.hi
+lib/gtk2hs/gtk2/hi/FileChooserWidget.hi
+lib/gtk2hs/gtk2/hi/GArrow.hi
+lib/gtk2hs/gtk2/hi/HandleBox.hi
+lib/gtk2hs/gtk2/hi/SizeGroup.hi
+lib/gtk2hs/gtk2/hi/Tooltips.hi
+lib/gtk2hs/gtk2/hi/Viewport.hi
+lib/gtk2hs/gtk2/hi/TextBuffer.hi
+lib/gtk2hs/gtk2/hi/TextMark.hi
+lib/gtk2hs/gtk2/hi/TextTag.hi
+lib/gtk2hs/gtk2/hi/TextTagTable.hi
+lib/gtk2hs/gtk2/hi/TextView.hi
+lib/gtk2hs/gtk2/hi/Frame.hi
+lib/gtk2hs/gtk2/hi/HSeparator.hi
+lib/gtk2hs/gtk2/hi/VSeparator.hi
+lib/gtk2hs/gtk2/hi/HScrollbar.hi
+lib/gtk2hs/gtk2/hi/ScrolledWindow.hi
+lib/gtk2hs/gtk2/hi/VScrollbar.hi
+lib/gtk2hs/gtk2/hi/ColorSelection.hi
+lib/gtk2hs/gtk2/hi/ColorSelectionDialog.hi
+lib/gtk2hs/gtk2/hi/FontSelection.hi
+lib/gtk2hs/gtk2/hi/FontSelectionDialog.hi
+lib/gtk2hs/gtk2/hi/CellRendererPixbuf.hi
+lib/gtk2hs/gtk2/hi/CellRendererText.hi
+lib/gtk2hs/gtk2/hi/CellRendererToggle.hi
+lib/gtk2hs/gtk2/hi/ListStore.hi
+lib/gtk2hs/gtk2/hi/TreeModelSort.hi
+lib/gtk2hs/gtk2/hi/TreeSelection.hi
+lib/gtk2hs/gtk2/hi/TreeStore.hi
+lib/gtk2hs/gtk2/hi/TreeView.hi
+lib/gtk2hs/gtk2/hi/Dialog.hi
+lib/gtk2hs/gtk2/hi/FileChooserDialog.hi
+lib/gtk2hs/gtk2/hi/FileSel.hi
+lib/gtk2hs/gtk2/hi/Window.hi
+lib/gtk2hs/gtk2/hi/Drawable.hi
+lib/gtk2hs/gtk2/hi/GC.hi
+lib/gtk2hs/gtk2/hi/Gdk.hi
+lib/gtk2hs/gtk2/hi/GdkEnums.hi
+lib/gtk2hs/gtk2/hi/Keys.hi
+lib/gtk2hs/gtk2/hi/Pixbuf.hi
+lib/gtk2hs/gtk2/hi/GError.hi
+lib/gtk2hs/gtk2/hi/GType.hi
+lib/gtk2hs/gtk2/hi/GValueTypes.hi
+lib/gtk2hs/gtk2/hi/PangoLayout.hi
+lib/gtk2hs/gtk2/hi/Rendering.hi
+lib/gtk2hs/gtk2/hi/Plug.hi
+lib/gtk2hs/gtk2/hi/Socket.hi
+lib/gtk2hs/gtk2/hi/StockItems.hi
+lib/gtk2hs/gtk2/hi/Structs.hi
+lib/gtk2hs/gtk2/hi/StoreValue.hi
+lib/gtk2hs/gtk2/hi/Events.hi
+lib/gtk2hs/gtk2/hi/GParameter.hi
+lib/gtk2hs/gtk2/hi/Embedding.hi
+lib/gtk2hs/gtk2/libgtk2hs.a
+lib/gtk2hs/gtk2/gtk2.conf
+lib/gtk2hs/gtk2/gtk2hs.o
+@dirrm lib/gtk2hs/gtk2/hi
+@dirrm lib/gtk2hs/gtk2
+lib/gtk2hs/mogul/hi/GetWidget.hi
+lib/gtk2hs/mogul/hi/MDialog.hi
+lib/gtk2hs/mogul/hi/Mogul.hi
+lib/gtk2hs/mogul/hi/NewWidget.hi
+lib/gtk2hs/mogul/hi/TreeList.hi
+lib/gtk2hs/mogul/hi/WidgetTable.hi
+lib/gtk2hs/mogul/libmogul.a
+lib/gtk2hs/mogul/mogul.conf
+lib/gtk2hs/mogul/mogul.o
+@dirrm lib/gtk2hs/mogul/hi
+@dirrm lib/gtk2hs/mogul
+lib/gtk2hs/glade/hi/GladeType.hi
+lib/gtk2hs/glade/hi/Glade.hi
+lib/gtk2hs/glade/libglade2hs.a
+lib/gtk2hs/glade/glade.conf
+lib/gtk2hs/glade/glade2hs.o
+@dirrm lib/gtk2hs/glade/hi
+@dirrm lib/gtk2hs/glade
+lib/gtk2hs/sourceview/hi/SourceViewType.hi
+lib/gtk2hs/sourceview/hi/SourceBuffer.hi
+lib/gtk2hs/sourceview/hi/SourceIter.hi
+lib/gtk2hs/sourceview/hi/SourceLanguage.hi
+lib/gtk2hs/sourceview/hi/SourceLanguagesManager.hi
+lib/gtk2hs/sourceview/hi/SourceMarker.hi
+lib/gtk2hs/sourceview/hi/SourceStyleScheme.hi
+lib/gtk2hs/sourceview/hi/SourceTag.hi
+lib/gtk2hs/sourceview/hi/SourceTagTable.hi
+lib/gtk2hs/sourceview/hi/SourceView.hi
+lib/gtk2hs/sourceview/hi/SourceTagStyle.hi
+lib/gtk2hs/sourceview/hi/sourceview.h
+lib/gtk2hs/sourceview/libsourceview.a
+lib/gtk2hs/sourceview/sourceview.conf
+lib/gtk2hs/sourceview/sourceview.o
+@dirrm lib/gtk2hs/sourceview/hi
+@dirrm lib/gtk2hs/sourceview
+lib/gtk2hs/gconf/hi/GConf.hi
+lib/gtk2hs/gconf/hi/GConfType.hi
+lib/gtk2hs/gconf/hi/GConfValue.hi
+lib/gtk2hs/gconf/hi/GConfClient.hi
+lib/gtk2hs/gconf/libgconf.a
+lib/gtk2hs/gconf/gconf.conf
+lib/gtk2hs/gconf/gconf.o
+@dirrm lib/gtk2hs/gconf/hi
+@dirrm lib/gtk2hs/gconf
+@dirrm lib/gtk2hs
+@exec %D/bin/ghc-pkg -i %D/lib/gtk2hs/gtk2/gtk2.conf -a -g
+@exec %D/bin/ghc-pkg -i %D/lib/gtk2hs/glade/glade.conf -a -g
+@exec %D/bin/ghc-pkg -i %D/lib/gtk2hs/mogul/mogul.conf -a -g
+@exec %D/bin/ghc-pkg -i %D/lib/gtk2hs/sourceview/sourceview.conf -a -g
+@exec %D/bin/ghc-pkg -i %D/lib/gtk2hs/gconf/gconf.conf -a -g
 @exec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old
 @unexec %D/bin/ghc-pkg -r mogul
 @unexec %D/bin/ghc-pkg -r gtk2
 @unexec %D/bin/ghc-pkg -r glade
 @unexec %D/bin/ghc-pkg -r sourceview
+@unexec %D/bin/ghc-pkg -r gconf
 @unexec /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old