 @@ -1,194 +1,194 @@
-# $NetBSD: Makefile,v 1.51 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.52 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-7.10.3-src
 PKGREVISION=	7
 PKGNAME=	${DISTNAME:S/-src$//}
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pho@cielonegro.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 7.10 Release Series
 LICENSE=	modified-bsd
 MKPIE_SUPPORTED=	no
 # GHC requires GHC to build itself. Formerly we could work around this
 # bootstrapping problem by creating a special archive containing C
 # sources compiled from Haskell sources, but that's no longer
 # possible. So we have to prepare stripped-down binaries sufficient to
 # bootstrap compilers for each platforms. If you want to build them
 # yourself, follow instructions in BOOTSTRAP.txt and ./bootstrap.mk
 BROKEN_EXCEPT_ON_PLATFORM+= \
 	Darwin-*-powerpc \
 	FreeBSD-*-i386 \
 	NetBSD-*-x86_64 \
 	SunOS-*-i386 \
 	SunOS-*-x86_64
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 # The runtime dependency on perl is due to the evil splitter
 # (lib/${PKGNAME_NOREV}/ghc-split).
 USE_TOOLS+=			autoconf gmake gzip perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 CONFIGURE_ARGS.common= \
 	--with-gcc=${CC:Q} \
 	--with-ld=${LD:Q} \
 	--with-curses-includes=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_INCDIRS.curses:Q} \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-system-libffi \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_LIBDIRS.libffi:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 CONFIGURE_ENV+= \
 	ac_cv_path_fp_prog_ar=${AR:Q} \
 	ac_cv_path_READELF=readelf \
 	PerlCmd=${PERL5:Q}
 # LDFLAGS is currently not honored by "./configure". Since LDFLAGS
 # contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will
 # have any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+= \
 	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # The runtime system of GHC (rts) tends to conflict with PaX MPROTECT
 # because it needs to generate various kinds of code at run time. The
 # RTS linker, whose job is to load *static* objects at run time,
 # doesn't play nice with ASLR either. This means most executables
 # produced by GHC need them to be disabled. Perhaps we should patch
 # rts/sm/Storage.c so that it uses ffi_closure_alloc(3) on every
 # platform, not just Linux, and also drop support for static library
 # loading and switch to dynamic libraries entirely.
 .for f in ghc ghc-pkg haddock hpc hsc2hs runghc
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC:Q}/libraries/base        && autoconf
 	${RUN} cd ${WRKSRC:Q}/libraries/integer-gmp && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc7/bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC:Q}/mk/build.mk
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_DOCBOOK_PS  = NO" >> ${WRKSRC:Q}/mk/build.mk
 	${RUN} ${ECHO} "BUILD_DOCBOOK_PDF = NO" >> ${WRKSRC:Q}/mk/build.mk
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR:Q}${PREFIX:Q} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # There is an unused script which don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 BUILD_DEPENDS+=	libxslt-[0-9]*:../../textproc/libxslt
 BUILD_DEPENDS+=	docbook-xsl-[0-9]*:../../textproc/docbook-xsl
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX:Q}/emul/netbsd/usr/lib
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,194 +1,194 @@
-# $NetBSD: Makefile,v 1.15 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.16 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-8.0.2-src
 PKGNAME=	${DISTNAME:S/-src$//}
 PKGREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pho@cielonegro.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 8.0 Release Series
 LICENSE=	modified-bsd
 MKPIE_SUPPORTED=	no
 UNLIMIT_RESOURCES=	datasize virtualsize
 # GHC requires GHC to build itself. Formerly we could work around this
 # bootstrapping problem by creating a special archive containing C
 # sources compiled from Haskell sources, but that's no longer
 # possible. So we have to prepare stripped-down binaries sufficient to
 # bootstrap compilers for each platforms. If you want to build them
 # yourself, follow instructions in BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-powerpc # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 # The runtime dependency on perl is due to the evil splitter
 # (lib/${PKGNAME_NOREV}/ghc-split).
 USE_TOOLS+=			autoconf gmake gzip perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 CONFIGURE_ARGS.common= \
 	--with-gcc=${CC:Q} \
 	--with-ld=${LD:Q} \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses:Q}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp:Q}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv:Q}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-system-libffi \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi:Q}/${BUILDLINK_LIBDIRS.libffi:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 CONFIGURE_ENV+= \
 	ac_cv_path_fp_prog_ar=${AR:Q} \
 	PerlCmd=${PERL5:Q}
 # LDFLAGS is currently not honored by "./configure". Since LDFLAGS
 # contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will
 # have any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+= \
 	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # The runtime system of GHC (rts) tends to conflict with PaX MPROTECT
 # because it needs to generate various kinds of code at run time. The
 # RTS linker, whose job is to load *static* objects at run time,
 # doesn't play nice with ASLR either. This means most executables
 # produced by GHC need them to be disabled. Perhaps we should patch
 # rts/sm/Storage.c so that it uses ffi_closure_alloc(3) on every
 # platform, not just Linux, and also drop support for static library
 # loading and switch to dynamic libraries entirely.
 .for f in ghc ghc-iserv ghc-iserv-dyn ghc-iserv-prof ghc-pkg haddock hpc hsc2hs runghc
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC:Q}                       && autoconf
 	${RUN} cd ${WRKSRC:Q}/libraries/base        && autoconf
 	${RUN} cd ${WRKSRC:Q}/libraries/integer-gmp && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc80/bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC:Q}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS    = NO" >> ${WRKSRC:Q}/mk/build.mk
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_SPHINX_PDF = NO" >> ${WRKSRC:Q}/mk/build.mk
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR:Q}${PREFIX:Q}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR:Q}${PREFIX:Q} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # There is an unused script which don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 BUILDLINK_DEPMETHOD.python:=	build
 .include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,236 +1,236 @@
