Upgrade to 0.9.4

3 files changed, 133 insertions, 123 deletions

diff --git a/x11-toolkits/hs-gtk2hs/Makefile b/x11-toolkits/hs-gtk2hs/Makefile
index 218cad3f18ab..133d541d4bd3 100644
--- a/x11-toolkits/hs-gtk2hs/Makefile
+++ b/x11-toolkits/hs-gtk2hs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk2hs
-PORTVERSION=	0.9.3
+PORTVERSION=	0.9.4
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -25,4 +25,7 @@ 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}"
+
 .include <bsd.port.mk>
diff --git a/x11-toolkits/hs-gtk2hs/distinfo b/x11-toolkits/hs-gtk2hs/distinfo
index 0c806e20ab23..eac07927aa06 100644
--- a/x11-toolkits/hs-gtk2hs/distinfo
+++ b/x11-toolkits/hs-gtk2hs/distinfo
@@ -1 +1 @@
-MD5 (gtk2hs-0.9.3.tar.gz) = 7d3b79a4b5be03d0da81a2a33aa42914
+MD5 (gtk2hs-0.9.4.tar.gz) = b5d5c03e52d6895549d051b371d052a9
diff --git a/x11-toolkits/hs-gtk2hs/pkg-plist b/x11-toolkits/hs-gtk2hs/pkg-plist
index a5a3b86daa64..7efc79d749af 100644
--- a/x11-toolkits/hs-gtk2hs/pkg-plist
+++ b/x11-toolkits/hs-gtk2hs/pkg-plist
@@ -1,130 +1,137 @@
-lib/gtk2hs/gtk2.conf
-lib/gtk2hs/hi/AccelLabel.hi
-lib/gtk2hs/hi/Adjustment.hi
-lib/gtk2hs/hi/Alignment.hi
-lib/gtk2hs/hi/Arrow.hi
-lib/gtk2hs/hi/AspectFrame.hi
-lib/gtk2hs/hi/Box.hi
-lib/gtk2hs/hi/Button.hi
-lib/gtk2hs/hi/Calendar.hi
-lib/gtk2hs/hi/CellRenderer.hi
-lib/gtk2hs/hi/CellRendererPixbuf.hi
-lib/gtk2hs/hi/CellRendererText.hi
-lib/gtk2hs/hi/CellRendererToggle.hi
-lib/gtk2hs/hi/CheckButton.hi
-lib/gtk2hs/hi/CheckMenuItem.hi
-lib/gtk2hs/hi/Combo.hi
-lib/gtk2hs/hi/Container.hi
-lib/gtk2hs/hi/Container_stub.h
-lib/gtk2hs/hi/Dialog.hi
-lib/gtk2hs/hi/DrawWindow.hi
-lib/gtk2hs/hi/Drawable.hi
-lib/gtk2hs/hi/DrawingArea.hi
-lib/gtk2hs/hi/Embedding.hi
-lib/gtk2hs/hi/Entry.hi
-lib/gtk2hs/hi/Enums.hi
-lib/gtk2hs/hi/EventBox.hi
-lib/gtk2hs/hi/Events.hi
-lib/gtk2hs/hi/FileSel.hi
-lib/gtk2hs/hi/Frame.hi
-lib/gtk2hs/hi/GC.hi
-lib/gtk2hs/hi/GList.hi
-lib/gtk2hs/hi/GObject.hi
-lib/gtk2hs/hi/GObject_stub.h
-lib/gtk2hs/hi/GType.hi
-lib/gtk2hs/hi/GValue.hi
-lib/gtk2hs/hi/GValueTypes.hi
-lib/gtk2hs/hi/GdkEnums.hi
-lib/gtk2hs/hi/General.hi
-lib/gtk2hs/hi/General_stub.h
-lib/gtk2hs/hi/Gtk.hi
-lib/gtk2hs/hi/HBox.hi
-lib/gtk2hs/hi/HPaned.hi
-lib/gtk2hs/hi/HScale.hi
-lib/gtk2hs/hi/HScrollbar.hi
-lib/gtk2hs/hi/HSeparator.hi
-lib/gtk2hs/hi/HandleBox.hi
-lib/gtk2hs/hi/Hierarchy.hi
-lib/gtk2hs/hi/IconFactory.hi
-lib/gtk2hs/hi/Image.hi
-lib/gtk2hs/hi/ImageMenuItem.hi
-lib/gtk2hs/hi/Keys.hi
-lib/gtk2hs/hi/Label.hi
-lib/gtk2hs/hi/Layout.hi
-lib/gtk2hs/hi/ListStore.hi
-lib/gtk2hs/hi/LocalControl.hi
-lib/gtk2hs/hi/LocalData.hi
-lib/gtk2hs/hi/Markup.hi
-lib/gtk2hs/hi/Menu.hi
-lib/gtk2hs/hi/MenuBar.hi
-lib/gtk2hs/hi/MenuItem.hi
-lib/gtk2hs/hi/MenuShell.hi
-lib/gtk2hs/hi/Misc.hi
-lib/gtk2hs/hi/Notebook.hi
-lib/gtk2hs/hi/Object.hi
-lib/gtk2hs/hi/OptionMenu.hi
-lib/gtk2hs/hi/Paned.hi
-lib/gtk2hs/hi/PangoLayout.hi
-lib/gtk2hs/hi/PangoTypes.hi
-lib/gtk2hs/hi/Pixbuf.hi
-lib/gtk2hs/hi/Plug.hi
-lib/gtk2hs/hi/ProgressBar.hi
-lib/gtk2hs/hi/RadioButton.hi
-lib/gtk2hs/hi/RadioMenuItem.hi
-lib/gtk2hs/hi/Range.hi
-lib/gtk2hs/hi/Region.hi
-lib/gtk2hs/hi/Rendering.hi
-lib/gtk2hs/hi/Scale.hi
-lib/gtk2hs/hi/Scrollbar.hi
-lib/gtk2hs/hi/ScrolledWindow.hi
-lib/gtk2hs/hi/Separator.hi
-lib/gtk2hs/hi/Signal.hi
-lib/gtk2hs/hi/Signal_stub.h
-lib/gtk2hs/hi/Socket.hi
-lib/gtk2hs/hi/SpinButton.hi
-lib/gtk2hs/hi/Statusbar.hi
-lib/gtk2hs/hi/StockItems.hi
-lib/gtk2hs/hi/StoreValue.hi
-lib/gtk2hs/hi/Structs.hi
-lib/gtk2hs/hi/Style.hi
-lib/gtk2hs/hi/Table.hi
-lib/gtk2hs/hi/TearoffMenuItem.hi
-lib/gtk2hs/hi/TextBuffer.hi
-lib/gtk2hs/hi/TextIter.hi
-lib/gtk2hs/hi/TextIter_stub.h
-lib/gtk2hs/hi/TextMark.hi
-lib/gtk2hs/hi/TextTag.hi
-lib/gtk2hs/hi/TextTagTable.hi
-lib/gtk2hs/hi/TextView.hi
-lib/gtk2hs/hi/ToggleButton.hi
-lib/gtk2hs/hi/Toolbar.hi
-lib/gtk2hs/hi/Tooltips.hi
-lib/gtk2hs/hi/TreeModel.hi
-lib/gtk2hs/hi/TreeModelSort.hi
-lib/gtk2hs/hi/TreeSelection.hi
-lib/gtk2hs/hi/TreeSelection_stub.h
-lib/gtk2hs/hi/TreeStore.hi
-lib/gtk2hs/hi/TreeView.hi
-lib/gtk2hs/hi/TreeViewColumn.hi
-lib/gtk2hs/hi/TreeView_stub.h
-lib/gtk2hs/hi/UTFCForeign.hi
-lib/gtk2hs/hi/VBox.hi
-lib/gtk2hs/hi/VPaned.hi
-lib/gtk2hs/hi/VScale.hi
-lib/gtk2hs/hi/VScrollbar.hi
-lib/gtk2hs/hi/VSeparator.hi
-lib/gtk2hs/hi/Viewport.hi
-lib/gtk2hs/hi/Widget.hi
-lib/gtk2hs/hi/Window.hi
-lib/gtk2hs/libgtk2hs.a
+lib/gtk2.conf
+lib/gtk2hs.o
+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/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/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/libgtk2hs.a
 lib/libmogul.a
 lib/mogul.conf
+lib/mogul.o
 @dirrm lib/hi
-@dirrm lib/gtk2hs/hi
-@dirrm lib/gtk2hs
+@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 /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 /bin/rm -f %D/lib/ghc-%%GHC_VERSION%%/package.conf.old