- Update to 0.90.0.1

Obtained from:	FreeBSD Haskell

10 files changed, 30 insertions, 33 deletions

diff --git a/x11-toolkits/hs-wx/Makefile b/x11-toolkits/hs-wx/Makefile
index f2dbaf73498..09da037f0c1 100644
--- a/x11-toolkits/hs-wx/Makefile
+++ b/x11-toolkits/hs-wx/Makefile
@@ -6,18 +6,17 @@
 #
 
 PORTNAME=	wx
-PORTVERSION=	0.13.2.1
-PORTREVISION=	1
+PORTVERSION=	0.90.0.1
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	wxHaskell
 
+USE_CABAL=	stm wxcore>=0.90
 
-USE_CABAL=	stm wxcore>=0.13.1
-
-BUILD_DEPENDS+=	wxgtk2-unicode>=2.8:${PORTSDIR}/x11-toolkits/wxgtk28-unicode \
-		wxgtk2-unicode-contrib>=2.8:${PORTSDIR}/x11-toolkits/wxgtk28-unicode-contrib
+USE_WX=		2.9
+WX_COMPS=	wx
+WX_UNICODE=	yes
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/x11-toolkits/hs-wx/distinfo b/x11-toolkits/hs-wx/distinfo
index c213ebd3350..de00bac3e88 100644
--- a/x11-toolkits/hs-wx/distinfo
+++ b/x11-toolkits/hs-wx/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wx-0.13.2.1.tar.gz) = 7bd91026c81ac0833ed78bcfa1639a7945965315c1fd7afe86ca881bb3aeb268
-SIZE (cabal/wx-0.13.2.1.tar.gz) = 47690
+SHA256 (cabal/wx-0.90.0.1.tar.gz) = 150d448988afe0914aebb7bd61d58a27d12dd857e3d79e128ddf33a9f5a5db84
+SIZE (cabal/wx-0.90.0.1.tar.gz) = 47811
diff --git a/x11-toolkits/hs-wx/pkg-descr b/x11-toolkits/hs-wx/pkg-descr
index d94efdfca4d..25ee84bb643 100644
--- a/x11-toolkits/hs-wx/pkg-descr
+++ b/x11-toolkits/hs-wx/pkg-descr
@@ -1,6 +1,6 @@
 wxHaskell is a portable and native GUI library for Haskell.  It is built
 on top of wxWidgets - a comprehensive C++ library that is portable
 across all major GUI platforms; including GTK, Windows, X11, and MacOS
-X.  This version works with wxWidgets 2.8 and 2.9.
+X.  This version works with wxWidgets 2.9 only.
 
 WWW:	http://haskell.org/haskellwiki/WxHaskell
diff --git a/x11-toolkits/hs-wxcore/Makefile b/x11-toolkits/hs-wxcore/Makefile
index 7cfa90ae143..3ba467d9901 100644
--- a/x11-toolkits/hs-wxcore/Makefile
+++ b/x11-toolkits/hs-wxcore/Makefile
@@ -6,20 +6,19 @@
 #
 
 PORTNAME=	wxcore
-PORTVERSION=	0.13.2.1
-PORTREVISION=	1
+PORTVERSION=	0.90.0.1
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
 COMMENT=	wxHaskell core
 
-
 CABAL_SETUP=	Setup.hs
 
-USE_CABAL=	parsec stm wxdirect>0.12.1.2
+USE_CABAL=	parsec stm wxc>=0.90 wxdirect>=0.90
 
-BUILD_DEPENDS+=	wxgtk2-unicode>=2.8:${PORTSDIR}/x11-toolkits/wxgtk28-unicode \
-		wxgtk2-unicode-contrib>=2.8:${PORTSDIR}/x11-toolkits/wxgtk28-unicode-contrib
+USE_WX=		2.9
+WX_COMPS=	wx
+WX_UNICODE=	yes
 
 .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk"
 .include <bsd.port.mk>
diff --git a/x11-toolkits/hs-wxcore/distinfo b/x11-toolkits/hs-wxcore/distinfo
index e53b61e7dc2..25bff7fc624 100644
--- a/x11-toolkits/hs-wxcore/distinfo
+++ b/x11-toolkits/hs-wxcore/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxcore-0.13.2.1.tar.gz) = 26a615a594f3733d79205dafd5e3e00649284c6b5a3dcd35b4db5fc1fb4e0d5c
-SIZE (cabal/wxcore-0.13.2.1.tar.gz) = 539205
+SHA256 (cabal/wxcore-0.90.0.1.tar.gz) = f80e97e8488c3d98320be1f60b66c1da937090ca8223159c185cae02d021290c
+SIZE (cabal/wxcore-0.90.0.1.tar.gz) = 355766
diff --git a/x11-toolkits/hs-wxcore/files/patch-Setup.hs b/x11-toolkits/hs-wxcore/files/patch-Setup.hs
index 6d57db2b524..a319b4b4fe1 100644
--- a/x11-toolkits/hs-wxcore/files/patch-Setup.hs
+++ b/x11-toolkits/hs-wxcore/files/patch-Setup.hs
@@ -1,11 +1,10 @@
---- ./Setup.hs.orig	2012-02-07 08:27:09.000000000 +0100
-+++ ./Setup.hs	2012-02-15 09:35:23.000000000 +0100
-@@ -56,7 +56,7 @@
-         wx_cfg_parms = if os == "mingw32"

-                        then [ "--unicode", "--libs", "gl,stc", "--cppflags" ]

-                        else [ "--libs", "std,gl,stc,xrc,richtext,aui,media", "--cppflags" ]

--    wx  <- fmap parseWxConfig (readProcess "wx-config" wx_cfg_parms "")

-+    wx  <- fmap parseWxConfig (readProcess "wxgtk2u-2.8-config" wx_cfg_parms "")

-     lbi <- confHook simpleUserHooks (pkg0, pbi) flags

+--- ./Setup.hs.orig	2012-04-13 14:40:36.000000000 +0200
++++ ./Setup.hs	2012-05-13 20:41:08.000000000 +0200
+@@ -66,7 +66,6 @@
  

-     let lpd   = localPkgDescr lbi

+     let libbi' = libbi

+           { extraLibDirs = extraLibDirs libbi ++ [wxcDirectory]

+-          , extraLibs    = extraLibs    libbi ++ ["wxc"]

+           , ldOptions    = ldOptions    libbi ++ ["-Wl,-rpath," ++ wxcDirectory]  }

+ 

+     let lib' = lib { libBuildInfo = libbi' }

diff --git a/x11-toolkits/hs-wxcore/pkg-descr b/x11-toolkits/hs-wxcore/pkg-descr
index 315487644f5..865dd7d51f8 100644
--- a/x11-toolkits/hs-wxcore/pkg-descr
+++ b/x11-toolkits/hs-wxcore/pkg-descr
@@ -1,7 +1,7 @@
 wxHaskell is a portable and native GUI library for Haskell.  It is built
 on top of wxWidgets, a comprehensive C++ library that is portable across
 all major GUI platforms, including GTK, Windows, X11, and MacOS X.  This
-version works with wxWidgets 2.8 only.  Distributed under the WXWINDOWS
+version works with wxWidgets 2.9 only.  Distributed under the WXWINDOWS
 LIBRARY LICENSE.  Please see LICENSE file, but note that this is
 essentially LGPL with an exception allowing binary distribution of
 proprietary software.  This is the same license as wxWidgets itself
diff --git a/x11-toolkits/hs-wxdirect/Makefile b/x11-toolkits/hs-wxdirect/Makefile
index 85b3d32ed83..81f69aac4aa 100644
--- a/x11-toolkits/hs-wxdirect/Makefile
+++ b/x11-toolkits/hs-wxdirect/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	wxdirect
-PORTVERSION=	0.13.1.1
+PORTVERSION=	0.90.0.1
 CATEGORIES=	x11-toolkits haskell
 
 MAINTAINER=	haskell@FreeBSD.org
@@ -16,7 +16,7 @@ LICENSE=	BSD
 
 CABAL_SETUP=	Setup.hs
 
-USE_CABAL=	parsec>=2.1.0 strict>=0.3
+USE_CABAL=	parsec>=2.1.0 strict
 
 EXECUTABLE=	wxdirect
 
diff --git a/x11-toolkits/hs-wxdirect/distinfo b/x11-toolkits/hs-wxdirect/distinfo
index 8d59faf24fd..938dccea2c8 100644
--- a/x11-toolkits/hs-wxdirect/distinfo
+++ b/x11-toolkits/hs-wxdirect/distinfo
@@ -1,2 +1,2 @@
-SHA256 (cabal/wxdirect-0.13.1.1.tar.gz) = 4d65f57523e17d824333b2058b1113273efe312bc238d335a22b9f0a4592f103
-SIZE (cabal/wxdirect-0.13.1.1.tar.gz) = 32731
+SHA256 (cabal/wxdirect-0.90.0.1.tar.gz) = 237b377387f2b9375d42abbb791001ddc07fa36d990b8720372f00c3fba35a12
+SIZE (cabal/wxdirect-0.90.0.1.tar.gz) = 31211
diff --git a/x11-toolkits/hs-wxdirect/pkg-descr b/x11-toolkits/hs-wxdirect/pkg-descr
index 331ac4c6a83..efb14c33885 100644
--- a/x11-toolkits/hs-wxdirect/pkg-descr
+++ b/x11-toolkits/hs-wxdirect/pkg-descr
@@ -1,6 +1,6 @@
 wxHaskell is a portable and native GUI library for Haskell.  It is built
 on top of wxWidgets, a comprehensive C++ library that is portable across
 all major GUI platforms, including GTK, Windows, X11, and MacOS X.  This
-version works with wxWidgets 2.8 only.
+version works with wxWidgets 2.9 only.
 
 WWW:	http://haskell.org/haskellwiki/WxHaskell