CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Sun Oct 29 07:51:22 UTC 2023

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk (HASKELL_UNRESTRICT_DEPENDENCIES): Tighten the regex futher to avoid unintended matches


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 pkgsrc/mk/haskell.mk

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

Modified files:

Index: pkgsrc/mk/haskell.mk
diff -u pkgsrc/mk/haskell.mk:1.55 pkgsrc/mk/haskell.mk:1.56
--- pkgsrc/mk/haskell.mk:1.55   Mon Oct  9 05:30:01 2023
+++ pkgsrc/mk/haskell.mk        Sun Oct 29 07:51:22 2023
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.55 2023/10/09 05:30:01 pho Exp $
+# $NetBSD: haskell.mk,v 1.56 2023/10/29 07:51:22 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -186,8 +186,8 @@ SUBST_FILES.cabal?= ${HASKELL_PKG_NAME:C
 SUBST_MESSAGE.cabal?=  Relaxing version constraints on dependencies
 .  for _pkg_ in ${HASKELL_UNRESTRICT_DEPENDENCIES}
 # Leading whitespace, or commas, or colons to avoid mismatches, remove
-# version constraints up to end of line or ','.
-SUBST_SED.cabal+=      -Ee 's/((^|[,:])[[:space:]]*${_pkg_})[[:space:]=><^][^,]+(,|$$)/\1\3/g'
+# version constraints up to end of line, ',', or '}'.
+SUBST_SED.cabal+=      -Ee 's/((^|[,:])[[:space:]]*${_pkg_})[[:space:]=><^][^,}]+([,}]|$$)/\1\3/g'
 .  endfor
 .endif