* Upgrade to 0.15.2.

* Build with iHaskell enabled by default now. To disable define
  WITHOUT_IHASKELL.

4 files changed, 105 insertions, 19 deletions

diff --git a/x11-toolkits/hs-gtk+hs/Makefile b/x11-toolkits/hs-gtk+hs/Makefile
index dbb494acae14..d94985211470 100644
--- a/x11-toolkits/hs-gtk+hs/Makefile
+++ b/x11-toolkits/hs-gtk+hs/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	gtk+hs
-PORTVERSION=	0.14.10
+PORTVERSION=	0.15.2
 CATEGORIES=	x11-toolkits haskell
 MASTER_SITES=	http://www.cse.unsw.edu.au/~chak/haskell/gtk/
 PKGNAMEPREFIX=	hs-
@@ -18,7 +18,7 @@ BUILD_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		c2hs:${PORTSDIR}/devel/hs-c2hs
 RUN_DEPENDS=	ghc:${PORTSDIR}/lang/ghc \
 		c2hs:${PORTSDIR}/devel/hs-c2hs
-.if defined(WITH_IHASKELL)
+.if !defined(WITHOUT_IHASKELL)
 RUN_DEPENDS+=	ports-config:${PORTSDIR}/devel/hs-hpl
 .endif
 
@@ -30,15 +30,15 @@ HAS_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --enable-add-package
-.if defined(WITH_IHASKELL)
+.if !defined(WITHOUT_IHASKELL)
 CONFIGURE_ARGS+=	--with-ih
 .endif
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 pre-everything::
-.if !defined(WITH_IHASKELL)
-	@${ECHO_CMD} "To build gtk+hs with iHaskell define WITH_IHASKELL."
+.if !defined(WITHOUT_IHASKELL)
+	@${ECHO_CMD} "To build gtk+hs without iHaskell define WITHOUT_IHASKELL."
 .endif
 
 post-patch:
diff --git a/x11-toolkits/hs-gtk+hs/distinfo b/x11-toolkits/hs-gtk+hs/distinfo
index 92122b00ce54..a6ff0ed39828 100644
--- a/x11-toolkits/hs-gtk+hs/distinfo
+++ b/x11-toolkits/hs-gtk+hs/distinfo
@@ -1 +1 @@
-MD5 (gtk+hs-0.14.10.tar.gz) = 9e17c1f39b235586d2713efb91e017e7
+MD5 (gtk+hs-0.15.2.tar.gz) = c630f4283e7f7f436099ac750375eefb
diff --git a/x11-toolkits/hs-gtk+hs/files/patch-Makefile b/x11-toolkits/hs-gtk+hs/files/patch-Makefile
deleted file mode 100644
index 993873f806b2..000000000000
--- a/x11-toolkits/hs-gtk+hs/files/patch-Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.orig	Sun Sep 22 23:12:57 2002
-+++ Makefile	Sun Sep 22 23:14:03 2002
-@@ -184,7 +184,7 @@
- endif
- ifeq ($(ENABLE_ADD_PACKAGE),yes)
- 	$(DESTDIR)$(bindir)/gtkhs-config --package-conf\
--	| $(GHCPKG) --add-package
-+	| $(GHCPKG) --update-package --auto-ghci-libs
- endif
- 
- # admin targets
diff --git a/x11-toolkits/hs-gtk+hs/pkg-plist b/x11-toolkits/hs-gtk+hs/pkg-plist
index 787ba5a68c28..9e29fc6d1ade 100644
--- a/x11-toolkits/hs-gtk+hs/pkg-plist
+++ b/x11-toolkits/hs-gtk+hs/pkg-plist
@@ -12,7 +12,9 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkDrawable.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkEvents.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkFont.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkGC.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkImage.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkPixmap.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkRGB.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkTypes.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkVisual.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk/GdkWindow.hi
@@ -32,6 +34,7 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkAlignment.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkBin.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkBox.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkButton.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkButtonBox.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCList.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCListSignal.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkCTree.hi
@@ -51,6 +54,7 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkFileSel.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkFrame.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHandleBox.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHBox.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHButtonBox.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHPaned.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHScale.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkHScrollbar.hi
@@ -86,6 +90,7 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkScrollbar.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkScrolledWindow.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkSeparator.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkSignal.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkSpinButton.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkStatusbar.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkStyle.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTable.hi
@@ -97,6 +102,7 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTreeItem.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTreeItemSignal.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkTypeUtils.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVBox.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVButtonBox.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVPaned.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVScale.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVScrollbar.hi
@@ -105,20 +111,110 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkVersion.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkViewport.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkWidget.hi
 lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gtk/GtkWindow.hi
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GLib.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GList.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GModule.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GThread.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GTimer.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GTypes.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/Gdk.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkColor.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkDrawable.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkEvents.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkFont.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkGC.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkImage.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkPixmap.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkRGB.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkTypes.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkVisual.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GdkWindow.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkAdjustmentSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkAccelGroup.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkAdjustment.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkAdjustmentSignal.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkAlignment.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkBin.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkButton.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkButton_stub.h
-lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCheckMenuItemSignal_stub.h
-lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCListSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkButtonBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCList.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCList_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCListSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCTree.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCTree_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCheckButton.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCheckMenuItem.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCheckMenuItemSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkCombo.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkContainer.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkData.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkDrawingArea.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEditable.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEditable_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEntry.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEnums.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkEventBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkFileSel.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkFrame.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHButtonBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHPaned.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHScale.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHScrollbar.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHSeparator.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkHandleBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkItem.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkItemSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkLabel.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkList.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkListItem.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkListSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMain.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMainSignal.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMenu.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMenuBar.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMenuItem.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMenuItemSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkMisc.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkNotebook.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkObject.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkObjectSignal_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkOptionMenu.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkPaned.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkPixmap.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkProgress.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkProgressBar.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkRadioButton.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkRadioMenuItem.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkRange.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkRuler.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkScale.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkScrollbar.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkScrolledWindow.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkSeparator.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkSignal.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkSpinButton.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkStatusbar.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkStyle.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTable.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkText.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkToggleButton.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkToggleButton_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTooltips.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTree.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTreeItem.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTreeItemSignal_stub.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkTypeUtils_stub.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkVBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkVButtonBox.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkVPaned.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkVScale.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkVScrollbar.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkVSeparator.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkViewport.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkWidget.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkWidget_stub.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gMarsh.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkAdjustment.h
@@ -131,6 +227,7 @@ lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkToggleButton.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkTooltips.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/gtkWidget.h
 lib/gtk+hs-%%PORTVERSION%%/ghc5/include/haskell.h
+lib/gtk+hs-%%PORTVERSION%%/ghc5/include/GtkWindow.h
 @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/include
 @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/import/gdk
 @dirrm lib/gtk+hs-%%PORTVERSION%%/ghc5/import/glib