CVS commit: pkgsrc/lang

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sat May 22 23:10:27 UTC 2021

Modified Files:
        pkgsrc/lang/ghc7: Makefile
        pkgsrc/lang/ghc80: Makefile
        pkgsrc/lang/ghc810: Makefile
        pkgsrc/lang/ghc84: Makefile
        pkgsrc/lang/ghc88: Makefile

Log Message:
ghc*: remove CONFLICTS with itself

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


To generate a diff of this commit:
cvs rdiff -u -r1.47 -r1.48 pkgsrc/lang/ghc7/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/ghc80/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/lang/ghc810/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/ghc84/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/lang/ghc88/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ghc7/Makefile
diff -u pkgsrc/lang/ghc7/Makefile:1.47 pkgsrc/lang/ghc7/Makefile:1.48
--- pkgsrc/lang/ghc7/Makefile:1.47      Fri Apr 30 18:52:05 2021
+++ pkgsrc/lang/ghc7/Makefile   Sat May 22 23:10:26 2021
@@ -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 @@ HOMEPAGE=     https://www.haskell.org/ghc/
 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

Index: pkgsrc/lang/ghc80/Makefile
diff -u pkgsrc/lang/ghc80/Makefile:1.11 pkgsrc/lang/ghc80/Makefile:1.12
--- pkgsrc/lang/ghc80/Makefile:1.11     Sat May  1 01:24:50 2021
+++ pkgsrc/lang/ghc80/Makefile  Sat May 22 23:10:26 2021
@@ -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 @@ LICENSE=      modified-bsd
 
 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

Index: pkgsrc/lang/ghc810/Makefile
diff -u pkgsrc/lang/ghc810/Makefile:1.4 pkgsrc/lang/ghc810/Makefile:1.5
--- pkgsrc/lang/ghc810/Makefile:1.4     Sat May  1 04:43:57 2021
+++ pkgsrc/lang/ghc810/Makefile Sat May 22 23:10:26 2021
@@ -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 @@ LICENSE=      modified-bsd
 
 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

Index: pkgsrc/lang/ghc84/Makefile
diff -u pkgsrc/lang/ghc84/Makefile:1.13 pkgsrc/lang/ghc84/Makefile:1.14
--- pkgsrc/lang/ghc84/Makefile:1.13     Sat May  1 02:57:31 2021
+++ pkgsrc/lang/ghc84/Makefile  Sat May 22 23:10:26 2021
@@ -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 @@ LICENSE=      modified-bsd
 
 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

Index: pkgsrc/lang/ghc88/Makefile
diff -u pkgsrc/lang/ghc88/Makefile:1.19 pkgsrc/lang/ghc88/Makefile:1.20
--- pkgsrc/lang/ghc88/Makefile:1.19     Thu Apr 29 05:09:08 2021
+++ pkgsrc/lang/ghc88/Makefile  Sat May 22 23:10:26 2021
@@ -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 @@ LICENSE=      modified-bsd
 
 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