Remove devel/hs-monad-fd, tweak devel/hs-mtl

2013-07-12 Thread Matthias Kilian 
Hi,

devel/hs-monad-fd is obsolete, see

http://hackage.haskell.org/package/monads-fd

I'd like to get rid of it *now* (there's already far too much mess
in the tree i have on my machine with the ghc update), and add
appropriate @conflict and @pkgpath markers to the plist of devel/hs-mtl.
This should even be fine for the current tree (with ghc-7.4 and
haskell-platform 2012.*).

ok?

Oh, and will this work out of the box or do I need a quirk for it? It
would be nice if someone could test this; I can't, because at the moment
I've only two machines to work with (one or doing all the hs-* updates
and one for testing the complete ghc-7.4 - ghc-7.6 update path).

Ciao,
Kili

Index: Makefile
===
RCS file: /cvs/ports/devel/hs-mtl/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2013 10:50:07 -  1.7
+++ Makefile12 Jul 2013 19:26:30 -
@@ -3,7 +3,7 @@
 COMMENT =  monad classes using functional dependencies
 
 DISTNAME = mtl-2.1.2
-REVISION = 0
+REVISION = 1
 CATEGORIES =   devel
 
 MAINTAINER =   Matthias Kilian k...@openbsd.org
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/hs-mtl/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   20 Jan 2013 18:02:53 -  1.3
+++ pkg/PLIST   12 Jul 2013 19:26:31 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2013/01/20 18:02:53 kili Exp $
+@conflict hs-monads-fd
+@pkgpath devel/hs-monads-fd
 lib/ghc/${DISTNAME}/
 lib/ghc/${DISTNAME}/Control/
 lib/ghc/${DISTNAME}/Control/Monad/

Re: Remove devel/hs-monad-fd, tweak devel/hs-mtl

2013-07-12 Thread David Coppa 
On Fri, Jul 12, 2013 at 9:35 PM, Matthias Kilian k...@outback.escape.de wrote:
 Hi,

 devel/hs-monad-fd is obsolete, see

 http://hackage.haskell.org/package/monads-fd

 I'd like to get rid of it *now* (there's already far too much mess
 in the tree i have on my machine with the ghc update), and add
 appropriate @conflict and @pkgpath markers to the plist of devel/hs-mtl.
 This should even be fine for the current tree (with ghc-7.4 and
 haskell-platform 2012.*).

 ok?

I'm alway ok with removing obsolete stuff ;)

 Oh, and will this work out of the box or do I need a quirk for it? It
 would be nice if someone could test this; I can't, because at the moment
 I've only two machines to work with (one or doing all the hs-* updates
 and one for testing the complete ghc-7.4 - ghc-7.6 update path).

I don't understand why a conflict marker for mtl is needed in the first place :P

Re: Remove devel/hs-monad-fd, tweak devel/hs-mtl

2013-07-12 Thread Matthias Kilian 
On Fri, Jul 12, 2013 at 09:35:47PM +0200, Matthias Kilian wrote:
 --- pkg/PLIST 20 Jan 2013 18:02:53 -  1.3
 +++ pkg/PLIST 12 Jul 2013 19:26:31 -
 @@ -1,4 +1,6 @@
  @comment $OpenBSD: PLIST,v 1.3 2013/01/20 18:02:53 kili Exp $
 +@conflict hs-monads-fd

Fuck. That should have been hs-monads-fd-*

Index: Makefile
===
RCS file: /cvs/ports/devel/hs-mtl/Makefile,v
retrieving revision 1.7
diff -u -p -r1.7 Makefile
--- Makefile11 Mar 2013 10:50:07 -  1.7
+++ Makefile12 Jul 2013 20:16:27 -
@@ -3,7 +3,7 @@
 COMMENT =  monad classes using functional dependencies
 
 DISTNAME = mtl-2.1.2
-REVISION = 0
+REVISION = 1
 CATEGORIES =   devel
 
 MAINTAINER =   Matthias Kilian k...@openbsd.org
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/hs-mtl/pkg/PLIST,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST
--- pkg/PLIST   20 Jan 2013 18:02:53 -  1.3
+++ pkg/PLIST   12 Jul 2013 20:16:27 -
@@ -1,4 +1,6 @@
 @comment $OpenBSD: PLIST,v 1.3 2013/01/20 18:02:53 kili Exp $
+@conflict hs-monads-fd-*
+@pkgpath devel/hs-monads-fd
 lib/ghc/${DISTNAME}/
 lib/ghc/${DISTNAME}/Control/
 lib/ghc/${DISTNAME}/Control/Monad/

Re: Remove devel/hs-monad-fd, tweak devel/hs-mtl

2013-07-12 Thread Dawe 
On Jul 12, 2013 22:01, Matthias Kilian wrote:
 Hi,
 
 On Fri, Jul 12, 2013 at 09:42:31PM +0200, David Coppa wrote:
  On Fri, Jul 12, 2013 at 9:35 PM, Matthias Kilian k...@outback.escape.de 
  wrote:
   Hi,
  
   devel/hs-monad-fd is obsolete, see
  
   http://hackage.haskell.org/package/monads-fd
  
   I'd like to get rid of it *now* (there's already far too much mess
 [...]
   Oh, and will this work out of the box or do I need a quirk for it? It
   would be nice if someone could test this; I can't, because at the moment
   I've only two machines to work with (one or doing all the hs-* updates
   and one for testing the complete ghc-7.4 - ghc-7.6 update path).
  
  I don't understand why a conflict marker for mtl is needed in the first 
  place :P
 
 To be sure pkg_add -u does a merge like
 
   hs-monads-fd-0.1.0.1p0,hs-mtl-2.1.2p0 - hs-mtl-2.1.2p1
 
 Or will it work without the conflict marker? I've no idea, and as
 I said, I've not enough machines to test it now without temporarily
 throwing away the about 100 updates and imports related to this
 Haskell madness I currently have in my tree ;-)
 
 Ciao,
   Kili
 
 ps: the other day I had only 80 ports to touch, but this Haskell
 update bullshit seems to have no end.
 

Seems to work like you intend.

$ sudo pkg_add -u hs-mtl 
hs-monads-fd-0.1.0.1p6+hs-mtl-2.1.2p0-hs-mtl-2.1.2p1: ok
Read shared items: ok
Couldn't find updates for hs-transformers-0.3.0.0p1, ghc-7.4.2p4
$ pkg_info|grep hs-monads-fd  
$ pkg_info|grep hs-mtl
hs-mtl-2.1.2p1  monad classes using functional dependencies