 @@ -1,14 +1,14 @@
-# $NetBSD: haskell.mk,v 1.59 2024/04/28 08:33:44 pho Exp $
+# $NetBSD: haskell.mk,v 1.60 2024/04/28 08:55:37 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.
 @@ -99,39 +99,42 @@ _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_BIN \
 	_HASKELL_GLOBAL_PKG_DB \
 	_HASKELL_PKG_BIN \
 	_HASKELL_PKG_DESCR_FILE_OR_DIR \
 	_HASKELL_PKG_ID_FILE \
 	_HASKELL_VERSION \
 	_HS_ORIG_LD_CMD
 _USE_VARS.haskell= \
 	DISTNAME \
 	PKG_VERBOSE \
 	BUILDLINK_PREFIX.ghc \
 	MASTER_SITE_HASKELL_HACKAGE \
 	PKGDIR DESTDIR \
 	PREFIX \
-	WRKSRC
+	WRKSRC \
 	_MAKE_JOBS_N \
 	_PATH_ORIG
 _SORTED_VARS.haskell= \
 	HASKELL_UNRESTRICT_DEPENDENCIES
 _LISTED_VARS.haskell= \
 	BUILDLINK_PASSTHRU_DIRS \
 	CONFIGURE_ARGS \
 	PLIST_SUBST \
 	PRINT_PLIST_AWK \
 	FILES_SUBST
 _IGN_VARS.haskell= \
 	USE_TOOLS CONFIGURE_ENV MAKE_ENV WARNINGS _*
 PKGNAME?=	hs-${DISTNAME}
 MASTER_SITES?=	${MASTER_SITE_HASKELL_HACKAGE:=${DISTNAME}/}
 @@ -157,26 +160,33 @@ HASKELL_UNRESTRICT_DEPENDENCIES?=	# empt
 .include "../../mk/haskell/tools/cpphs.mk"
 .include "../../mk/haskell/tools/happy.mk"
 # Tools
 _HASKELL_BIN=		${BUILDLINK_PREFIX.ghc:U${LOCALBASE}}/bin/ghc
 _HASKELL_PKG_BIN=	${BUILDLINK_PREFIX.ghc:U${LOCALBASE}}/bin/ghc-pkg
 .if !defined(_HASKELL_VERSION)
 _HASKELL_VERSION_CMD=	${_HASKELL_BIN:Q} --numeric-version
 _HASKELL_VERSION:=	ghc-${_HASKELL_VERSION_CMD:sh}
 .endif
 MAKEVARS+=		_HASKELL_VERSION
 # Determine the path to the global Haskell package database. We need this
 # in our INSTALL and DEINSTALL hooks.
 .if !defined(_HASKELL_GLOBAL_PKG_DB)
 _HASKELL_GLOBAL_PKG_DB!=	${_HASKELL_BIN:Q} --print-global-package-db
 .endif
 MAKEVARS+=			_HASKELL_GLOBAL_PKG_DB
 # 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
 # lower bounds but also upper bounds. The problem is that, while lower
 @@ -296,27 +306,27 @@ _HS_PLIST_STATUS=	ok
 # 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.cmd=		${_HASKELL_PKG_BIN:Q} --simple-output field base data-dir
 _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 \
 @@ -462,29 +472,30 @@ do-install:
 		elif [ -f dist/package-description ]; then \
 			${INSTALL_DATA} dist/package-description \
 				${DESTDIR:Q}${_HASKELL_PKG_DESCR_FILE_OR_DIR:Q}; \
 			${INSTALL_DATA} dist/package-id \
 				${DESTDIR:Q}${_HASKELL_PKG_ID_FILE:Q}; \
 		fi
 # Executable-only packages tend to create an empty directory tree in
 # lib/ which results in useless @pkgdir in PLIST.
 	${RUN}${FIND} ${DESTDIR:Q}${PREFIX}/lib -type d | \
 		${TAIL} -n 1 | \
 		${XARGS} ${RMDIR} -p 2>/dev/null || ${TRUE}
 # Substitutions for INSTALL and DEINSTALL.
-FILES_SUBST+=	HASKELL_PKG_BIN=${_HASKELL_PKG_BIN}
+FILES_SUBST+=	HASKELL_GLOBAL_PKG_DB=${_HASKELL_GLOBAL_PKG_DB:Q}
-FILES_SUBST+=	HASKELL_PKG_DESCR_FILE_OR_DIR=${_HASKELL_PKG_DESCR_FILE_OR_DIR}
+FILES_SUBST+=	HASKELL_PKG_BIN=${_HASKELL_PKG_BIN:Q}
-FILES_SUBST+=	HASKELL_PKG_ID_FILE=${_HASKELL_PKG_ID_FILE}
+FILES_SUBST+=	HASKELL_PKG_DESCR_FILE_OR_DIR=${_HASKELL_PKG_DESCR_FILE_OR_DIR:Q}
 FILES_SUBST+=	HASKELL_PKG_ID_FILE=${_HASKELL_PKG_ID_FILE:Q}
 FILES_SUBST+=	AWK=${AWK:Q}
 FILES_SUBST+=	EXPR=${EXPR:Q}
 FILES_SUBST+=	TRUE=${TRUE:Q}
 INSTALL_TEMPLATES+=	../../mk/haskell/INSTALL.in
 DEINSTALL_TEMPLATES+=	../../mk/haskell/DEINSTALL.in
 # Only present these variables if the definitions can be extracted
 # from the files in DESTDIR.
 _DEF_VARS.haskell+=	_HS_PLIST.platform
 _DEF_VARS.haskell+=	_HS_PLIST.short-ver
 .endif # HASKELL_MK

 @@ -1,26 +1,31 @@
 # -*- sh -*-
-# $NetBSD: DEINSTALL.in,v 1.3 2022/02/11 01:11:57 pho Exp $
+# $NetBSD: DEINSTALL.in,v 1.4 2024/04/28 08:55:37 pho Exp $
+#
 HASKELL_GLOBAL_PKG_DB="@HASKELL_GLOBAL_PKG_DB@"
 HASKELL_PKG_BIN="@HASKELL_PKG_BIN@"
 HASKELL_PKG_ID_FILE="@HASKELL_PKG_ID_FILE@"
 AWK="@AWK@"
 WC="@WC@"
 case ${STAGE} in
     DEINSTALL)
         if [ -f "${HASKELL_PKG_ID_FILE}" ]; then
             # The package contains one or more libraries. The order of
             # unregistration is important here; libraries with higher
             # indices may depend on those with lower ones so we need to
             # unregister them in the reverse order.
             ${AWK} 'BEGIN { i = 0 }
                           { lines[i++] = $0 }
                     END   { for (j=i-1; j>=0; )
                                 print lines[j--] }' "${HASKELL_PKG_ID_FILE}" |
                 while read pkg_id; do
                     ${ECHO} "Unregistering \`$pkg_id'..."
-                    ${HASKELL_PKG_BIN} unregister --force --ipid "$pkg_id"
+                    ${HASKELL_PKG_BIN} \
                         --package-db="${HASKELL_GLOBAL_PKG_DB}" \
                         --force \
                         --ipid \
                         unregister "$pkg_id"
                 done
         fi
         ;;
 esac

 @@ -1,31 +1,35 @@
 # -*- sh -*-
-# $NetBSD: INSTALL.in,v 1.3 2022/02/11 01:11:57 pho Exp $
+# $NetBSD: INSTALL.in,v 1.4 2024/04/28 08:55:37 pho Exp $
+#
 HASKELL_GLOBAL_PKG_DB="@HASKELL_GLOBAL_PKG_DB@"
 HASKELL_PKG_BIN="@HASKELL_PKG_BIN@"
 HASKELL_PKG_DESCR_FILE_OR_DIR="@HASKELL_PKG_DESCR_FILE_OR_DIR@"
 EXPR="@EXPR@"
 TRUE="@TRUE@"
 case ${STAGE} in
     POST-INSTALL)
         if [ -f "${HASKELL_PKG_DESCR_FILE_OR_DIR}" ]; then
             # The package contains a single library.
-            ${HASKELL_PKG_BIN} register "${HASKELL_PKG_DESCR_FILE_OR_DIR}";
+            ${HASKELL_PKG_BIN} \
                 --package-db="${HASKELL_GLOBAL_PKG_DB}" \
                 register "${HASKELL_PKG_DESCR_FILE_OR_DIR}";
         elif [ -d "${HASKELL_PKG_DESCR_FILE_OR_DIR}" ]; then
             # The package contains two or more libraries. The order of
             # registration is important here; libraries with higher indices
             # may depend on those with lower ones.
             i=1
             while ${TRUE}; do
                 if [ -f "${HASKELL_PKG_DESCR_FILE_OR_DIR}/${i}" ]; then
                     ${HASKELL_PKG_BIN} \
                         --package-db="${HASKELL_GLOBAL_PKG_DB}" \
                         register "${HASKELL_PKG_DESCR_FILE_OR_DIR}/${i}"
                     i=`${EXPR} $i + 1`
                 else
                     break
                 fi
             done
         fi
         ;;
 esac