-# $NetBSD: Makefile,v 1.10 2022/02/14 12:12:07 pho Exp $
+# $NetBSD: Makefile,v 1.11 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-8.10.4-src
 PKGREVISION=	4
 PKGNAME=	${DISTNAME:S/-src$//}
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 8.10 Release Series
 LICENSE=	modified-bsd
 MKPIE_SUPPORTED=	no
 UNLIMIT_RESOURCES=	datasize virtualsize
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platforms. If
 # you want to build them yourself, follow instructions in
 # BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-powerpc # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 # The runtime dependency on perl is due to the evil splitter
 # (lib/${PKGNAME_NOREV}/ghc-split).
 USE_TOOLS+=			autoconf gmake perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 # TODO: Disable the splitter entirely so that we can drop the runtime
 # dependency on perl. The purpose of the splitter is to perform a dead
 # code elimination by breaking .o files into many pieces. This only
 # makes sense when linking executables statically, which is rarely
 # done these days.
 # -----------------------------------------------------------------------------
 # Configuration
+#
 CONFIGURE_ARGS.common= \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-system-libffi \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_LIBDIRS.libffi:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 # We must pass non-wrapper tools to ./configure because they will be
 # embedded in the compiler (actually ${WRKSRC}/settings).
 CONFIGURE_ENV+= \
 	ac_cv_prog_fp_prog_ar=${AR:Q} \
 	ac_cv_prog_LIBTOOL=libtool \
 	PerlCmd=${PERL5:Q} \
 	CC=${CC:Q} \
 	LD=${LD:Q}
 # LDFLAGS is currently not honored by "./configure". Since LDFLAGS
 # contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will
 # have any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+= \
 	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:M*:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # -----------------------------------------------------------------------------
 # Security
+#
 # The runtime system of GHC (rts) tends to conflict with PaX MPROTECT
 # because it needs to generate various kinds of code at run time. The
 # RTS linker, whose job is to load *static* objects at run time,
 # doesn't play nice with ASLR either because it relies on
 # mmap(MAP_FIXED). This means most executables produced by GHC need
 # them to be disabled. Perhaps we should patch rts/sm/Storage.c so
 # that it uses ffi_closure_alloc(3) on every platform, not just Linux,
 # and also drop support for static library loading and switch to
 # dynamic libraries entirely.  (Partially done:
 # https://gitlab.haskell.org/ghc/ghc/merge_requests/2498)
 .for f in ghc ghc-iserv ghc-iserv-dyn ghc-iserv-prof ghc-pkg haddock hpc hsc2hs runghc
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # Additional note: Now that DYNAMIC_GHC_PROGRAMS is enabled by
 # default, we no longer need to disable PaX ASLR because the RTS
 # linker is not used... except for ghc-iserv. The program is launched
 # when ghci is started with -fexternal-interpreter without
 # -dynamic. Its purpose is to run non-PIC code from a dynamically
 # linked ghci, and therefore still uses RTS linker. Also note that RTS
 # linker requires PaX mprotect to be disabled too. This means that
 # once the merge request mentioned above is merged to the upstream, we
 # can at least enable PaX mprotect and PaX ASLR for all the
 # executables except ghc-iserv and ghc-iserv-prof.
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC} && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc810/bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # The version restriction on Sphinx in ${WRKSRC}/configure.ac is too
 # loose, and building docs/users_guide rarely succeeds. We don't know
 # which version is actually required for it.
 .include "../../mk/bsd.prefs.mk"
 BUILD_SPHINX_HTML?=	no
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC}/mk/build.mk
 .if ${BUILD_SPHINX_HTML} == "no"
 	${RUN} ${ECHO} "BUILD_SPHINX_HTML = NO" >> ${WRKSRC}/mk/build.mk
 .endif
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_SPHINX_PDF  = NO" >> ${WRKSRC}/mk/build.mk
 # https://gitlab.haskell.org/ghc/ghc/issues/13542
 .if ${OPSYS} == "SunOS"
 	${RUN} ${ECHO} "SplitSections  = YES" >> ${WRKSRC}/mk/build.mk
 .endif
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # There is an unused script which don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 .if ${BUILD_SPHINX_HTML} != "no"
 BUILDLINK_DEPMETHOD.python:=	build
 .include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .endif
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,212 +1,212 @@
-# $NetBSD: Makefile,v 1.17 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.18 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-8.4.4-src
 PKGNAME=	${DISTNAME:S/-src$//}
 PKGREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pho@cielonegro.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 8.4 Release Series
 LICENSE=	modified-bsd
 MKPIE_SUPPORTED=	no
 UNLIMIT_RESOURCES=	datasize virtualsize
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platforms. If
 # you want to build them yourself, follow instructions in
 # BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-powerpc # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 #BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-i386     # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 # The runtime dependency on perl is due to the evil splitter
 # (lib/${PKGNAME_NOREV}/ghc-split).
 USE_TOOLS+=			autoconf gmake perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 CONFIGURE_ARGS.common= \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-system-libffi \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_LIBDIRS.libffi:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 # We must pass non-wrapper tools to ./configure because they will be
 # embedded in the compiler (actually ${WRKSRC}/settings).
 CONFIGURE_ENV+= \
 	ac_cv_prog_fp_prog_ar=${AR:Q} \
 	ac_cv_prog_LIBTOOL=libtool \
 	PerlCmd=${PERL5:Q} \
 	CC=${CC:Q} \
 	LD=${LD:Q}
 # LDFLAGS is currently not honored by "./configure". Since LDFLAGS
 # contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will
 # have any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+= \
 	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:M*:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # The runtime system of GHC (rts) tends to conflict with PaX MPROTECT
 # because it needs to generate various kinds of code at run time. The
 # RTS linker, whose job is to load *static* objects at run time,
 # doesn't play nice with ASLR either. This means most executables
 # produced by GHC need them to be disabled. Perhaps we should patch
 # rts/sm/Storage.c so that it uses ffi_closure_alloc(3) on every
 # platform, not just Linux, and also drop support for static library
 # loading and switch to dynamic libraries entirely.
 .for f in ghc ghc-iserv ghc-iserv-dyn ghc-iserv-prof ghc-pkg haddock hpc hsc2hs runghc
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC} && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc84/bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # The version restriction on Sphinx in ${WRKSRC}/configure.ac is too
 # loose, and building docs/users_guide rarely succeeds. We don't know
 # which version is actually required for it.
 .include "../../mk/bsd.prefs.mk"
 BUILD_SPHINX_HTML?=	no
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC}/mk/build.mk
 .if ${BUILD_SPHINX_HTML} == "no"
 	${RUN} ${ECHO} "BUILD_SPHINX_HTML = NO" >> ${WRKSRC}/mk/build.mk
 .endif
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_SPHINX_PDF  = NO" >> ${WRKSRC}/mk/build.mk
 # https://gitlab.haskell.org/ghc/ghc/issues/13542
 .if ${OPSYS} == "SunOS"
 	${RUN} ${ECHO} "SplitSections     = YES" >> ${WRKSRC}/mk/build.mk
 .endif
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # There is an unused script which don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 .if ${BUILD_SPHINX_HTML} != "no"
 BUILDLINK_DEPMETHOD.python:=	build
 .include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .endif
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,238 +1,238 @@
-# $NetBSD: Makefile,v 1.23 2021/12/08 16:02:15 adam Exp $
+# $NetBSD: Makefile,v 1.24 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-8.8.4-src
 PKGNAME=	${DISTNAME:S/-src$//}
 PKGREVISION=	6
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pho@cielonegro.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 8.8 Release Series
 LICENSE=	modified-bsd
 MKPIE_SUPPORTED=	no
 UNLIMIT_RESOURCES=	datasize virtualsize
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platforms. If
 # you want to build them yourself, follow instructions in
 # BOOTSTRAP.txt and ./bootstrap.mk
 #BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-powerpc # Not available yet
 BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 # The runtime dependency on perl is due to the evil splitter
 # (lib/${PKGNAME_NOREV}/ghc-split).
 USE_TOOLS+=			autoconf gmake perl:run
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 # TODO: Disable the splitter entirely so that we can drop the runtime
 # dependency on perl. The purpose of the splitter is to perform a dead
 # code elimination by breaking .o files into many pieces. This only
 # makes sense when linking executables statically, which is rarely
 # done these days.
 # -----------------------------------------------------------------------------
 # Configuration
+#
 CONFIGURE_ARGS.common= \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-system-libffi \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_LIBDIRS.libffi:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 # We must pass non-wrapper tools to ./configure because they will be
 # embedded in the compiler (actually ${WRKSRC}/settings).
 CONFIGURE_ENV+= \
 	ac_cv_prog_fp_prog_ar=${AR:Q} \
 	ac_cv_prog_LIBTOOL=libtool \
 	PerlCmd=${PERL5:Q} \
 	CC=${CC:Q} \
 	LD=${LD:Q}
 # LDFLAGS is currently not honored by "./configure". Since LDFLAGS
 # contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will
 # have any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+= \
 	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:M*:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # -----------------------------------------------------------------------------
 # Security
+#
 # The runtime system of GHC (rts) tends to conflict with PaX MPROTECT
 # because it needs to generate various kinds of code at run time. The
 # RTS linker, whose job is to load *static* objects at run time,
 # doesn't play nice with ASLR either because it relies on
 # mmap(MAP_FIXED). This means most executables produced by GHC need
 # them to be disabled. Perhaps we should patch rts/sm/Storage.c so
 # that it uses ffi_closure_alloc(3) on every platform, not just Linux,
 # and also drop support for static library loading and switch to
 # dynamic libraries entirely.  (Partially done:
 # https://gitlab.haskell.org/ghc/ghc/merge_requests/2498)
 .for f in ghc ghc-iserv ghc-iserv-dyn ghc-iserv-prof ghc-pkg haddock hpc hsc2hs runghc
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # Additional note: Now that DYNAMIC_GHC_PROGRAMS is enabled by
 # default, we no longer need to disable PaX ASLR because the RTS
 # linker is not used... except for ghc-iserv. The program is launched
 # when ghci is started with -fexternal-interpreter without
 # -dynamic. Its purpose is to run non-PIC code from a dynamically
 # linked ghci, and therefore still uses RTS linker. Also note that RTS
 # linker requires PaX mprotect to be disabled too. This means that
 # once the merge request mentioned above is merged to the upstream, we
 # can at least enable PaX mprotect and PaX ASLR for all the
 # executables except ghc-iserv and ghc-iserv-prof.
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC} && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc88/bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # The version restriction on Sphinx in ${WRKSRC}/configure.ac is too
 # loose, and building docs/users_guide rarely succeeds. We don't know
 # which version is actually required for it.
 .include "../../mk/bsd.prefs.mk"
 BUILD_SPHINX_HTML?=	no
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC}/mk/build.mk
 .if ${BUILD_SPHINX_HTML} == "no"
 	${RUN} ${ECHO} "BUILD_SPHINX_HTML = NO" >> ${WRKSRC}/mk/build.mk
 .endif
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_SPHINX_PDF  = NO" >> ${WRKSRC}/mk/build.mk
 # https://gitlab.haskell.org/ghc/ghc/issues/13542
 .if ${OPSYS} == "SunOS"
 	${RUN} ${ECHO} "SplitSections  = YES" >> ${WRKSRC}/mk/build.mk
 .endif
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # There is an unused script which don't pass the portability test.
 CHECK_PORTABILITY_SKIP+=	distrib/prep-bin-dist-mingw
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 .if ${BUILD_SPHINX_HTML} != "no"
 BUILDLINK_DEPMETHOD.python:=	build
 .include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .endif
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if ${OPSYS} == "NetBSD" && empty(OS_VERSION:M[0-8].*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 # XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
 # libterminfo.so.1. See ./bootstrap.mk
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,259 +1,259 @@
-# $NetBSD: Makefile,v 1.19 2022/02/24 09:18:09 pho Exp $
+# $NetBSD: Makefile,v 1.20 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-9.0.2-src
 PKGREVISION=	1
 PKGNAME=	${DISTNAME:S/-src$//}
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 9.0 Release Series
 LICENSE=	modified-bsd
 UNLIMIT_RESOURCES=	datasize virtualsize
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platform. If
 # you want to build them yourself, follow instructions in
 # BOOTSTRAP.txt and ./bootstrap.mk
 BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-aarch64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64
 # We are going to do a PIE build on our responsibility. Do not put -pie in
 # wrappers, as that would prevent us from building stage-1 compiler.
 PKGSRC_OVERRIDE_MKPIE=	yes
 .include "options.mk"
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 USE_TOOLS+=			autoconf gmake
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 # -----------------------------------------------------------------------------
 # Configuration
+#
 CONFIGURE_ARGS.common+= \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_LIBDIRS.libffi:Q}
 .include "../../mk/bsd.prefs.mk"
 .if ${OPSYS} == "NetBSD"
 # The GHC rts, by default, creates executable objects on the heap by first
 # mmap(2)'ing an anonymous memory with PROT_READ|PROT_WRITE and then calling
 # mprotect(2) with PROT_READ|PROT_EXEC after filling its content. However,
 # NetBSD PaX mprotect doesn't allow this practice. That is, turning pages that
 # have been initially mapped as non-executable into something executable is a
 # no-no. We must therefore take a different path although it might be a bit slower.
 CONFIGURE_ARGS.common+=	--enable-libffi-adjustors
 # See rts/adjustor/NativeAmd64.c and rts/adjustor/LibffiAdjustor.c
 .endif
 # We must pass non-wrapper tools to ./configure because they will be
 # embedded in the compiler (actually ${WRKSRC}/settings).
 CONFIGURE_ENV+=		ac_cv_prog_fp_prog_ar=${AR:Q}
 CONFIGURE_ENV+=		ac_cv_prog_LIBTOOL=libtool
 CONFIGURE_ARGS.common+=	LD=${LD:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 CONFIGURE_ARGS+=	--with-system-libffi
 # CFLAGS and LDFLAGS are currently not honored by "./configure". Since
 # LDFLAGS contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will have
 # any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+=	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:M*:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # The use of internal variable ${_PKGSRC_MKPIE} in mk/bsd.prefs.mk is not
 # very satisfying, but the current infrastructure does not export a public
 # variable indicating whether a PIE build is requested or not. Note that we
 # can't build stage-1 compiler as PIE, because our bootkit libraries aren't
 # necessarily built as PIC.
 .for stage in 0 1 2
 .  if ${stage} == 0
 CONFIGURE_ENV+=	CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}
 .  else
 .    if ${_PKGSRC_MKPIE} == "yes"
 CONFIGURE_ENV+=	CONF_HC_OPTS_STAGE${stage}=-fPIC\ -pie
 CONFIGURE_ENV+=	CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}\ -fPIC
 .    else
 CONFIGURE_ENV+=	CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}
 .    endif
 .  endif
 .endfor
 # -----------------------------------------------------------------------------
 # Security
