 @@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.147 2022/10/23 13:09:30 he Exp $
+# $NetBSD: Makefile,v 1.148 2023/04/09 07:28:27 wiz Exp $
 .include "Makefile.common"
 TEST_PROGRAM=		ocamltest
 MAKE_JOBS_SAFE=		no
 UNLIMIT_RESOURCES=	stacksize
 USE_TOOLS+=		bash
 USE_LANGUAGES+=		c
 USE_LIBTOOL=		yes
 USE_GNU_CONFIGURE_HOST=	no
 #USE_GCC_RUNTIME=	yes
 @@ -17,31 +17,31 @@ USE_GNU_CONFIGURE_HOST=	no
 .include "native.mk"
 # Options
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 CONFIGURE_ARGS+=	--enable-native-compiler
 BUILD_TARGET=		world.opt
 .else
 CONFIGURE_ARGS+=	--disable-native-compiler
 BUILD_TARGET=		world
 .endif
 # configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
+    ${MACHINE_PLATFORM:MNetBSD-*-earm*}
 CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
 .endif
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && (${OPSYS_VERSION} < 99999)
+.if ${MACHINE_PLATFORM:MNetBSD-*-powerpc} && (${OPSYS_VERSION} < 99999)
 # fma(3) was added for powerpc between 9.99.98 and 9.99.99
 CONFIGURE_ARGS+=	--enable-imprecise-c99-float-ops
 .endif
 # This is needed because ${WRKSRC}/build/partial-install.sh uses
 # $PWD as part of its script.  However, with /bin/sh on SunOS
 # (cd work/foo-1.0 && echo $PWD) will show that the value of PWD is
 # set before the cd takes place and is then passed down.  So the end
 # result is when ./build/partial-install.sh is called, PWD is set
 # to /usr/pkgsrc/devel/ocaml instead of ${WRKSRC}.  /bin/ksh, which
 # is what ${SH} is on SunOS, doesn't exhibit this behaviour.
 .if ${OPSYS} == "SunOS"
 INSTALL_MAKE_FLAGS+=	SHELL=${SH:Q}

 @@ -1,30 +1,30 @@
-# $NetBSD: hacks.mk,v 1.9 2020/12/09 10:33:04 jaapb Exp $
+# $NetBSD: hacks.mk,v 1.10 2023/04/09 07:28:27 wiz Exp $
 .if !defined(OCAML_HACKS_MK)
 OCAML_HACKS_MK=	defined
 .include "../../mk/compiler.mk"
 ### [Fri Jan 17 18:06:18 JST 2014 : pho]
 ### The linker that comes with Darwin 9 & prior does not recognize the option
 ### "-no_compact_unwind" since compact unwind information is only
 ### introduced (and made default) as of Darwin 10.  Note that this
 ### can't be worked around with transformation
 ### "rm:-Wl,-no_compact_unwind" because the linker option is baked
 ### into utils/config.ml and will later be used by the OCaml compiler
 ### itself.
 ###
-.if !empty(MACHINE_PLATFORM:MDarwin-[0-9].*-*)
+.if ${MACHINE_PLATFORM:MDarwin-[0-9].*-*}
 PKG_HACKS+=				no_compact_unwind
 SUBST_CLASSES+=				no_compact_unwind
 SUBST_MESSAGE.no_compact_unwind=	Removing -no_compact_unwind from linker options
 SUBST_FILES.no_compact_unwind=		configure
 SUBST_SED.no_compact_unwind=		-e 's/-Wl,-no_compact_unwind//g'
 SUBST_STAGE.no_compact_unwind=		pre-configure
 .endif
 ### [ Wed Oct  7 9:16:42 GMT 2009 : dmcmahill ]
 ### On NetBSD/i386, gcc optimisation, at least for version 4.4.1 (lang/gcc44),
 ### produces a binary which segfaults.  The binary is used during part of the
 ### build process.
 ###

 @@ -1,41 +1,41 @@
-# $NetBSD: native.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+# $NetBSD: native.mk,v 1.2 2023/04/09 07:28:27 wiz Exp $
+#
 # This Makefile fragment handles the native code compiler options for OCaml.
 # It is used by ocaml.mk and the lang/ocaml package.
+#
 # Build def variables:
 # OCAML_USE_OPT_COMPILER
 # if set to yes, will enable optimised (native code) compilation
 # default value: depends on architecture
+#
 # PLIST variable:
 # PLIST.ocaml-opt for files only installed when using the optimised compiler
 # Set based on OCAML_USE_OPT_COMPILER
 .if !defined(OCAML_NATIVE_MK)
 OCAML_NATIVE_MK=	# defined
 .include "../../mk/bsd.fast.prefs.mk"
 BUILD_DEFS+=	OCAML_USE_OPT_COMPILER
 _VARGROUPS+=	ocaml
 _DEF_VARS.ocaml=	\
 	OCAML_USE_OPT_COMPILER
 # Default value of OCAML_USE_OPT_COMPILER
 .if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-     !empty(MACHINE_ARCH:M*arm*) || (${MACHINE_ARCH} == "aarch64") || \
+     ${MACHINE_ARCH:M*arm*} || (${MACHINE_ARCH} == "aarch64") || \
      (${MACHINE_ARCH} == "aarch64eb") || (${MACHINE_ARCH} == "x86_64")
 OCAML_USE_OPT_COMPILER?=	yes
 .else
 OCAML_USE_OPT_COMPILER?=	no
 .endif
 # Things that get installed with the opt compiler
 PLIST_VARS+=	ocaml-opt
 .if ${OCAML_USE_OPT_COMPILER} == "yes"
 # The opt compiler needs the C compiler suite
 USE_LANGUAGES+=		c
 PLIST.ocaml-opt=	yes

 @@ -1,14 +1,14 @@
-# $NetBSD: ocaml.mk,v 1.1 2022/05/24 18:25:38 jaapb Exp $
+# $NetBSD: ocaml.mk,v 1.2 2023/04/09 07:28:27 wiz Exp $
+#
 # This Makefile fragment handles the common variables used by OCaml packages.
 # It should be included by every package that uses OCaml.
+#
 # Package-settable variables:
 # OCAML_USE_FINDLIB
 # package uses findlib infrastructure
 # OCAML_FINDLIB_DIRS
 # directories under OCAML_SITELIBDIR that this package installs into
 # OCAML_FINDLIB_REGISTER
 # register findlib directories into OCaml ld.conf
 # OCAML_USE_OASIS [implies OCAML_USE_FINDLIB]
 # package uses oasis infrastructure
 @@ -99,31 +99,31 @@ OASIS_BUILD_ARGS?=	# empty
 .include "../../devel/ocaml-oasis/buildlink3.mk"
 OCAML_USE_OASIS=	yes
 .endif
+#
 # Configure stuff for OASIS
+#
 .if ${OCAML_USE_OASIS} == "yes"
 OCAML_USE_FINDLIB=	yes
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--destdir "${DESTDIR}"
 CONFIGURE_ARGS+=	--prefix "${PREFIX}"
 # Force use of native code compiler according to setting
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
+.  if ${OCAML_USE_OPT_COMPILER} == "yes"
 CONFIGURE_ARGS+=	--override is_native true
-.else
+.  else
 CONFIGURE_ARGS+=	--override is_native false
-.endif
+.  endif
 .endif
 # Configure stuff for DUNE
 .if ${OCAML_USE_DUNE} == "yes"
 .include "../../devel/ocaml-dune/buildlink3.mk"
 OCAML_USE_OPAM?=	yes
 OPAM_INSTALL_DIR?=	_build/default
 .else
 OCAML_USE_OPAM?=	no
 .endif
 # Configure stuff for OPAM
 .if ${OCAML_USE_OPAM} == "yes"
 @@ -159,34 +159,34 @@ OCAML_FINDLIB_DIRS?=	${PKGBASE:S/^ocaml-
 OCAML_FINDLIB_REGISTER?=	yes
 .endif
+#
 # Compiler stuff
+#
+#
 # OASIS targets
+#
 .if ${OCAML_USE_OASIS} == "yes"
 # OASIS uses ocamlbuild
 .include "../../devel/ocamlbuild/buildlink3.mk"
-.if ${OCAML_USE_OASIS_DYNRUN} == "yes"
+.  if ${OCAML_USE_OASIS_DYNRUN} == "yes"
 pre-configure:
 	${RUN} cd ${WRKSRC} && ocamlfind ocamlc -linkpkg -package oasis.dynrun -o setup setup.ml && ${RM} setup.cmo setup.cmi
 OASIS_EXEC=	./setup
-.else
+.  else
 OASIS_EXEC=	ocaml setup.ml
-.endif
+.  endif
 # Redefine configure target
 do-configure:
 	${RUN} cd ${WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${OASIS_EXEC} -configure ${CONFIGURE_ARGS}
 # Redefine build target
 do-build:
 	${RUN} ${_ULIMIT_CMD} cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} ${OASIS_EXEC} -build ${OASIS_BUILD_ARGS}
 # Redefine install target
 do-install:
 @@ -223,31 +223,31 @@ do-install:
 		-stublibsdir ${PREFIX}/${OCAML_SITELIBDIR}/stublibs \
 		-bindir ${PREFIX}/bin \
 		${OPAM_INSTALL_DIR}/$$i.install; \
 	done
 .endif # ${OCAML_USE_OPAM} == "yes"
+#
 # dune targets
+#
 .if ${OCAML_USE_DUNE} == "yes"
 do-build:
-.if !empty(DUNE_BUILD_PACKAGES)
+.  if !empty(DUNE_BUILD_PACKAGES)
 	${RUN} ${_ULIMIT_CMD} \
 		cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		dune build -j ${MAKE_JOBS:U1} \
 		${DUNE_BUILD_FLAGS} -p ${DUNE_BUILD_PACKAGES:ts,} \
 		${DUNE_BUILD_TARGETS}
-.else
+.  else
 	${RUN} ${_ULIMIT_CMD} \
 		cd ${WRKSRC} && dune build --profile release -j ${MAKE_JOBS:U1} \
 		${DUNE_BUILD_FLAGS} ${DUNE_BUILD_TARGETS}
-.endif
+.  endif
 .endif # ${OCAML_USE_DUNE} == "yes"
 # Add dependency on ocaml.
 .include "../../lang/ocaml/buildlink3.mk"
 .endif # OCAML_MK