Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_1714837583186270"
MIME-Version: 1.0
Date: Sat, 4 May 2024 15:46:23 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/lang/spago
To: pkgsrc-changes@NetBSD.org
Reply-To: pho@netbsd.org
Message-Id: <20240504154623.32431FA2C@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_1714837583186270
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	pho
Date:		Sat May  4 15:46:23 UTC 2024

Modified Files:
	pkgsrc/lang/spago: DESCR Makefile PLIST

Log Message:
lang/spago: 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.1 -r1.2 pkgsrc/lang/spago/DESCR
cvs rdiff -u -r1.11 -r1.12 pkgsrc/lang/spago/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/spago/PLIST

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


--_----------=_1714837583186270
Content-Disposition: inline
Content-Length: 4758
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/lang/spago/DESCR
diff -u pkgsrc/lang/spago/DESCR:1.1 pkgsrc/lang/spago/DESCR:1.2
--- pkgsrc/lang/spago/DESCR:1.1	Thu Feb 24 01:27:40 2022
+++ pkgsrc/lang/spago/DESCR	Sat May  4 15:46:22 2024
@@ -1,2 +1,7 @@
 PureScript package manager and build tool powered by Dhall and
 package-sets.
+
+This package provides the legacy implementation of Spago in Haskell. It's
+the version that has the "migrate" sub-command. Existing users should
+migrate to the new PureScript rewrite urgently:
+https://github.com/purescript/spago?tab=readme-ov-file#migrate-from-spagodhall-to-spagoyaml

Index: pkgsrc/lang/spago/Makefile
diff -u pkgsrc/lang/spago/Makefile:1.11 pkgsrc/lang/spago/Makefile:1.12
--- pkgsrc/lang/spago/Makefile:1.11	Thu Nov  2 06:37:10 2023
+++ pkgsrc/lang/spago/Makefile	Sat May  4 15:46:22 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2023/11/02 06:37:10 pho Exp $
+# $NetBSD: Makefile,v 1.12 2024/05/04 15:46:22 pho Exp $
 
 # NOTE: spago is getting rewritten in PureScript, and this Haskell
 # implementation is being phased out. We should remove this package and
@@ -9,10 +9,13 @@ PKGNAME=	${DISTNAME}
 PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=purescript/}
+GITHUB_PROJECT=	spago-legacy
+
 DISTFILES=	${DEFAULT_DISTFILES}
 DIST_SUBDIR=	${PKGBASE}
 
 # NOTE: This has to be kept in sync with ${WRKSRC}/scripts/fetch-templates
+.include "../../lang/nodejs/application.mk"
 .for version in 0.0.10 0.0.11
 DISTFILES+=					docs-search-app-${version}.js
 EXTRACT_DIR.docs-search-app-${version}.js=	${WRKSRC}/templates
@@ -24,7 +27,7 @@ EXTRACT_DIR.purescript-docs-search-${ver
 SITES.purescript-docs-search-${version}=	\
 	-https://github.com/purescript/purescript-docs-search/releases/download/v${version}/purescript-docs-search
 
-REPLACE_FILES.node+=	templates/purescript-docs-search-${version}
+REPLACE_NODEJS+=	templates/purescript-docs-search-${version}
 .endfor
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -32,10 +35,6 @@ HOMEPAGE=	https://github.com/purescript/
 COMMENT=	PureScript package manager and build tool
 LICENSE=	modified-bsd
 
-REPLACE_INTERPRETER+=	node
-REPLACE.node.old=	.*node
-REPLACE.node.new=	${PREFIX}/bin/node
-
 # Use crypton instead of outdated cryptonite.
 SUBST_CLASSES+=		crypton
 SUBST_STAGE.crypton=	post-extract
@@ -60,6 +59,12 @@ HASKELL_ENABLE_LIBRARY_PROFILING=	no
 # scripts automatically.
 .include "../../devel/hs-optparse-applicative/application.mk"
 
+# <kludge>
+#   shells/fish provides its own spago.fish and conflicts with what
+#   optparse-applicative generates.
+OA.shell-types:=	${OA.shell-types:Nfish}
+# </kludge>
+
 .include "../../textproc/hs-Glob/buildlink3.mk"
 .include "../../converters/hs-aeson/buildlink3.mk"
 .include "../../converters/hs-aeson-pretty/buildlink3.mk"

Index: pkgsrc/lang/spago/PLIST
diff -u pkgsrc/lang/spago/PLIST:1.3 pkgsrc/lang/spago/PLIST:1.4
--- pkgsrc/lang/spago/PLIST:1.3	Tue Oct 31 12:21:13 2023
+++ pkgsrc/lang/spago/PLIST	Sat May  4 15:46:22 2024
@@ -1,7 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2023/10/31 12:21:13 pho Exp $
+@comment $NetBSD: PLIST,v 1.4 2024/05/04 15:46:22 pho Exp $
 bin/spago
-lib/${PKGNAME}/${HS_VERSION}/package-description
-lib/${PKGNAME}/${HS_VERSION}/package-id
 lib/${HS_PLATFORM}/${HS_PKGID}/Paths_spago.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Async.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Bower.hi
@@ -34,6 +32,8 @@ lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Typ
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Version.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/Spago/Watch.hi
 lib/${HS_PLATFORM}/${HS_PKGID}/libHS${HS_PKGID}.a
+lib/${PKGNAME}/${HS_VERSION}/package-description
+lib/${PKGNAME}/${HS_VERSION}/package-id
 share/doc/${HS_PLATFORM}/${PKGNAME}/LICENSE
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Async.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/Spago-Bower.html
@@ -107,12 +107,10 @@ ${PLIST.doc}share/doc/${HS_PLATFORM}/${P
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Y.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index-Z.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.html
-${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/doc-index.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/haddock-bundle.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/index.html
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/linuwial.css
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/meta.json
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.css
-${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/quick-jump.min.js
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/spago.haddock
 ${PLIST.doc}share/doc/${HS_PLATFORM}/${PKGNAME}/html/synopsis.png


--_----------=_1714837583186270--