pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang ghc*: remove CONFLICTS with itself



details:   https://anonhg.NetBSD.org/pkgsrc/rev/37a725e6520a
branches:  trunk
changeset: 453062:37a725e6520a
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Sat May 22 23:10:26 2021 +0000

description:
ghc*: remove CONFLICTS with itself

The PKGNAME is ghc-* so there is no point in a conflict with ghc-*

diffstat:

 lang/ghc7/Makefile   |  5 +----
 lang/ghc80/Makefile  |  5 +----
 lang/ghc810/Makefile |  5 +----
 lang/ghc84/Makefile  |  5 +----
 lang/ghc88/Makefile  |  5 +----
 5 files changed, 5 insertions(+), 20 deletions(-)

diffs (95 lines):

diff -r 59415de23c05 -r 37a725e6520a lang/ghc7/Makefile
--- a/lang/ghc7/Makefile        Sat May 22 23:08:45 2021 +0000
+++ b/lang/ghc7/Makefile        Sat May 22 23:10:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2021/04/30 18:52:05 pho Exp $
+# $NetBSD: Makefile,v 1.48 2021/05/22 23:10:26 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -14,9 +14,6 @@
 COMMENT=       Compiler for the functional language Haskell - 7.10 Release Series
 LICENSE=       modified-bsd
 
-# TODO: We should be using the alternatives framework.
-CONFLICTS+=    ghc-[0-9]*
-
 # GHC requires GHC to build itself. Formerly we could work around this
 # bootstrapping problem by creating a special archive containing C
 # sources compiled from Haskell sources, but that's no longer
diff -r 59415de23c05 -r 37a725e6520a lang/ghc80/Makefile
--- a/lang/ghc80/Makefile       Sat May 22 23:08:45 2021 +0000
+++ b/lang/ghc80/Makefile       Sat May 22 23:10:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2021/05/01 01:24:50 pho Exp $
+# $NetBSD: Makefile,v 1.12 2021/05/22 23:10:26 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -16,9 +16,6 @@
 
 UNLIMIT_RESOURCES=     datasize virtualsize
 
-# TODO: We should be using the alternatives framework.
-CONFLICTS+=    ghc-[0-9]*
-
 # GHC requires GHC to build itself. Formerly we could work around this
 # bootstrapping problem by creating a special archive containing C
 # sources compiled from Haskell sources, but that's no longer
diff -r 59415de23c05 -r 37a725e6520a lang/ghc810/Makefile
--- a/lang/ghc810/Makefile      Sat May 22 23:08:45 2021 +0000
+++ b/lang/ghc810/Makefile      Sat May 22 23:10:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2021/05/01 04:43:57 pho Exp $
+# $NetBSD: Makefile,v 1.5 2021/05/22 23:10:26 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -16,9 +16,6 @@
 
 UNLIMIT_RESOURCES=     datasize virtualsize
 
-# TODO: We should be using the alternatives framework.
-CONFLICTS+=    ghc-[0-9]*
-
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platforms. If
 # you want to build them yourself, follow instructions in
diff -r 59415de23c05 -r 37a725e6520a lang/ghc84/Makefile
--- a/lang/ghc84/Makefile       Sat May 22 23:08:45 2021 +0000
+++ b/lang/ghc84/Makefile       Sat May 22 23:10:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2021/05/01 02:57:31 pho Exp $
+# $NetBSD: Makefile,v 1.14 2021/05/22 23:10:26 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -16,9 +16,6 @@
 
 UNLIMIT_RESOURCES=     datasize virtualsize
 
-# TODO: We should be using the alternatives framework.
-CONFLICTS+=    ghc-[0-9]*
-
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platforms. If
 # you want to build them yourself, follow instructions in
diff -r 59415de23c05 -r 37a725e6520a lang/ghc88/Makefile
--- a/lang/ghc88/Makefile       Sat May 22 23:08:45 2021 +0000
+++ b/lang/ghc88/Makefile       Sat May 22 23:10:26 2021 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/04/29 05:09:08 pho Exp $
+# $NetBSD: Makefile,v 1.20 2021/05/22 23:10:26 wiz Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
 #
@@ -16,9 +16,6 @@
 
 UNLIMIT_RESOURCES=     datasize virtualsize
 
-# TODO: We should be using the alternatives framework.
-CONFLICTS+=    ghc-[0-9]*
-
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platforms. If
 # you want to build them yourself, follow instructions in



Home | Main Index | Thread Index | Old Index