On Fri, Jul 13, 2012 at 03:52:23PM +0200, Matthias Kilian wrote:
> Some of the patches were broken (they contained cvs conflicts),
> some additioal ports still need fixes. I'll send a diff later this
> day:
>
> devel/hasktags update to 0.68.2
> devel/gmc4cc fix some import decls
>
> devel/hs-comonad remove conflict
> devel/hs-semigroupoids remove conflict
> security/hs-crypto remove conflict
> devel/hs-comonad-transformers remove conflict
> devel/hs-data-lens remove conflict
>
> devel/hs-tar update to 0.3.2.0 (not 0.4.0.0!)
>
> devel/darcs fix
Here they are. Unfortunately, I don't yet have fixes for devel/bustle,
language/feldspar/*, net/hpodder and x11/xmobar, which I'm marking
as broken for now (and cc'd the people involved with those ports).
Please note that I'm not going to commit any of the Haskell updates
before sunday.
Ciao,
Kili
Index: devel/bustle/Makefile
===================================================================
RCS file: /cvs/ports/devel/bustle/Makefile,v
retrieving revision 1.5
diff -u -p -r1.5 Makefile
--- devel/bustle/Makefile 27 Dec 2011 21:10:55 -0000 1.5
+++ devel/bustle/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,6 +2,8 @@
COMMENT= D-Bus profiler
+BROKEN= Does not build with ghc-7.4
+
DISTNAME= bustle-0.2.3
REVISION= 3
CATEGORIES= devel
Index: devel/darcs/Makefile
===================================================================
RCS file: /cvs/ports/devel/darcs/Makefile,v
retrieving revision 1.47
diff -u -p -r1.47 Makefile
--- devel/darcs/Makefile 13 May 2012 21:27:38 -0000 1.47
+++ devel/darcs/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = advanced revision control system written in Haskell
-DISTNAME = darcs-2.8.0
-REVISION = 0
+DISTNAME = darcs-2.8.1
CATEGORIES = devel
HOMEPAGE = http://www.darcs.net/
@@ -22,7 +21,7 @@ BUILD_DEPENDS = archivers/hs-zlib>=0.5.
devel/hs-hashed-storage>=0.5.6,<0.6 \
devel/hs-haskeline>=0.6.3,<0.7 \
devel/hs-mmap>=0.5,<0.6 \
- devel/hs-mtl>=1.0,<2.1 \
+ devel/hs-mtl>=1.0,<2.2 \
devel/hs-network>=2.2,<2.4 \
devel/hs-parsec>=2.0,<3.2 \
devel/hs-regex-compat=0.95.1 \
Index: devel/darcs/distinfo
===================================================================
RCS file: /cvs/ports/devel/darcs/distinfo,v
retrieving revision 1.24
diff -u -p -r1.24 distinfo
--- devel/darcs/distinfo 9 May 2012 21:00:20 -0000 1.24
+++ devel/darcs/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/darcs-2.8.0.tar.gz) = IFQwxnE8ETqJqQs5P1hXaQ==
-RMD160 (ghc/darcs-2.8.0.tar.gz) = XLcRbPJ34hKJW45ERhX5Z8yZGa0=
-SHA1 (ghc/darcs-2.8.0.tar.gz) = T89GlD6fxyrx1OKZxnzYGulVL2Q=
-SHA256 (ghc/darcs-2.8.0.tar.gz) = FBXCoamduM921fMfajSQoqnT4T8qv8xn/BCIhc9SzoM=
-SIZE (ghc/darcs-2.8.0.tar.gz) = 1297733
+MD5 (ghc/darcs-2.8.1.tar.gz) = y3CYn0ARwcmCaiZmIugwTA==
+RMD160 (ghc/darcs-2.8.1.tar.gz) = aXFA8aeCxL8fy3x7dimGJcihBn8=
+SHA1 (ghc/darcs-2.8.1.tar.gz) = FQxMH3weHk2eogofRPogCq0wrPw=
+SHA256 (ghc/darcs-2.8.1.tar.gz) = oeWtMUa29zi6FiYj8n+3BJjmgsKxFC84+A4sGH+a6bs=
+SIZE (ghc/darcs-2.8.1.tar.gz) = 1293098
Index: devel/gmc4cc/Makefile
===================================================================
RCS file: /cvs/ports/devel/gmc4cc/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/gmc4cc/Makefile 27 Dec 2011 21:16:03 -0000 1.3
+++ devel/gmc4cc/Makefile 13 Jul 2012 15:47:59 -0000
@@ -5,7 +5,7 @@ COMMENT= C compiler for GMC-4
DISTNAME= gmc4cc-0.6.2
CATEGORIES= devel lang
-REVISION= 1
+REVISION= 2
# Japanese, use this for the English version: http://goo.gl/LPtgg
HOMEPAGE= http://terus.jp/engineering/gmc4cc/
@@ -26,7 +26,7 @@ DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
MODULES= converters/libiconv
-WANTLIB += c gmp m pthread util
+WANTLIB += c gmp m
BUILD_DEPENDS= lang/ghc
LIB_DEPENDS= devel/gmp
Index: devel/gmc4cc/patches/patch-Assembler_hs
===================================================================
RCS file: devel/gmc4cc/patches/patch-Assembler_hs
diff -N devel/gmc4cc/patches/patch-Assembler_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gmc4cc/patches/patch-Assembler_hs 13 Jul 2012 15:47:59 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Assembler.hs.orig Thu Jul 23 09:52:53 2009
++++ Assembler.hs Fri Jul 13 14:27:41 2012
+@@ -1,6 +1,6 @@
+ module Assembler where
+
+-import Char
++import Data.Char
+
+ import Lexer
+ import Instruction
Index: devel/gmc4cc/patches/patch-AssemblyParser_hs
===================================================================
RCS file: devel/gmc4cc/patches/patch-AssemblyParser_hs
diff -N devel/gmc4cc/patches/patch-AssemblyParser_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gmc4cc/patches/patch-AssemblyParser_hs 13 Jul 2012 15:47:59
-0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- AssemblyParser.hs.orig Thu Jul 23 07:47:44 2009
++++ AssemblyParser.hs Fri Jul 13 14:27:24 2012
+@@ -1,7 +1,7 @@
+ module AssemblyParser where
+
+-import Char
+-import List
++import Data.Char
++import Data.List
+
+ import Lexer
+ import Instruction
Index: devel/gmc4cc/patches/patch-Emitter_hs
===================================================================
RCS file: devel/gmc4cc/patches/patch-Emitter_hs
diff -N devel/gmc4cc/patches/patch-Emitter_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gmc4cc/patches/patch-Emitter_hs 13 Jul 2012 15:47:59 -0000
@@ -0,0 +1,11 @@
+$OpenBSD$
+--- Emitter.hs.orig Thu Jul 23 17:38:50 2009
++++ Emitter.hs Fri Jul 13 14:27:57 2012
+@@ -1,6 +1,6 @@
+ module Emitter where
+
+-import List
++import Data.List
+
+ import Lexer
+ import Parser
Index: devel/gmc4cc/patches/patch-Lexer_hs
===================================================================
RCS file: devel/gmc4cc/patches/patch-Lexer_hs
diff -N devel/gmc4cc/patches/patch-Lexer_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gmc4cc/patches/patch-Lexer_hs 13 Jul 2012 15:47:59 -0000
@@ -0,0 +1,13 @@
+$OpenBSD$
+--- Lexer.hs.orig Thu Jul 23 09:03:44 2009
++++ Lexer.hs Fri Jul 13 14:26:49 2012
+@@ -1,7 +1,7 @@
+ module Lexer where
+
+-import Char
+-import List
++import Data.Char
++import Data.List
+
+ data Token =
+ TokenIdentifier String |
Index: devel/gmc4cc/patches/patch-Main_hs
===================================================================
RCS file: devel/gmc4cc/patches/patch-Main_hs
diff -N devel/gmc4cc/patches/patch-Main_hs
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ devel/gmc4cc/patches/patch-Main_hs 13 Jul 2012 15:47:59 -0000
@@ -0,0 +1,9 @@
+$OpenBSD$
+--- Main.hs.orig Sun Jul 19 12:41:15 2009
++++ Main.hs Fri Jul 13 14:28:12 2012
+@@ -1,4 +1,4 @@
+-import System
++import System.Environment
+
+ import Lexer
+ import Parser
Index: devel/hasktags/Makefile
===================================================================
RCS file: /cvs/ports/devel/hasktags/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/hasktags/Makefile 27 Dec 2011 21:19:10 -0000 1.3
+++ devel/hasktags/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = ctags-like tool for Haskell sources
-DISTNAME = hasktags-0.68.1
-REVISION = 1
+DISTNAME = hasktags-0.68.2
CATEGORIES = devel
MAINTAINER = Matthias Kilian <[email protected]>
Index: devel/hasktags/distinfo
===================================================================
RCS file: /cvs/ports/devel/hasktags/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/hasktags/distinfo 23 Apr 2011 20:22:30 -0000 1.2
+++ devel/hasktags/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/hasktags-0.68.1.tar.gz) = U4esB6Jz4I3/s+Og8D96Rg==
-RMD160 (ghc/hasktags-0.68.1.tar.gz) = tZbkbXh8WwykPZVpvuKGIUYmfLs=
-SHA1 (ghc/hasktags-0.68.1.tar.gz) = Fwfz+OAbe4xJXLHmX1vy8TLDIc4=
-SHA256 (ghc/hasktags-0.68.1.tar.gz) =
Ms6cj3gSFYzxVz1tpnAMPniHn4x7Tdh8nAPGwOXSkiY=
-SIZE (ghc/hasktags-0.68.1.tar.gz) = 8935
+MD5 (ghc/hasktags-0.68.2.tar.gz) = nT/KrVnDTRXJIFHHSsz1rA==
+RMD160 (ghc/hasktags-0.68.2.tar.gz) = YRLPUmZyR834cjibaJJqAxLl/3w=
+SHA1 (ghc/hasktags-0.68.2.tar.gz) = eoMGtS3NJnajtjrnUG4IMxvsT+c=
+SHA256 (ghc/hasktags-0.68.2.tar.gz) =
Wl9fzR0KR/0/kwowbw7kPoQB5Hry8mMHn1rBiuRGYlE=
+SIZE (ghc/hasktags-0.68.2.tar.gz) = 9542
Index: devel/hs-comonad/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-comonad/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/hs-comonad/Makefile 8 Jul 2012 22:36:40 -0000 1.3
+++ devel/hs-comonad/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = Haskell 98 comonads
-DISTNAME = comonad-1.1.1.1
-REVISION = 1
+DISTNAME = comonad-1.1.1.6
CATEGORIES = devel
# BSD3
@@ -16,8 +15,8 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-RUN_DEPENDS = devel/hs-transformers>=0.2.0,<0.3 \
- devel/hs-semigroups>=0.8,<0.9
+RUN_DEPENDS = devel/hs-transformers>=0.2.0,<0.4 \
+ devel/hs-semigroups>=0.8.3.1,<0.9
BUILD_DEPENDS = ${RUN_DEPENDS}
.include <bsd.port.mk>
Index: devel/hs-comonad/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-comonad/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/hs-comonad/distinfo 23 Jan 2012 21:02:56 -0000 1.1.1.1
+++ devel/hs-comonad/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/comonad-1.1.1.1.tar.gz) = pNzxoO/zjYOp8g67fdAOmA==
-RMD160 (ghc/comonad-1.1.1.1.tar.gz) = r4j+14hfXSia+zXxqloUsPJI1CU=
-SHA1 (ghc/comonad-1.1.1.1.tar.gz) = +DN1AlX/m3JaqbfWaoIjlGIKkgM=
-SHA256 (ghc/comonad-1.1.1.1.tar.gz) =
6kN+wvs8kWNfMr9VIPSLmFA4i2HU2EJ3LR8+o3yvEwc=
-SIZE (ghc/comonad-1.1.1.1.tar.gz) = 4198
+MD5 (ghc/comonad-1.1.1.6.tar.gz) = QQ+X9oaVktauco9X+DMflg==
+RMD160 (ghc/comonad-1.1.1.6.tar.gz) = KpSxCx/QK/o1KGN6ibyKXZOuI3o=
+SHA1 (ghc/comonad-1.1.1.6.tar.gz) = 2mqOy7CIAQRtZHGCxc50l8SJg0w=
+SHA256 (ghc/comonad-1.1.1.6.tar.gz) =
5WkP98ufmzP/Rs4RB+bQdEJ6IbOi0HtEdb+ONI664Ok=
+SIZE (ghc/comonad-1.1.1.6.tar.gz) = 4358
Index: devel/hs-comonad-transformers/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-comonad-transformers/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/hs-comonad-transformers/Makefile 8 Jul 2012 22:36:40 -0000
1.3
+++ devel/hs-comonad-transformers/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = Comonad transformers
-DISTNAME = comonad-transformers-2.0.2
-REVISION = 1
+DISTNAME = comonad-transformers-2.1.2
CATEGORIES = devel
# BSD3
@@ -16,12 +15,12 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-RUN_DEPENDS = devel/hs-comonad>=1.1,<1.2 \
- devel/hs-contravariant>=0.1.2,<0.2 \
- devel/hs-distributive>=0.2,<0.3 \
- devel/hs-semigroupoids>=1.2.6,<1.3 \
- devel/hs-semigroups>=0.8,<0.9 \
- devel/hs-transformers>=0.2.0,<=0.3
+RUN_DEPENDS = devel/hs-comonad>=1.1.1.5,<1.2 \
+ devel/hs-contravariant>=0.2.0.1,<0.3 \
+ devel/hs-distributive>=0.2.2,<0.3 \
+ devel/hs-semigroupoids>=1.3.1.2,<1.4 \
+ devel/hs-semigroups>=0.8.3.1,<0.9 \
+ devel/hs-transformers>=0.2,<0.4
BUILD_DEPENDS = ${RUN_DEPENDS}
Index: devel/hs-comonad-transformers/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-comonad-transformers/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/hs-comonad-transformers/distinfo 23 Jan 2012 21:05:45 -0000
1.1.1.1
+++ devel/hs-comonad-transformers/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/comonad-transformers-2.0.2.tar.gz) = S2BwwDK0KU3UpqDtx4mlBw==
-RMD160 (ghc/comonad-transformers-2.0.2.tar.gz) = wzoieHIZX/CmmwWyuL3oM4kPzLQ=
-SHA1 (ghc/comonad-transformers-2.0.2.tar.gz) = ccJCa8zSdyk493KmGM3t0qfHfi4=
-SHA256 (ghc/comonad-transformers-2.0.2.tar.gz) =
aDFg+8cWV8KT9A8OvhueL+5Cbu3DCnzL6eci20QOjTk=
-SIZE (ghc/comonad-transformers-2.0.2.tar.gz) = 8636
+MD5 (ghc/comonad-transformers-2.1.2.tar.gz) = Cbr5y7QaHTHmxdwXR6Tccw==
+RMD160 (ghc/comonad-transformers-2.1.2.tar.gz) = W8DPp0dU552uGnPripbW53e2Kyg=
+SHA1 (ghc/comonad-transformers-2.1.2.tar.gz) = IgnwIka3pIZxVYo0rkpbpspOE4E=
+SHA256 (ghc/comonad-transformers-2.1.2.tar.gz) =
Om5WhJC6qCESNuKkOYXqKk6VJ6dawuTQDS93bF3UF3o=
+SIZE (ghc/comonad-transformers-2.1.2.tar.gz) = 6235
Index: devel/hs-comonad-transformers/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/hs-comonad-transformers/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/hs-comonad-transformers/pkg/PLIST 23 Jan 2012 21:05:45 -0000
1.1.1.1
+++ devel/hs-comonad-transformers/pkg/PLIST 13 Jul 2012 15:47:59 -0000
@@ -6,24 +6,10 @@ lib/ghc/${DISTNAME}/Control/Comonad/Hois
lib/ghc/${DISTNAME}/Control/Comonad/Hoist/Class.hi
lib/ghc/${DISTNAME}/Control/Comonad/Trans/
lib/ghc/${DISTNAME}/Control/Comonad/Trans/Class.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Discont/
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Discont.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Discont/Lazy.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Discont/Memo.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Discont/Strict.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Env/
lib/ghc/${DISTNAME}/Control/Comonad/Trans/Env.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Env/Lazy.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Env/Strict.hi
lib/ghc/${DISTNAME}/Control/Comonad/Trans/Identity.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Store/
lib/ghc/${DISTNAME}/Control/Comonad/Trans/Store.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Store/Lazy.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Store/Memo.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Store/Strict.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Traced/
lib/ghc/${DISTNAME}/Control/Comonad/Trans/Traced.hi
-lib/ghc/${DISTNAME}/Control/Comonad/Trans/Traced/Memo.hi
lib/ghc/${DISTNAME}/Data/
lib/ghc/${DISTNAME}/Data/Functor/
lib/ghc/${DISTNAME}/Data/Functor/Composition.hi
@@ -39,19 +25,9 @@ share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
share/doc/hs-${DISTNAME}/html/Control-Comonad-Hoist-Class.html
share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Class.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Discont-Lazy.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Discont-Memo.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Discont-Strict.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Discont.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Env-Lazy.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Env-Strict.html
share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Env.html
share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Identity.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Store-Lazy.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Store-Memo.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Store-Strict.html
share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Store.html
-share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Traced-Memo.html
share/doc/hs-${DISTNAME}/html/Control-Comonad-Trans-Traced.html
share/doc/hs-${DISTNAME}/html/Data-Functor-Composition.html
share/doc/hs-${DISTNAME}/html/Data-Functor-Coproduct.html
@@ -64,19 +40,9 @@ share/doc/hs-${DISTNAME}/html/index-fram
share/doc/hs-${DISTNAME}/html/index.html
share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Hoist-Class.html
share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Class.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Discont-Lazy.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Discont-Memo.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Discont-Strict.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Discont.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Env-Lazy.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Env-Strict.html
share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Env.html
share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Identity.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Store-Lazy.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Store-Memo.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Store-Strict.html
share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Store.html
-share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Traced-Memo.html
share/doc/hs-${DISTNAME}/html/mini_Control-Comonad-Trans-Traced.html
share/doc/hs-${DISTNAME}/html/mini_Data-Functor-Composition.html
share/doc/hs-${DISTNAME}/html/mini_Data-Functor-Coproduct.html
Index: devel/hs-data-lens/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-data-lens/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- devel/hs-data-lens/Makefile 8 Jul 2012 22:36:40 -0000 1.3
+++ devel/hs-data-lens/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = Haskell 98 lenses
-DISTNAME = data-lens-2.0.2
-REVISION = 1
+DISTNAME = data-lens-2.9.0
CATEGORIES = devel
# BSD3
@@ -16,12 +15,12 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-RUN_DEPENDS = devel/hs-comonad>=1.1,<1.2 \
- devel/hs-comonad-transformers>=2.0,<2.1 \
- devel/hs-contravariant>=0.1.2,<0.2 \
- devel/hs-distributive>=0.2,<0.3 \
- devel/hs-semigroupoids>=1.2.4,<1.3 \
- devel/hs-transformers>=0.2.0,<=0.3
+RUN_DEPENDS = devel/hs-comonad>=1.1.1.3,<1.2 \
+ devel/hs-comonad-transformers>=2.0,<2.2 \
+ devel/hs-contravariant>=0.2.0.1,<0.3 \
+ devel/hs-distributive>=0.2.1,<0.3 \
+ devel/hs-semigroupoids>=1.2.4,<1.4 \
+ devel/hs-transformers>=0.2.0,<0.4
BUILD_DEPENDS = ${RUN_DEPENDS}
.include <bsd.port.mk>
Index: devel/hs-data-lens/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-data-lens/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/hs-data-lens/distinfo 23 Jan 2012 21:06:16 -0000 1.1.1.1
+++ devel/hs-data-lens/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/data-lens-2.0.2.tar.gz) = u+0EvbZfUOqco0vHiBhRJA==
-RMD160 (ghc/data-lens-2.0.2.tar.gz) = +lb6vyn7FdRAdubiIKPiAeBYhg0=
-SHA1 (ghc/data-lens-2.0.2.tar.gz) = UnwXWbUQULqmuFpEuB2T6422PQo=
-SHA256 (ghc/data-lens-2.0.2.tar.gz) =
LOm37bV08eijEzbefQ/Biai51hR2MrK0K/9R+n19CPU=
-SIZE (ghc/data-lens-2.0.2.tar.gz) = 3674
+MD5 (ghc/data-lens-2.9.0.tar.gz) = PKR5F0K0oeXTE+Bdy9nyOQ==
+RMD160 (ghc/data-lens-2.9.0.tar.gz) = CY/c+L2VY6+5cF26j3A6Op2EiNY=
+SHA1 (ghc/data-lens-2.9.0.tar.gz) = 7H7Cv7zWBYoMHNg/24ptruODfDQ=
+SHA256 (ghc/data-lens-2.9.0.tar.gz) =
YW6vZQbjg/r5ATDURvCpzu1oKVTLaigvzXu3Bxbipf8=
+SIZE (ghc/data-lens-2.9.0.tar.gz) = 5944
Index: devel/hs-data-lens/pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/hs-data-lens/pkg/PLIST,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PLIST
--- devel/hs-data-lens/pkg/PLIST 23 Jan 2012 21:06:16 -0000 1.1.1.1
+++ devel/hs-data-lens/pkg/PLIST 13 Jul 2012 15:47:59 -0000
@@ -1,9 +1,15 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2012/01/23 21:06:16 kili Exp $
lib/ghc/${DISTNAME}/
+lib/ghc/${DISTNAME}/Control/
+lib/ghc/${DISTNAME}/Control/Category/
+lib/ghc/${DISTNAME}/Control/Category/Product.hi
lib/ghc/${DISTNAME}/Data/
lib/ghc/${DISTNAME}/Data/Lens/
lib/ghc/${DISTNAME}/Data/Lens/Common.hi
lib/ghc/${DISTNAME}/Data/Lens/Lazy.hi
+lib/ghc/${DISTNAME}/Data/Lens/Partial/
+lib/ghc/${DISTNAME}/Data/Lens/Partial/Common.hi
+lib/ghc/${DISTNAME}/Data/Lens/Partial/Lazy.hi
lib/ghc/${DISTNAME}/Data/Lens/Strict.hi
lib/ghc/${DISTNAME}/HS${DISTNAME}.o
lib/ghc/${DISTNAME}/libHS${DISTNAME}.a
@@ -14,8 +20,11 @@ lib/ghc/${DISTNAME}/unregister.sh
share/doc/hs-${DISTNAME}/
share/doc/hs-${DISTNAME}/LICENSE
share/doc/hs-${DISTNAME}/html/
+share/doc/hs-${DISTNAME}/html/Control-Category-Product.html
share/doc/hs-${DISTNAME}/html/Data-Lens-Common.html
share/doc/hs-${DISTNAME}/html/Data-Lens-Lazy.html
+share/doc/hs-${DISTNAME}/html/Data-Lens-Partial-Common.html
+share/doc/hs-${DISTNAME}/html/Data-Lens-Partial-Lazy.html
share/doc/hs-${DISTNAME}/html/Data-Lens-Strict.html
share/doc/hs-${DISTNAME}/html/data-lens.haddock
share/doc/hs-${DISTNAME}/html/doc-index.html
@@ -24,8 +33,11 @@ share/doc/hs-${DISTNAME}/html/haddock-ut
share/doc/hs-${DISTNAME}/html/hslogo-16.png
share/doc/hs-${DISTNAME}/html/index-frames.html
share/doc/hs-${DISTNAME}/html/index.html
+share/doc/hs-${DISTNAME}/html/mini_Control-Category-Product.html
share/doc/hs-${DISTNAME}/html/mini_Data-Lens-Common.html
share/doc/hs-${DISTNAME}/html/mini_Data-Lens-Lazy.html
+share/doc/hs-${DISTNAME}/html/mini_Data-Lens-Partial-Common.html
+share/doc/hs-${DISTNAME}/html/mini_Data-Lens-Partial-Lazy.html
share/doc/hs-${DISTNAME}/html/mini_Data-Lens-Strict.html
share/doc/hs-${DISTNAME}/html/minus.gif
share/doc/hs-${DISTNAME}/html/ocean.css
Index: devel/hs-semigroupoids/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-semigroupoids/Makefile,v
retrieving revision 1.2
diff -u -p -r1.2 Makefile
--- devel/hs-semigroupoids/Makefile 8 Jul 2012 22:36:40 -0000 1.2
+++ devel/hs-semigroupoids/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = Haskell 98 semigroupoids
-DISTNAME = semigroupoids-1.2.6
-REVISION = 0
+DISTNAME = semigroupoids-1.3.4
CATEGORIES = devel
# BSD3
@@ -16,10 +15,10 @@ MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
-RUN_DEPENDS = devel/hs-comonad>=1.1,<1.2 \
- devel/hs-contravariant>=0.1.2,<0.2 \
- devel/hs-semigroups>=0.8,<0.9 \
- devel/hs-transformers>=0.2.0,<=0.3
+RUN_DEPENDS = devel/hs-comonad>=1.1.1.5,<1.2 \
+ devel/hs-contravariant>=0.2.0.1,<0.3 \
+ devel/hs-semigroups>=0.8.3.1,<0.9 \
+ devel/hs-transformers>=0.2,<0.4
BUILD_DEPENDS = ${RUN_DEPENDS}
.include <bsd.port.mk>
Index: devel/hs-semigroupoids/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-semigroupoids/distinfo,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 distinfo
--- devel/hs-semigroupoids/distinfo 23 Jan 2012 21:05:02 -0000 1.1.1.1
+++ devel/hs-semigroupoids/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/semigroupoids-1.2.6.tar.gz) = KIeUZyQZr5bWugBqNzBwRQ==
-RMD160 (ghc/semigroupoids-1.2.6.tar.gz) = 2TRG+/K9aF8EHm3ZESYr4AMX/bA=
-SHA1 (ghc/semigroupoids-1.2.6.tar.gz) = WtZmzgOS2zfZdD9pPHEVr+JJ/lw=
-SHA256 (ghc/semigroupoids-1.2.6.tar.gz) =
FmgYpHqqaiOtz2pGfYtzcCxbDY7pMbM8SLL74nvB0eU=
-SIZE (ghc/semigroupoids-1.2.6.tar.gz) = 10222
+MD5 (ghc/semigroupoids-1.3.4.tar.gz) = XKVVmQ0L+fKcJz3EbfNO0A==
+RMD160 (ghc/semigroupoids-1.3.4.tar.gz) = nJbjP6msmyrMdNu/p/YsL7dnNTY=
+SHA1 (ghc/semigroupoids-1.3.4.tar.gz) = iek9hocJWkem03ESVWXvwkQBVI4=
+SHA256 (ghc/semigroupoids-1.3.4.tar.gz) =
8OKsLX/hUT9GBA8EPwLOKJCWv4hlcBx4mY3q1ay80W4=
+SIZE (ghc/semigroupoids-1.3.4.tar.gz) = 10383
Index: devel/hs-tar/Makefile
===================================================================
RCS file: /cvs/ports/devel/hs-tar/Makefile,v
retrieving revision 1.6
diff -u -p -r1.6 Makefile
--- devel/hs-tar/Makefile 16 Sep 2011 09:24:51 -0000 1.6
+++ devel/hs-tar/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,8 +2,7 @@
COMMENT = tar bindings for Haskell
-DISTNAME = tar-0.3.1.0
-REVISION = 3
+DISTNAME = tar-0.3.2.0
CATEGORIES = devel archivers
MAINTAINER = Matthias Kilian <[email protected]>
Index: devel/hs-tar/distinfo
===================================================================
RCS file: /cvs/ports/devel/hs-tar/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- devel/hs-tar/distinfo 23 Apr 2011 20:23:41 -0000 1.2
+++ devel/hs-tar/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/tar-0.3.1.0.tar.gz) = ELVIVklfnvCkKqJwCFx9Xg==
-RMD160 (ghc/tar-0.3.1.0.tar.gz) = Yi04NymN+wgJFU6aqCtllUdID0Q=
-SHA1 (ghc/tar-0.3.1.0.tar.gz) = JaPlJ5+bL/8nIY5spq1EqwBe1/8=
-SHA256 (ghc/tar-0.3.1.0.tar.gz) = A2RJbs8NLeFld/43GmMb3YqeLLO1N39myGD04wvWJtg=
-SIZE (ghc/tar-0.3.1.0.tar.gz) = 15840
+MD5 (ghc/tar-0.3.2.0.tar.gz) = FMM8UBB9MdX9OYnvcs9omg==
+RMD160 (ghc/tar-0.3.2.0.tar.gz) = FXCs8aHEYSXhEBnDwMK6cDTNgKI=
+SHA1 (ghc/tar-0.3.2.0.tar.gz) = K/XLluoxxNRQ6Cu124xDdw9z7ss=
+SHA256 (ghc/tar-0.3.2.0.tar.gz) = SS0JEEEiTyk862ew9WCi9OPwowQRchSsh5EvFJXL9Ho=
+SIZE (ghc/tar-0.3.2.0.tar.gz) = 15952
Index: net/hpodder/Makefile
===================================================================
RCS file: /cvs/ports/net/hpodder/Makefile,v
retrieving revision 1.21
diff -u -p -r1.21 Makefile
--- net/hpodder/Makefile 23 Apr 2012 17:15:18 -0000 1.21
+++ net/hpodder/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,6 +2,8 @@
COMMENT = command line podcast aggregator
+BROKEN = Does not build with new ghc and HaXml
+
DISTNAME = hpodder-1.1.6
REVISION = 2
CATEGORIES = net
Index: security/hs-crypto/Makefile
===================================================================
RCS file: /cvs/ports/security/hs-crypto/Makefile,v
retrieving revision 1.14
diff -u -p -r1.14 Makefile
--- security/hs-crypto/Makefile 16 Sep 2011 11:41:38 -0000 1.14
+++ security/hs-crypto/Makefile 13 Jul 2012 15:47:59 -0000
@@ -3,10 +3,9 @@
COMMENT = Haskell cryptographic library
CATEGORIES = security
-DISTNAME = Crypto-4.2.1
+DISTNAME = Crypto-4.2.5
# Historically named with a lower case `c'.
PKGNAME = ${DISTNAME:S,C,hs-c,}
-REVISION = 6
HOMEPAGE = http://www.haskell.org/crypto/
MAINTAINER = Matthias Kilian <[email protected]>
@@ -20,7 +19,8 @@ PERMIT_DISTFILES_FTP = Yes
MODULES = lang/ghc
MODGHC_BUILD = cabal hackage haddock register
RUN_DEPENDS = devel/hs-HUnit \
- devel/hs-QuickCheck>=2
+ devel/hs-QuickCheck>=2.4.0.1 \
+ devel/hs-random
BUILD_DEPENDS = ${RUN_DEPENDS}
do-regress:
Index: security/hs-crypto/distinfo
===================================================================
RCS file: /cvs/ports/security/hs-crypto/distinfo,v
retrieving revision 1.6
diff -u -p -r1.6 distinfo
--- security/hs-crypto/distinfo 23 Apr 2011 20:24:04 -0000 1.6
+++ security/hs-crypto/distinfo 13 Jul 2012 15:47:59 -0000
@@ -1,5 +1,5 @@
-MD5 (ghc/Crypto-4.2.1.tar.gz) = rGLLq7UXEMQmQ6Oj/ug8TA==
-RMD160 (ghc/Crypto-4.2.1.tar.gz) = 7BFPAvrkwovit44RfNb8pQaFyeU=
-SHA1 (ghc/Crypto-4.2.1.tar.gz) = vmde9GawNYVa7wKPezp/ncXAIeA=
-SHA256 (ghc/Crypto-4.2.1.tar.gz) = hXNeNhUhTr75vMtcLyuJKKnP8FFzehKVB+kyEEhi/Ms=
-SIZE (ghc/Crypto-4.2.1.tar.gz) = 57038
+MD5 (ghc/Crypto-4.2.5.tar.gz) = ZnslbCSXeGIWn5Qliri9VQ==
+RMD160 (ghc/Crypto-4.2.5.tar.gz) = OrCXbJc+plddC0U29rO5T/61168=
+SHA1 (ghc/Crypto-4.2.5.tar.gz) = wVmj0+szwvKnrl92RnxjoA+znWo=
+SHA256 (ghc/Crypto-4.2.5.tar.gz) = aHVPCCfwZ3B6G/PWL2HitC8F6/DFYKMaRCpiKXREZHM=
+SIZE (ghc/Crypto-4.2.5.tar.gz) = 57486
Index: security/hs-crypto/patches/patch-QuickTest_hs
===================================================================
RCS file: security/hs-crypto/patches/patch-QuickTest_hs
diff -N security/hs-crypto/patches/patch-QuickTest_hs
--- security/hs-crypto/patches/patch-QuickTest_hs 11 Apr 2011 14:52:45
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,33 +0,0 @@
-$OpenBSD: patch-QuickTest_hs,v 1.1 2011/04/11 14:52:45 kili Exp $
-
-Remove instance declarations that already come with the QuickCheck
-package.
-
---- QuickTest.hs.orig Thu Jan 28 02:19:33 2010
-+++ QuickTest.hs Sun Dec 26 16:23:59 2010
-@@ -14,18 +14,6 @@ import Numeric
- import Data.Char
- import Test.QuickCheck
-
--instance Arbitrary Word8 where
-- arbitrary =
-- do n <- choose ((fromIntegral (minBound::Word8))::Int,
-- (fromIntegral (maxBound::Word8))::Int)
-- return (fromIntegral n)
--
--instance Arbitrary Word64 where
-- arbitrary =
-- do n <- choose ((fromIntegral (minBound::Word64))::Integer,
-- (fromIntegral (maxBound::Word64))::Integer)
-- return (fromIntegral n)
--
- instance Arbitrary Word128 where
- arbitrary =
- do n <- choose ((fromIntegral (minBound::Word128))::Integer,
-@@ -71,4 +59,4 @@ main = do quickCheck prop_decryptEncrypt
- quickCheck prop_unPkcs5Pkcs5
- quickCheck prop_unNullsNulls
- quickCheck prop_fromOctetsToOctets
-- quickCheck prop_unTwosCompTwosComp
-\ No newline at end of file
-+ quickCheck prop_unTwosCompTwosComp
Index: security/hs-crypto/patches/patch-WordListTest_hs
===================================================================
RCS file: security/hs-crypto/patches/patch-WordListTest_hs
diff -N security/hs-crypto/patches/patch-WordListTest_hs
--- security/hs-crypto/patches/patch-WordListTest_hs 11 Apr 2011 14:52:45
-0000 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,38 +0,0 @@
-$OpenBSD: patch-WordListTest_hs,v 1.1 2011/04/11 14:52:45 kili Exp $
-
-Remove instance declarations that already come with the QuickCheck
-package.
-
---- WordListTest.hs.orig Thu Jan 28 02:19:33 2010
-+++ WordListTest.hs Sun Dec 26 16:24:53 2010
-@@ -27,30 +27,6 @@ checks = [
- ("Word256",
- quickCheck (\(w :: [Word256]) -> (listFromOctets . listToOctets) w ==
w))]
-
--instance Arbitrary Word8 where
-- arbitrary = do
-- let mx,mn :: Integer
-- mx = fromIntegral (maxBound :: Word8)
-- mn = fromIntegral (minBound :: Word8)
-- c <- choose (mx, mn)
-- return $ fromIntegral c
--
--instance Arbitrary Word32 where
-- arbitrary = do
-- let mx,mn :: Integer
-- mx = fromIntegral (maxBound :: Word32)
-- mn = fromIntegral (minBound :: Word32)
-- c <- choose (mx, mn)
-- return $ fromIntegral c
--
--instance Arbitrary Word64 where
-- arbitrary = do
-- let mx,mn :: Integer
-- mx = fromIntegral (maxBound :: Word64)
-- mn = fromIntegral (minBound :: Word64)
-- c <- choose (mx, mn)
-- return $ fromIntegral c
--
- instance Arbitrary Word128 where
- arbitrary = do
- x <- vector (128 `div` 8) :: Gen [Word8]
Index: x11/xmobar/Makefile
===================================================================
RCS file: /cvs/ports/x11/xmobar/Makefile,v
retrieving revision 1.12
diff -u -p -r1.12 Makefile
--- x11/xmobar/Makefile 12 Jan 2012 21:42:07 -0000 1.12
+++ x11/xmobar/Makefile 13 Jul 2012 15:47:59 -0000
@@ -2,6 +2,8 @@
COMMENT = minimalistic text based status bar
+BROKEN = Does not build with ghc-7.4, new mtl and libmpd
+
DISTNAME = xmobar-0.14
CATEGORIES = x11
HOMEPAGE = http://projects.haskell.org/xmobar
Index: x11/xmobar/files/Binding.hsc
===================================================================
RCS file: /cvs/ports/x11/xmobar/files/Binding.hsc,v
retrieving revision 1.1
diff -u -p -r1.1 Binding.hsc
--- x11/xmobar/files/Binding.hsc 17 Jul 2010 14:55:21 -0000 1.1
+++ x11/xmobar/files/Binding.hsc 13 Jul 2012 15:47:59 -0000
@@ -9,6 +9,7 @@ module Plugins.Monitors.Batt.Binding (
import Foreign
import Foreign.C
+#include <sys/types.h>
#include <machine/apmvar.h>
type CApmPowerInfo = ()
foreign import ccall "apm.h get_power_info"
