CVS commit: pkgsrc/devel/hs-fsnotify

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Thu May  2 09:44:01 UTC 2024

Modified Files:
        pkgsrc/devel/hs-fsnotify: PLIST.common distinfo
        pkgsrc/devel/hs-fsnotify/patches: patch-fsnotify.cabal

Log Message:
devel/hs-fsnotify: Fix build with GHC 9.8

This breaks build with the currently default GHC 9.6. Please bear with me
until I switch the default compiler.


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/devel/hs-fsnotify/PLIST.common
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/hs-fsnotify/distinfo
cvs rdiff -u -r1.2 -r1.3 \
    pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.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-fsnotify/PLIST.common
diff -u pkgsrc/devel/hs-fsnotify/PLIST.common:1.4 pkgsrc/devel/hs-fsnotify/PLIST.common:1.5
--- pkgsrc/devel/hs-fsnotify/PLIST.common:1.4   Mon Oct 30 13:58:33 2023
+++ pkgsrc/devel/hs-fsnotify/PLIST.common       Thu May  2 09:44:00 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.4 2023/10/30 13:58:33 pho Exp $
+@comment $NetBSD: PLIST.common,v 1.5 2024/05/02 09:44:00 pho Exp $
 lib/fsnotify-${PKGVERSION}/${HS_VERSION}/package-description
 lib/fsnotify-${PKGVERSION}/${HS_VERSION}/package-id
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/System/FSNotify.dyn_hi
@@ -29,12 +29,10 @@ share/doc/${HS_PLATFORM}/fsnotify-${PKGV
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/System-FSNotify-Devel.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/System-FSNotify.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/fsnotify.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/fsnotify-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/devel/hs-fsnotify/distinfo
diff -u pkgsrc/devel/hs-fsnotify/distinfo:1.5 pkgsrc/devel/hs-fsnotify/distinfo:1.6
--- pkgsrc/devel/hs-fsnotify/distinfo:1.5       Thu Jan 26 15:08:26 2023
+++ pkgsrc/devel/hs-fsnotify/distinfo   Thu May  2 09:44:00 2024
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2023/01/26 15:08:26 pho Exp $
+$NetBSD: distinfo,v 1.6 2024/05/02 09:44:00 pho Exp $
 
 BLAKE2s (fsnotify-0.4.1.0.tar.gz) = d1fd7c6857bb4a980c4d9d550bba8585098523d490d0ec0acf213254e8216000
 SHA512 (fsnotify-0.4.1.0.tar.gz) = bf924fb9712572e1ded14c630b1fab98daadb81cc87bbd18964176e0db3b41e1024744b996bcc205c7a57f55e63fc28db0ae4fa4009623d26316d1322ddf1c03
 Size (fsnotify-0.4.1.0.tar.gz) = 22783 bytes
-SHA1 (patch-fsnotify.cabal) = d41f0e20b56a4e4a38dc944e407e219fe75f7602
+SHA1 (patch-fsnotify.cabal) = 9e99c1be97048e4990f9e0826a09b3e73dd5671b

Index: pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal
diff -u pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal:1.2 pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal:1.3
--- pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal:1.2   Thu Jan 26 15:08:26 2023
+++ pkgsrc/devel/hs-fsnotify/patches/patch-fsnotify.cabal       Thu May  2 09:44:00 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-fsnotify.cabal,v 1.2 2023/01/26 15:08:26 pho Exp $
+$NetBSD: patch-fsnotify.cabal,v 1.3 2024/05/02 09:44:00 pho Exp $
 
 Use hinotify on some BSDs. libinotify emulates it with kqueue(2) which is
 much better than polling.
@@ -8,7 +8,7 @@ Not upstreamed yet; can only be upstream
 
 --- fsnotify.cabal.orig        2022-10-17 01:19:16.000000000 +0000
 +++ fsnotify.cabal
-@@ -46,15 +46,13 @@ library
+@@ -46,15 +46,15 @@ library
      , time >=1.1
      , unix-compat >=0.2
    default-language: Haskell2010
@@ -20,9 +20,26 @@ Not upstreamed yet; can only be upstream
    if os(darwin)
      cpp-options: -DOS_Mac
 -  if os(freebsd) || os(netbsd) || os(openbsd)
--    cpp-options: -DOS_BSD
++  if !os(linux) && !os(freebsd) && !os(netbsd) && !os(openbsd) && !os(windows)
+     cpp-options: -DOS_BSD
 -  if os(linux)
 +  if os(linux) || os(freebsd) || os(netbsd) || os(openbsd)
      other-modules:
          System.FSNotify.Linux
      build-depends:
+@@ -99,13 +99,13 @@ test-suite tests
+     , unix-compat
+     , unliftio >=0.2.20
+   default-language: Haskell2010
+-  if os(linux)
++  if os(linux) || os(freebsd) || os(netbsd) || os(openbsd)
+     cpp-options: -DOS_Linux
+   if os(windows)
+     cpp-options: -DOS_Win32
+   if os(darwin)
+     cpp-options: -DOS_Mac
+-  if os(freebsd) || os(netbsd) || os(openbsd)
++  if !os(linux) && !os(freebsd) && !os(netbsd) && !os(openbsd) && !os(windows)
+     cpp-options: -DOS_BSD
+   if os(windows)
+     build-depends: