CVS commit: pkgsrc/devel/hs-cpphs

["Masatake Daimon" <pho%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   pho
Date:           Fri Feb 11 09:43:46 UTC 2022

Modified Files:
        pkgsrc/devel/hs-cpphs: Makefile distinfo
        pkgsrc/devel/hs-cpphs/patches: patch-cpphs.cabal

Log Message:
Fix build with GHC 9.2


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 pkgsrc/devel/hs-cpphs/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/devel/hs-cpphs/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal

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

Modified files:

Index: pkgsrc/devel/hs-cpphs/Makefile
diff -u pkgsrc/devel/hs-cpphs/Makefile:1.16 pkgsrc/devel/hs-cpphs/Makefile:1.17
--- pkgsrc/devel/hs-cpphs/Makefile:1.16 Tue Jan 18 02:48:06 2022
+++ pkgsrc/devel/hs-cpphs/Makefile      Fri Feb 11 09:43:46 2022
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.16 2022/01/18 02:48:06 pho Exp $
+# $NetBSD: Makefile,v 1.17 2022/02/11 09:43:46 pho Exp $
 
 DISTNAME=              cpphs-1.20.9.1
-#PKGNAME=              ${DISTNAME} # XXX: This should probably be renamed to devel/cpphs.
+#PKGNAME=              ${DISTNAME} # XXX: This should be renamed to devel/cpphs.
 PKGREVISION=           2
 CATEGORIES=            devel
 

Index: pkgsrc/devel/hs-cpphs/distinfo
diff -u pkgsrc/devel/hs-cpphs/distinfo:1.9 pkgsrc/devel/hs-cpphs/distinfo:1.10
--- pkgsrc/devel/hs-cpphs/distinfo:1.9  Tue Oct 26 10:14:54 2021
+++ pkgsrc/devel/hs-cpphs/distinfo      Fri Feb 11 09:43:46 2022
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2021/10/26 10:14:54 nia Exp $
+$NetBSD: distinfo,v 1.10 2022/02/11 09:43:46 pho Exp $
 
 BLAKE2s (cpphs-1.20.9.1.tar.gz) = 725c15d6f4f5cf1a352965c6b571dab5fde0b85360f44647fc3d9a1d497488c4
 SHA512 (cpphs-1.20.9.1.tar.gz) = bc5cd86c1e42061ae5c940612542dbea420344fb8596495d71ff2dc724bc1a3785f830e51c3ae99394488a122deabacd6433a5c919e3682c4129f3b296b7931f
 Size (cpphs-1.20.9.1.tar.gz) = 45496 bytes
-SHA1 (patch-cpphs.cabal) = 274e5753325014d152da43daf195f7d65f7204d9
+SHA1 (patch-cpphs.cabal) = f2ea981af932e6f03b2d68a53b88765eeac0a169

Index: pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal
diff -u pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal:1.1 pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal:1.2
--- pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal:1.1 Sun Apr 25 15:28:44 2021
+++ pkgsrc/devel/hs-cpphs/patches/patch-cpphs.cabal     Fri Feb 11 09:43:46 2022
@@ -1,12 +1,24 @@
-$NetBSD: patch-cpphs.cabal,v 1.1 2021/04/25 15:28:44 pho Exp $
+$NetBSD: patch-cpphs.cabal,v 1.2 2022/02/11 09:43:46 pho Exp $
 
-This is probably a Cabal bug. When a package defines both a library
-and an executable, and they share the same set of modules, Cabal
-embeds an rpath to the build directory to the executable. We don't
-appreciate that.
+Hunk #1:
+  Fix build with GHC 9.2.
+
+Hunk #2, #3:
+  This is probably a Cabal bug. When a package defines both a library and
+  an executable, and they share the same set of modules, Cabal embeds an
+  rpath to the build directory to the executable. We don't appreciate that.
 
 --- cpphs.cabal.orig   2001-09-09 01:46:40.000000000 +0000
 +++ cpphs.cabal
+@@ -52,7 +52,7 @@ Library
+       Hs-Source-Dirs: . old
+ 
+     else
+-      Build-Depends: time >=1.5 && <1.11
++      Build-Depends: time >=1.5 && <1.12
+       Hs-Source-Dirs: . new
+ 
+     Exposed-Modules:
 @@ -71,7 +71,7 @@ Library
          TimeCompat
  
@@ -16,8 +28,12 @@ appreciate that.
      Main-Is: cpphs.hs
  
      if flag(old-locale)
-@@ -84,20 +84,6 @@ Executable cpphs
-       Build-Depends: time >=1.5 && <1.11
+@@ -81,23 +81,9 @@ Executable cpphs
+       Hs-Source-Dirs: . old
+ 
+     else
+-      Build-Depends: time >=1.5 && <1.11
++      Build-Depends: time >=1.5 && <1.12
        Hs-Source-Dirs: . new
  
 -    Other-Modules: