Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_16988877011750"
MIME-Version: 1.0
Date: Thu, 2 Nov 2023 01:15:01 +0000
From: "Masatake Daimon" <pho@netbsd.org>
Subject: CVS commit: pkgsrc/devel/happy
To: pkgsrc-changes@NetBSD.org
Approved: commit_and_comment
Reply-To: pho@netbsd.org
Message-Id: <20231102011501.7EAFBFA2A@cvs.NetBSD.org>

This is a multi-part message in MIME format.

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

Module Name:	pkgsrc
Committed By:	pho
Date:		Thu Nov  2 01:15:01 UTC 2023

Modified Files:
	pkgsrc/devel/happy: Makefile distinfo
Added Files:
	pkgsrc/devel/happy/patches: patch-happy.cabal

Log Message:
devel/happy: Fix build on platforms where ${SED} is textproc/nbsed


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/devel/happy/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/devel/happy/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/happy/patches/patch-happy.cabal

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


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

Modified files:

Index: pkgsrc/devel/happy/Makefile
diff -u pkgsrc/devel/happy/Makefile:1.13 pkgsrc/devel/happy/Makefile:1.14
--- pkgsrc/devel/happy/Makefile:1.13	Thu Oct 26 05:41:00 2023
+++ pkgsrc/devel/happy/Makefile	Thu Nov  2 01:15:01 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2023/10/26 05:41:00 pho Exp $
+# $NetBSD: Makefile,v 1.14 2023/11/02 01:15:01 pho Exp $
 
 DISTNAME=	happy-1.21.0
 PKGNAME=	${DISTNAME}
@@ -13,16 +13,6 @@ TOOL_DEPENDS+=	docbook-xsl-[0-9]*:../../
 TOOL_DEPENDS+=	libxml2-[0-9]*:../../textproc/libxml2
 TOOL_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 
-# happy tries to use itself in the building process of the test suite but
-# the current version of Cabal (shipped with GHC 9.6) doesn't support it
-# yet. We must disable the test suite for now.
-SUBST_CLASSES+=		tests
-SUBST_STAGE.tests=	post-extract
-SUBST_FILES.tests=	happy.cabal
-SUBST_SED.tests+=	-e '/test-suite tests/a\${.newline}  buildable: False'
-SUBST_SED.tests+=	-e '/build-tools: happy/d'
-CONFIGURE_ARGS+=	-f-bootstrap
-
 CONFIGURE_ENV+=	fp_cv_dir_docbook_xsl=${PREFIX}/share/xsl/docbook
 CONFIGURE_ENV+=	ac_cv_path_DbLatexCmd= # empty
 pre-configure:

Index: pkgsrc/devel/happy/distinfo
diff -u pkgsrc/devel/happy/distinfo:1.8 pkgsrc/devel/happy/distinfo:1.9
--- pkgsrc/devel/happy/distinfo:1.8	Thu Oct 26 05:41:00 2023
+++ pkgsrc/devel/happy/distinfo	Thu Nov  2 01:15:01 2023
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.8 2023/10/26 05:41:00 pho Exp $
+$NetBSD: distinfo,v 1.9 2023/11/02 01:15:01 pho Exp $
 
 BLAKE2s (happy-1.21.0.tar.gz) = 4e89a615c68b1b1227224c2cc92155fbb4f912a9a715f606d592e8a573994ff4
 SHA512 (happy-1.21.0.tar.gz) = d63e33fe958865c560eed01e54f3384d09b6b2b2282480db302366492d18a7fd67f530d92206f8ff19e0842942f608a8d226ea66cd947583c78e800f6d580fec
 Size (happy-1.21.0.tar.gz) = 173506 bytes
+SHA1 (patch-happy.cabal) = 75908ad83a457edc4b2aa11adb9ed1da7937b1de

Added files:

Index: pkgsrc/devel/happy/patches/patch-happy.cabal
diff -u /dev/null pkgsrc/devel/happy/patches/patch-happy.cabal:1.1
--- /dev/null	Thu Nov  2 01:15:01 2023
+++ pkgsrc/devel/happy/patches/patch-happy.cabal	Thu Nov  2 01:15:01 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-happy.cabal,v 1.1 2023/11/02 01:15:01 pho Exp $
+
+happy tries to use itself in the building process of the test suite but the
+current version of Cabal (shipped with GHC 9.6) doesn't support it yet. We
+must disable the test suite for now.
+
+--- happy.cabal.orig	2023-11-01 10:57:50.000000000 +0000
++++ happy.cabal
+@@ -146,7 +146,7 @@ extra-source-files:
+ flag bootstrap
+   description: Optimize the implementation of happy using a pre-built happy
+   manual: True
+-  default: True
++  default: False
+ 
+ source-repository head
+   type:     git
+@@ -203,10 +203,10 @@ executable happy
+ 
+ 
+ test-suite tests
++  buildable: False
+   type: exitcode-stdio-1.0
+   main-is: test.hs
+   -- This line is important as it ensures that the local `exe:happy` component declared above is built before the test-suite component is invoked, as well as making sure that `happy` is made available on $PATH and `$happy_datadir` is set accordingly before invoking `test.hs`
+-  build-tools: happy
+ 
+   build-depends: base, process
+   default-language: Haskell98


--_----------=_16988877011750--