+#
 # The runtime system of GHC (rts) has a functionality called "RTS linker"
 # whose job is to load and execute *static* objects (.a and .o files) at
 # run time. It cannot survive PaX MPROTECT because preloadObjectFile() in
 # rts/linker.c tries to mmap pages with w+x. It doesn't play nice with ASLR
 # either because mmapForLinker() in rts/linker.c wants to always mmap pages
 # in the lower 32-bit area on 64-bit platforms.
+#
 # Luckily for us, the RTS linker is only used when the GHC executable (or
 # any user programs which uses GHC API as an interpreter, not a compiler)
 # is statically linked, which is no longer the case except for ghc-iserv
 # and ghc-iesrv-prof. They are launched when ghci is started with
 # -fexternal-interpreter without -dynamic, and their purpose is to run
 # non-PIC code from a dynamically linked ghci using the evil RTS linker.
 .for f in ghc-iserv ghc-iserv-prof
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC} && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "../../lang/ghc90/bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # The version restriction on Sphinx in ${WRKSRC}/configure.ac is too
 # loose, and building docs/users_guide rarely succeeds. We don't know
 # which version is actually required for it.
 BUILD_SPHINX_HTML?=	no
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC}/mk/build.mk
 .if ${BUILD_SPHINX_HTML} == "no"
 	${RUN} ${ECHO} "BUILD_SPHINX_HTML = NO" >> ${WRKSRC}/mk/build.mk
 .endif
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_SPHINX_PDF  = NO" >> ${WRKSRC}/mk/build.mk
 # SplitSections is only enabled by default on platforms with GNU ld. On SunOS,
 # whose ld is not the GNU one, it can however be used as well.
 .if ${OPSYS} == "SunOS"
 	${RUN} ${ECHO} "SplitSections  = YES" >> ${WRKSRC}/mk/build.mk
 .endif
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 # We don't want package.cache to be in the PLIST.
 post-install:
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 # XXX: On which platform? Is it still an issue?
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 # XXX: On which platform? Is it still an issue?
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 .if ${BUILD_SPHINX_HTML} != "no"
 BUILDLINK_DEPMETHOD.python:=	build
 .include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .endif
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && empty(OS_VERSION:M[0-8].*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 # XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
 # libterminfo.so.1. See ./bootstrap.mk
 .endif
 # On Solaris-based platforms our bootkit tends to depend on
 # pkgsrc-installed shlibs.
 .if ${OPSYS} == "SunOS"
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/lib
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

 @@ -1,260 +1,260 @@
-# $NetBSD: Makefile,v 1.6 2022/02/24 09:17:59 pho Exp $
+# $NetBSD: Makefile,v 1.7 2022/05/05 08:18:59 nia Exp $
 # -----------------------------------------------------------------------------
 # Package metadata
+#
 DISTNAME=	ghc-9.2.1-src
 PKGNAME=	${DISTNAME:S/-src$//}
 PKGREVISION=	2
 CATEGORIES=	lang
 MASTER_SITES=	https://downloads.haskell.org/~ghc/${PKGVERSION_NOREV}/
 EXTRACT_SUFX=	.tar.xz
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://www.haskell.org/ghc/
 COMMENT=	Compiler for the functional language Haskell - 9.2 Release Series
 LICENSE=	modified-bsd
 UNLIMIT_RESOURCES=	datasize virtualsize
 # GHC requires GHC to build itself. We have to prepare stripped-down
 # binaries sufficient to bootstrap compilers for each platform. If
 # you want to build them yourself, follow instructions in
 # BOOTSTRAP.txt and ./bootstrap.mk
 BROKEN_EXCEPT_ON_PLATFORM+=	Darwin-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-i386
 BROKEN_EXCEPT_ON_PLATFORM+=	FreeBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-aarch64
 BROKEN_EXCEPT_ON_PLATFORM+=	NetBSD-*-x86_64
 BROKEN_EXCEPT_ON_PLATFORM+=	SunOS-*-x86_64
 # We are going to do a PIE build on our responsibility. Do not put -pie in
 # wrappers, as that would prevent us from building stage-1 compiler.
 PKGSRC_OVERRIDE_MKPIE=	yes
 .include "options.mk"
 # -----------------------------------------------------------------------------
 # Distfiles
+#
 DISTFILES=	${DEFAULT_DISTFILES}
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 # We don't want to extract all of the DISTFILEs.
 EXTRACT_ONLY=	${DEFAULT_DISTFILES}
 # -----------------------------------------------------------------------------
 # Tools
+#
 USE_TOOLS+=			autoconf gmake
 GNU_CONFIGURE=			yes
 USE_GNU_CONFIGURE_HOST=		no
 USE_LIBTOOL=			yes
 # -----------------------------------------------------------------------------
 # Configuration
+#
 CONFIGURE_ARGS.common+= \
 	--with-curses-libraries=${BUILDLINK_PREFIX.curses}/${BUILDLINK_LIBDIRS.curses:Q} \
 	--with-gmp-includes=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_INCDIRS.gmp:Q} \
 	--with-gmp-libraries=${BUILDLINK_PREFIX.gmp}/${BUILDLINK_LIBDIRS.gmp:Q} \
 	--with-iconv-includes=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_INCDIRS.iconv:Q} \
 	--with-iconv-libraries=${BUILDLINK_PREFIX.iconv}/${BUILDLINK_LIBDIRS.iconv:Q} \
 	--with-ffi-includes=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_INCDIRS.libffi:Q} \
 	--with-ffi-libraries=${BUILDLINK_PREFIX.libffi}/${BUILDLINK_LIBDIRS.libffi:Q}
 .include "../../mk/bsd.prefs.mk"
 # We must pass non-wrapper tools to ./configure because they will be
 # embedded in the compiler (actually ${WRKSRC}/settings).
 CONFIGURE_ENV+=		ac_cv_prog_fp_prog_ar=${AR:Q}
 CONFIGURE_ENV+=		ac_cv_prog_LIBTOOL=libtool
 CONFIGURE_ARGS.common+=	LD=${LD:Q}
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.common}
 CONFIGURE_ARGS+=	--with-system-libffi
 # CFLAGS and LDFLAGS are currently not honored by "./configure". Since
 # LDFLAGS contains rpath flags it's very important to force GHC to honor
 # it. Otherwise neither GHC itself nor executables it produces will have
 # any rpaths so users will have to put "${PREFIX}/lib" into their
 # "/etc/ld-elf.so.conf". See
 # http://hackage.haskell.org/trac/ghc/ticket/2933
 .for stage in 0 1 2
 CONFIGURE_ENV+=	CONF_GCC_LINKER_OPTS_STAGE${stage}=${LDFLAGS:M*:Q}
 # Note that CONF_LD_LINKER_OPTS_STAGE{0,1,2} are only used for
 # creating static GHCi libraries (HS*.o). Setting them to ${LDFLAGS}
 # does more harm than good because our ${LDFLAGS} contains -Wl,*
 # flags. It's true that ../../mk/wrapper/cmd-sink-ld transforms them
 # but those flags will also be baked into the compiler (see
 # ${WRKSRC}/compiler/ghc.mk) so they cause problems when used outside
 # the buildlink.
 .endfor
 # The use of internal variable ${_PKGSRC_MKPIE} in mk/bsd.prefs.mk is not
 # very satisfying, but the current infrastructure does not export a public
 # variable indicating whether a PIE build is requested or not. Note that we
 # can't build stage-1 compiler as PIE, because our bootkit libraries aren't
 # necessarily built as PIC.
 .for stage in 0 1 2
 .  if ${stage} == 0
 CONFIGURE_ENV+=	CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}
 .  else
 .    if ${_PKGSRC_MKPIE} == "yes"
 CONFIGURE_ENV+=	CONF_HC_OPTS_STAGE${stage}=-fPIC\ -pie
 CONFIGURE_ENV+=	CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}\ -fPIC
 .    else
 CONFIGURE_ENV+=	CONF_CC_OPTS_STAGE${stage}=${CFLAGS:M*:Q}
 .    endif
 .  endif
 .endfor
 # MacOS X 10.7 is the oldest OS X version supporting __thread. Although
 # ${WRKSRC}/configure has a check for it, the actual build will fail
 # without this env.
 .if ${OPSYS} == "Darwin"
 ALL_ENV+=	MACOSX_DEPLOYMENT_TARGET="10.7"
 .endif
 # -----------------------------------------------------------------------------
 # Security
+#
 # The runtime system of GHC (rts) has a mechanism called "RTS linker" whose
 # job is to load and execute *static* objects (.a and .o files) at run
 # time. It cannot survive PaX MPROTECT because preloadObjectFile() in
 # rts/linker.c tries to mmap pages with w+x. It doesn't play nice with ASLR
 # either because mmapForLinker() in rts/linker.c wants to always mmap pages
 # in the lower 32-bit area on 64-bit platforms.
+#
 # Luckily for us, the RTS linker is only used when the GHC executable (or
 # any user programs which uses GHC API as an interpreter, not a compiler)
 # is statically linked, which is no longer the case except for ghc-iserv
 # and ghc-iesrv-prof. They are launched when ghci is started with
 # -fexternal-interpreter without -dynamic, and their purpose is to run
 # non-PIC code from within a dynamically linked ghci using the evil RTS
 # linker.
 .for f in ghc-iserv ghc-iserv-prof
 NOT_PAX_MPROTECT_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 NOT_PAX_ASLR_SAFE+=	lib/${PKGNAME_NOREV}/bin/${f}
 .endfor
 # -----------------------------------------------------------------------------
 # Build hooks
+#
 # We patch configure.ac in some directories.
 post-patch:
 	@${PHASE_MSG} "Regenerating configuration scripts for ${PKGNAME}"
 	${RUN} cd ${WRKSRC} && autoconf
 # Define the target "pre-configure" and non-standard "bootstrap".
 .include "bootstrap.mk"
 # Our pre-configure phase installs a bindist of bootstrapping compiler
 # directly into TOOLS_DIR so that ./configure can find it.
 # The version restriction on Sphinx in ${WRKSRC}/configure.ac is too
 # loose, and building docs/users_guide rarely succeeds. We don't know
 # which version is actually required for it.
 BUILD_SPHINX_HTML?=	no
 # Here we generate mk/build.mk dynamically.
 post-configure:
 	${RUN} ${RM} -f ${WRKSRC}/mk/build.mk
 # If there is HsColour in the PATH, GHC's build system tries to use it
 # without even checking if it really works. That's not what we
 # appreciate.
 	${RUN} ${ECHO} "HSCOLOUR_SRCS     = NO" >> ${WRKSRC}/mk/build.mk
 .if ${BUILD_SPHINX_HTML} == "no"
 	${RUN} ${ECHO} "BUILD_SPHINX_HTML = NO" >> ${WRKSRC}/mk/build.mk
 .endif
 # Don't even think of PDF.
 	${RUN} ${ECHO} "BUILD_SPHINX_PDF  = NO" >> ${WRKSRC}/mk/build.mk
 # SplitSections is only enabled by default on platforms with GNU ld. On SunOS,
 # whose ld is not the GNU one, it can however be used as well.
 .if ${OPSYS} == "SunOS"
 	${RUN} ${ECHO} "SplitSections  = YES" >> ${WRKSRC}/mk/build.mk
 .endif
 # -----------------------------------------------------------------------------
 # Installation/removal hooks
+#
 # Substitutions for INSTALL and DEINSTALL that handles package.cache.
 FILES_SUBST+=	GHC_VERSION=${PKGVERSION_NOREV}
 INSTALLATION_DIRS+=	share/bash-completion/completions
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/utils/completion/ghc.bash \
 		${DESTDIR}${PREFIX}/share/bash-completion/completions/ghc
 # We don't want package.cache to be in the PLIST.
 	${RM} -f ${DESTDIR}${PREFIX}/lib/${PKGNAME_NOREV}/package.conf.d/package.cache
 # -----------------------------------------------------------------------------
 # PLIST
+#
 # We can't use static PLIST because the package installs files with a
 # hashed name. And "PLIST_TYPE = dynamic" appears to be broken atm
 # [2019-12-27; pho].
 GENERATE_PLIST+= \
 	cd ${DESTDIR}${PREFIX} && \
 		${FIND} * \( -type f -o -type l \) | ${SORT};
 # -----------------------------------------------------------------------------
 # Sanity checks
+#
 # ghc57207_0.s: failed to add inputs for merge: Resource temporarily unavailable
 # XXX: On which platform? Is it still an issue?
 CTF_FILES_SKIP+=		*/libHS*-ghc${PKGVERSION_NOREV}.*
 # ld: fatal: relocation error ... relocation requires reference symbol
 # XXX: On which platform? Is it still an issue?
 STRIP_FILES_SKIP+=		lib/${PKGNAME_NOREV}/libHSrts.a
 # -----------------------------------------------------------------------------
 # Dependencies
+#
 .if ${BUILD_SPHINX_HTML} != "no"
 BUILDLINK_DEPMETHOD.python:=	build
 .include "../../lang/python/pyversion.mk"
 BUILD_DEPENDS+=	${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 .endif
 # NetBSD 9.x have libcurses with a newer major version than the
 # bootstrap kit is linked against. For now, work around this with
 # compat80.
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && empty(OS_VERSION:M[0-8].*)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) && ${OPSYS_VERSION} >= 090000
 BUILD_DEPENDS+=	compat80-[0-9]*:../../emulators/compat80
 # In a sandboxed build environment, we have to reach over to the
 # installed libraries themselves, since the symlinks compat80 adds
 # to the /usr tree can't be applied.
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/emul/netbsd/usr/lib:${WRKDIR}/lib
 # XXX: ${WRKDIR}/lib is a temporary workaround for compat80 not having
 # libterminfo.so.1. See ./bootstrap.mk
 .endif
 # On Solaris-based platforms our bootkit tends to depend on
 # pkgsrc-installed shlibs.
 .if ${OPSYS} == "SunOS"
 ALL_ENV+=	LD_LIBRARY_PATH=${PREFIX}/lib
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/libffi/buildlink3.mk"
 .include "../../devel/gmp/buildlink3.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"