CVS commit: pkgsrc/www/hs-open-browser

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Apr 28 12:12:55 UTC 2024

Modified Files:
        pkgsrc/www/hs-open-browser: Makefile PLIST distinfo
Added Files:
        pkgsrc/www/hs-open-browser/patches: patch-lib_Web_Browser.hs

Log Message:
www/hs-open-browser: 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.5 -r1.6 pkgsrc/www/hs-open-browser/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/www/hs-open-browser/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/www/hs-open-browser/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/www/hs-open-browser/patches/patch-lib_Web_Browser.hs

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

Modified files:

Index: pkgsrc/www/hs-open-browser/Makefile
diff -u pkgsrc/www/hs-open-browser/Makefile:1.5 pkgsrc/www/hs-open-browser/Makefile:1.6
--- pkgsrc/www/hs-open-browser/Makefile:1.5     Thu Nov  2 06:37:46 2023
+++ pkgsrc/www/hs-open-browser/Makefile Sun Apr 28 12:12:55 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2023/11/02 06:37:46 pho Exp $
+# $NetBSD: Makefile,v 1.6 2024/04/28 12:12:55 pho Exp $
 
 DISTNAME=      open-browser-0.2.1.0
 PKGREVISION=   4
@@ -8,5 +8,10 @@ MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Open a web browser from Haskell
 LICENSE=       modified-bsd
 
+.include "../../mk/bsd.fast.prefs.mk"
+.if ${OPSYS} != "Darwin"
+DEPENDS+=      xdg-utils-[0-9]*:../../misc/xdg-utils
+.endif
+
 .include "../../mk/haskell.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/www/hs-open-browser/PLIST
diff -u pkgsrc/www/hs-open-browser/PLIST:1.2 pkgsrc/www/hs-open-browser/PLIST:1.3
--- pkgsrc/www/hs-open-browser/PLIST:1.2        Tue Oct 24 08:42:43 2023
+++ pkgsrc/www/hs-open-browser/PLIST    Sun Apr 28 12:12:55 2024
@@ -1,6 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2023/10/24 08:42:43 pho Exp $
-lib/open-browser-${PKGVERSION}/${HS_VERSION}/package-description
-lib/open-browser-${PKGVERSION}/${HS_VERSION}/package-id
+@comment $NetBSD: PLIST,v 1.3 2024/04/28 12:12:55 pho Exp $
 ${PLIST.shlibs}lib/${HS_PLATFORM}/libHS${HS_PKGID}-${HS_VER}.so
 ${PLIST.shlibs}lib/${HS_PLATFORM}/${HS_PKGID}/Web/Browser.dyn_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Web/Browser.hi
@@ -13,15 +11,15 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Web/Brows
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/Web/Browser/OSX.p_hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
 ${PLIST.prof}lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}_p.a
+lib/open-browser-${PKGVERSION}/${HS_VERSION}/package-description
+lib/open-browser-${PKGVERSION}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/Web-Browser.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/open-browser.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/open-browser-${PKGVERSION}/html/synopsis.png

Index: pkgsrc/www/hs-open-browser/distinfo
diff -u pkgsrc/www/hs-open-browser/distinfo:1.1 pkgsrc/www/hs-open-browser/distinfo:1.2
--- pkgsrc/www/hs-open-browser/distinfo:1.1     Thu Feb 24 00:59:49 2022
+++ pkgsrc/www/hs-open-browser/distinfo Sun Apr 28 12:12:55 2024
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2022/02/24 00:59:49 pho Exp $
+$NetBSD: distinfo,v 1.2 2024/04/28 12:12:55 pho Exp $
 
 BLAKE2s (open-browser-0.2.1.0.tar.gz) = 417691745051fc2383571f0a2a20f75c78abf870c508b7befa2a31172b0f1233
 SHA512 (open-browser-0.2.1.0.tar.gz) = 94ba71597c270b518742534b1b9b9a7ca0ede2eeb08a030b03cca6dbe6e5a2de363dc443bae907ca5c90b126aeb7dc5f5dd1eada95ca78a0ba1a8d472df4ada1
 Size (open-browser-0.2.1.0.tar.gz) = 2629 bytes
+SHA1 (patch-lib_Web_Browser.hs) = 2a97f353330220ae4278978f57d6e93b90216f7c
 SHA1 (patch-open-browser.cabal) = 210d93308d7de548fbb9ddb9a332ae2d4706aa51

Added files:

Index: pkgsrc/www/hs-open-browser/patches/patch-lib_Web_Browser.hs
diff -u /dev/null pkgsrc/www/hs-open-browser/patches/patch-lib_Web_Browser.hs:1.1
--- /dev/null   Sun Apr 28 12:12:55 2024
+++ pkgsrc/www/hs-open-browser/patches/patch-lib_Web_Browser.hs Sun Apr 28 12:12:55 2024
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_Web_Browser.hs,v 1.1 2024/04/28 12:12:55 pho Exp $
+
+Too restrictive. xdg-open(1) is a cross-platform tool.
+
+--- lib/Web/Browser.hs.orig    2024-04-28 12:04:09.488942537 +0000
++++ lib/Web/Browser.hs
+@@ -19,7 +19,6 @@ openBrowser :: String -> IO Bool
+ openBrowser = openBrowserWindows
+ #else
+ openBrowser
+-    | any (`isInfixOf` os) ["linux", "bsd"] = openBrowserLinux
+     | "darwin"  `isInfixOf` os              = openBrowserOSX
+-    | otherwise                             = error "unsupported platform"
++    | otherwise                             = openBrowserLinux
+ #endif