Index: head/x11-toolkits/hs-wx/Makefile =================================================================== --- head/x11-toolkits/hs-wx/Makefile (revision 298310) +++ head/x11-toolkits/hs-wx/Makefile (revision 298311) @@ -1,23 +1,22 @@ # New ports collection makefile for: hs-wx # Date created: January 26, 2012 # Whom: haskell@FreeBSD.org # # $FreeBSD$ # 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 Property changes on: head/x11-toolkits/hs-wx/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11-toolkits/hs-wx/distinfo =================================================================== --- head/x11-toolkits/hs-wx/distinfo (revision 298310) +++ head/x11-toolkits/hs-wx/distinfo (revision 298311) @@ -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 Property changes on: head/x11-toolkits/hs-wx/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wx/pkg-descr =================================================================== --- head/x11-toolkits/hs-wx/pkg-descr (revision 298310) +++ head/x11-toolkits/hs-wx/pkg-descr (revision 298311) @@ -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 Property changes on: head/x11-toolkits/hs-wx/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wxcore/Makefile =================================================================== --- head/x11-toolkits/hs-wxcore/Makefile (revision 298310) +++ head/x11-toolkits/hs-wxcore/Makefile (revision 298311) @@ -1,25 +1,24 @@ # New ports collection makefile for: hs-wxcore # Date created: January 26, 2012 # Whom: haskell@FreeBSD.org # # $FreeBSD$ # 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 Property changes on: head/x11-toolkits/hs-wxcore/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.2 \ No newline at end of property +1.3 \ No newline at end of property Index: head/x11-toolkits/hs-wxcore/distinfo =================================================================== --- head/x11-toolkits/hs-wxcore/distinfo (revision 298310) +++ head/x11-toolkits/hs-wxcore/distinfo (revision 298311) @@ -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 Property changes on: head/x11-toolkits/hs-wxcore/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wxcore/files/patch-Setup.hs =================================================================== --- head/x11-toolkits/hs-wxcore/files/patch-Setup.hs (revision 298310) +++ head/x11-toolkits/hs-wxcore/files/patch-Setup.hs (revision 298311) @@ -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' } Property changes on: head/x11-toolkits/hs-wxcore/files/patch-Setup.hs ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wxcore/pkg-descr =================================================================== --- head/x11-toolkits/hs-wxcore/pkg-descr (revision 298310) +++ head/x11-toolkits/hs-wxcore/pkg-descr (revision 298311) @@ -1,10 +1,10 @@ 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 uses. WWW: http://haskell.org/haskellwiki/WxHaskell Property changes on: head/x11-toolkits/hs-wxcore/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wxdirect/Makefile =================================================================== --- head/x11-toolkits/hs-wxdirect/Makefile (revision 298310) +++ head/x11-toolkits/hs-wxdirect/Makefile (revision 298311) @@ -1,24 +1,24 @@ # New ports collection makefile for: hs-wxdirect # Date created: January 26, 2012 # Whom: haskell@FreeBSD.org # # $FreeBSD$ # PORTNAME= wxdirect -PORTVERSION= 0.13.1.1 +PORTVERSION= 0.90.0.1 CATEGORIES= x11-toolkits haskell MAINTAINER= haskell@FreeBSD.org COMMENT= Helper tool for building wxHaskell LICENSE= BSD CABAL_SETUP= Setup.hs -USE_CABAL= parsec>=2.1.0 strict>=0.3 +USE_CABAL= parsec>=2.1.0 strict EXECUTABLE= wxdirect .include "${.CURDIR}/../../lang/ghc/bsd.cabal.mk" .include Property changes on: head/x11-toolkits/hs-wxdirect/Makefile ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wxdirect/distinfo =================================================================== --- head/x11-toolkits/hs-wxdirect/distinfo (revision 298310) +++ head/x11-toolkits/hs-wxdirect/distinfo (revision 298311) @@ -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 Property changes on: head/x11-toolkits/hs-wxdirect/distinfo ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property Index: head/x11-toolkits/hs-wxdirect/pkg-descr =================================================================== --- head/x11-toolkits/hs-wxdirect/pkg-descr (revision 298310) +++ head/x11-toolkits/hs-wxdirect/pkg-descr (revision 298311) @@ -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 Property changes on: head/x11-toolkits/hs-wxdirect/pkg-descr ___________________________________________________________________ Modified: cvs2svn:cvs-rev ## -1 +1 ## -1.1 \ No newline at end of property +1.2 \ No newline at end of property