CVS commit: pkgsrc/mk

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

Module Name:    pkgsrc
Committed By:   pho
Date:           Mon Jan 30 11:09:42 UTC 2023

Modified Files:
        pkgsrc/mk: haskell.mk

Log Message:
mk/haskell.mk: Tighten the regex for HASKELL_UNRESTRICT_DEPENDENCIES to prevent unintended substitutions


To generate a diff of this commit:
cvs rdiff -u -r1.52 -r1.53 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.52 pkgsrc/mk/haskell.mk:1.53
--- pkgsrc/mk/haskell.mk:1.52   Tue Jan 24 11:57:09 2023
+++ pkgsrc/mk/haskell.mk        Mon Jan 30 11:09:42 2023
@@ -1,4 +1,4 @@
-# $NetBSD: haskell.mk,v 1.52 2023/01/24 11:57:09 pho Exp $
+# $NetBSD: haskell.mk,v 1.53 2023/01/30 11:09:42 pho Exp $
 #
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
@@ -187,7 +187,7 @@ SUBST_MESSAGE.cabal?=       Relaxing version c
 .  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_})[^[:alpha:],]+(,|$$)/\1\3/g'
+SUBST_SED.cabal+=      -Ee 's/((^|[,:])[[:space:]]*${_pkg_})[[:space:]=><^][^,]+(,|$$)/\1\3/g'
 .  endfor
 .endif