 @@ -1,14 +1,14 @@
-# $NetBSD: haskell.mk,v 1.58 2023/11/01 17:55:08 pho Exp $
+# $NetBSD: haskell.mk,v 1.59 2024/04/28 08:33:44 pho Exp $
+#
 # This Makefile fragment handles Haskell Cabal packages. Package
 # configuration, building, installation, registration and unregistration
 # are fully automated. See also mk/haskell/README.md for a packaging guide.
+#
 # Package-settable variables:
+#
 # PKGNAME
 #	Defaults to hs-${DISTNAME}.
+#
 # HOMEPAGE
 # MASTER_SITES
 #	Default to HackageDB URLs.
 @@ -98,32 +98,32 @@ _PKG_VARS.haskell= \
 _DEF_VARS.haskell= \
 	BUILDLINK_PASSTHRU_DIRS \
 	USE_LANGUAGES \
 	CONFIGURE_ARGS \
 	PLIST_SUBST \
 	PRINT_PLIST_AWK \
 	GENERATE_PLIST \
 	PLIST_SRC \
 	FILES_SUBST \
 	INSTALLATION_DIRS \
 	INSTALL_TEMPLATES \
 	DEINSTALL_TEMPLATES \
 	UNLIMIT_RESOURCES \
 	_HASKELL_VERSION_CMD \
 	_HASKELL_BIN \
 	_HASKELL_PKG_BIN \
 	_HASKELL_PKG_DESCR_FILE_OR_DIR \
 	_HASKELL_PKG_ID_FILE \
-	_HASKELL_VERSION
+	_HASKELL_VERSION \
 	_HS_ORIG_LD_CMD
 _USE_VARS.haskell= \
 	DISTNAME \
 	PKG_VERBOSE \
 	BUILDLINK_PREFIX.ghc \
 	MASTER_SITE_HASKELL_HACKAGE \
 	PKGDIR DESTDIR \
 	PREFIX \
 	WRKSRC
 _SORTED_VARS.haskell= \
 	HASKELL_UNRESTRICT_DEPENDENCIES
 _LISTED_VARS.haskell= \
 	BUILDLINK_PASSTHRU_DIRS \
 	CONFIGURE_ARGS \
 @@ -148,31 +148,34 @@ HASKELL_ENABLE_HADDOCK_DOCUMENTATION?=	y
 HASKELL_ENABLE_TESTS?=			no
 HASKELL_UNRESTRICT_DEPENDENCIES?=	# empty
 .include "../../lang/ghc96/buildlink3.mk"
 # Some Cabal packages requires preprocessors to build, and we don't
 # want them to implicitly depend on such tools. Place dummy scripts by
 # default.
 .include "../../mk/haskell/tools/alex.mk"
 .include "../../mk/haskell/tools/cpphs.mk"
 .include "../../mk/haskell/tools/happy.mk"
 # Tools
-_HASKELL_BIN=		${BUILDLINK_PREFIX.ghc:U${PREFIX}}/bin/ghc
+_HASKELL_BIN=		${BUILDLINK_PREFIX.ghc:U${LOCALBASE}}/bin/ghc
-_HASKELL_PKG_BIN=	${BUILDLINK_PREFIX.ghc:U${PREFIX}}/bin/ghc-pkg
+_HASKELL_PKG_BIN=	${BUILDLINK_PREFIX.ghc:U${LOCALBASE}}/bin/ghc-pkg
-_HASKELL_VERSION_CMD=	${_HASKELL_BIN} -V 2>/dev/null | ${CUT} -d ' ' -f 8
+.if !defined(_HASKELL_VERSION)
-_HASKELL_VERSION=	ghc-${_HASKELL_VERSION_CMD:sh}
+_HASKELL_VERSION_CMD=	${_HASKELL_BIN:Q} --numeric-version
 _HASKELL_VERSION:=	ghc-${_HASKELL_VERSION_CMD:sh}
 .endif
 MAKEVARS+=		_HASKELL_VERSION
 # By default GHC uses a per-user default environment file if one is
 # available. Cabal has to be visible in order to compile Setup.?hs,
 # but per-user default environment files usually don't mark it as
 # visible. Tell GHC not to read any environment files.
 _HASKELL_BUILD_SETUP_OPTS=	-package-env -
 # GHC requires C compiler.
 USE_LANGUAGES+=	c
 # Haskell packages don't use semvars but they use something similar to it,
 # which is called Haskell PVP (https://pvp.haskell.org/). Packages usually
 # have version constraints on their dependencies that specify not only
 @@ -250,27 +253,27 @@ CONFIGURE_ARGS+=	--enable-split-sections
 .endif
 # Support RELRO. When PKGSRC_USE_RELRO isn't set to "no",
 # mk/compiler/{ghc,clang}.mk add "-Wl,-z,relro" and optionally
 # "-Wl,-z,now" to LDFLAGS. Since Cabal doesn't respect the environment
 # variable LDFLAGS, we need to be explicit about it. Note that -optl
 # is a GHC option which specifies options to be passed to CC, not LD,
 # while linking executables and shared libraries.
 CONFIGURE_ARGS+=	${LDFLAGS:S/^/--ghc-options=-optl\ /}
 # GHC heavily uses "ld -r" to combine multiple .o files but our ld
 # wrapper is going to inject the relro flags. In this case these flags
 # don't make sense so ld(1) emits warnings. Use the original,
 # non-wrapped ld(1) for merging objects as a dirty workaround.
