CVS commit: pkgsrc/devel/happy

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Aug 20 19:23:36 UTC 2025

Modified Files:
        pkgsrc/devel/happy: Makefile distinfo
        pkgsrc/devel/happy/patches: patch-app_Main.lhs

Log Message:
devel/happy: update to happy-2.1.7

## 2.1.7

* Add support for `{-# OPTIONS_HAPPY ... #-}` pragmas
  ([#342](https://github.com/haskell/happy/issues/342)).

* Tested with GHC 8.0 - 9.12.2.
  The Haskell code generated by Happy is for GHC 8.0 and up.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/devel/happy/Makefile
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/happy/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/happy/patches/patch-app_Main.lhs

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

Modified files:

Index: pkgsrc/devel/happy/Makefile
diff -u pkgsrc/devel/happy/Makefile:1.24 pkgsrc/devel/happy/Makefile:1.25
--- pkgsrc/devel/happy/Makefile:1.24    Wed Aug 13 11:06:27 2025
+++ pkgsrc/devel/happy/Makefile Wed Aug 20 19:23:36 2025
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.24 2025/08/13 11:06:27 pho Exp $
+# $NetBSD: Makefile,v 1.25 2025/08/20 19:23:36 wiz Exp $
 
-DISTNAME=      happy-2.1.6
+DISTNAME=      happy-2.1.7
 PKGNAME=       ${DISTNAME}
-PKGREVISION=   1
 CATEGORIES=    devel
 
 MAINTAINER=    esg%sdf.lonestar.org@localhost

Index: pkgsrc/devel/happy/distinfo
diff -u pkgsrc/devel/happy/distinfo:1.14 pkgsrc/devel/happy/distinfo:1.15
--- pkgsrc/devel/happy/distinfo:1.14    Sun Jul 20 10:15:05 2025
+++ pkgsrc/devel/happy/distinfo Wed Aug 20 19:23:36 2025
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.14 2025/07/20 10:15:05 wiz Exp $
+$NetBSD: distinfo,v 1.15 2025/08/20 19:23:36 wiz Exp $
 
-BLAKE2s (happy-2.1.6.tar.gz) = a2279eba90449afb7556916eaa070417cdbf953f8ba88785dbea8e5b4fd829a6
-SHA512 (happy-2.1.6.tar.gz) = a00dd06645dd7658f8675d68365e96460479e50760d395707f688d8d4a157d114c6a0228ff16068fb584ab9cb15149def111140539387795c6385e72362ac30a
-Size (happy-2.1.6.tar.gz) = 61435 bytes
-SHA1 (patch-app_Main.lhs) = 057b8377a874a2007373153756521813395b04e3
+BLAKE2s (happy-2.1.7.tar.gz) = ec531c2f7f2ee86b02c9a048af5846348c18620af90d3b85963435ecc9e595b9
+SHA512 (happy-2.1.7.tar.gz) = 3579fd3217f28b8269afcb21b46d74ce160a2ddbe3e6edc7018e945851be8c573c77d7e0884a47ea90e1320bcec9d3f9be8fc284143c4477428f7f65560cd308
+Size (happy-2.1.7.tar.gz) = 62023 bytes
+SHA1 (patch-app_Main.lhs) = f7fbffb1bc67311707c0d3196dd616ea3d434195

Index: pkgsrc/devel/happy/patches/patch-app_Main.lhs
diff -u pkgsrc/devel/happy/patches/patch-app_Main.lhs:1.1 pkgsrc/devel/happy/patches/patch-app_Main.lhs:1.2
--- pkgsrc/devel/happy/patches/patch-app_Main.lhs:1.1   Fri Jan 31 07:36:48 2025
+++ pkgsrc/devel/happy/patches/patch-app_Main.lhs       Wed Aug 20 19:23:36 2025
@@ -1,4 +1,4 @@
-$NetBSD: patch-app_Main.lhs,v 1.1 2025/01/31 07:36:48 pho Exp $
+$NetBSD: patch-app_Main.lhs,v 1.2 2025/08/20 19:23:36 wiz Exp $
 
 Workaround for happy chokes on non-ASCII inputs when the locale isn't
 "*.UTF-8". This is probably not a desirable way to fix it but a proper fix
@@ -7,12 +7,12 @@ devel/hs-ghc-lib-parser.
 
 TODO: Report this to upstream and let them decide what to do.
 
---- app/Main.lhs.orig  2025-01-31 01:25:49.829104023 +0000
+--- app/Main.lhs.orig  2001-09-09 01:46:40.000000000 +0000
 +++ app/Main.lhs
-@@ -28,12 +28,14 @@ Path settings auto-generated by Cabal:
- > import System.Environment
+@@ -29,12 +29,14 @@ Path settings auto-generated by Cabal:
  > import System.Exit (exitWith, ExitCode(..))
  > import Data.Char
+ > import Data.List ( union )
 +> import GHC.IO.Encoding (setLocaleEncoding)
  > import System.IO
  > import Data.List( isSuffixOf )