-_HS_ORIG_LD_CMD=	${SETENV} PATH=${_PATH_ORIG} which ld
+_HS_ORIG_LD_CMD=	${SETENV} PATH=${_PATH_ORIG} which ${LD}
 CONFIGURE_ARGS+=	--ghc-options=-pgmlm\ ${_HS_ORIG_LD_CMD:sh}
 CONFIGURE_ARGS+=	--ghc-options=-optlm\ -r
 # When a Template Haskell splice is to be evaluated by a dynamically-linked
 # GHC, it first compiles the splice and creates a .so file like
 # /tmp/ghc_XXXX/libghc_XX.so, then it dlopen's it. When the source file
 # contains more than one splice, subsequent splices will refer to previous
 # ones via "-L/tmp/ghc_XXXX -Wl,-rpath,/tmp/ghc_XXXX -lghc_XX". This means
 # /tmp/ghc_* must be protected from getting removed by our wrappers. We
 # also want to be explicit about the path to be chosen for temporary files.
 CONFIGURE_ARGS+=		--ghc-options=-tmpdir\ ${TMPDIR:U/tmp:Q}
 BUILDLINK_PASSTHRU_DIRS+=	${TMPDIR:U/tmp}
 @@ -292,28 +295,31 @@ _HS_PLIST_STATUS=	ok
 .endif
 # Starting from GHC 7.10 (or 7.8?), packages are installed in directories
 # with a hashed name, which makes it a bit more complicated to generate
 # the PLIST.
+#
 # There is no easy way to obtain a platform string such as
 # "x86_64-netbsd-ghc-9.0.1". If the package contains a library we
 # could extract it from the description file, but if it's
 # executable-only there's no such file. As a workaround we read the
 # description of "base" (which always exists) and extract the platform
 # from it.
 .if !defined(_HS_PLIST.platform)
 _HS_PLIST.platform.cmd=		${_HASKELL_PKG_BIN} --simple-output field base data-dir
-_HS_PLIST.platform=		${_HS_PLIST.platform.cmd:sh:H:T}
+_HS_PLIST.platform:=		${_HS_PLIST.platform.cmd:sh:H:T}
 .endif
 MAKEVARS+=			_HS_PLIST.platform
 # Abbreviated compiler version. Used for shared libraries.
 _HS_PLIST.short-ver=		${_HASKELL_VERSION:S,-,,}
 PLIST_SUBST+=			HS_PLATFORM=${_HS_PLIST.platform}
 PLIST_SUBST+=			HS_VERSION=${_HASKELL_VERSION}
 PLIST_SUBST+=			HS_VER=${_HS_PLIST.short-ver}
 # Package IDs formatted as "{name}-{version}-{hash}": these only exist if
 # the package contains at least one library.
 _HS_PLIST.subst-libs.cmd=	\
 	if [ -f ${DESTDIR:Q}${_HASKELL_PKG_ID_FILE:Q} ]; then \
 		n=`${WC} -l ${DESTDIR:Q}${_HASKELL_PKG_ID_FILE:Q} | ${AWK} '{print $$1}'`; \
 		if [ "$$n" -eq 1 ]; then \
 			pkg_id=`${CAT} ${DESTDIR:Q}${_HASKELL_PKG_ID_FILE:Q}`; \