CVS commit: pkgsrc/lang/ocaml

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Sun Apr  9 07:28:27 UTC 2023

Modified Files:
        pkgsrc/lang/ocaml: Makefile hacks.mk native.mk ocaml.mk

Log Message:
ocaml: fix some pkglint


To generate a diff of this commit:
cvs rdiff -u -r1.147 -r1.148 pkgsrc/lang/ocaml/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/lang/ocaml/hacks.mk
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/ocaml/native.mk \
    pkgsrc/lang/ocaml/ocaml.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/ocaml/Makefile
diff -u pkgsrc/lang/ocaml/Makefile:1.147 pkgsrc/lang/ocaml/Makefile:1.148
--- pkgsrc/lang/ocaml/Makefile:1.147    Sun Oct 23 13:09:30 2022
+++ pkgsrc/lang/ocaml/Makefile  Sun Apr  9 07:28:27 2023
@@ -1,4 +1,4 @@
-# $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"
 
@@ -27,11 +27,11 @@ BUILD_TARGET=               world
 .endif
 
 # configure: error: fma does not work, enable emulation with --enable-imprecise-c99-float-ops
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-*-earm*)
+.if ${MACHINE_PLATFORM:MNetBSD-*-i386} || \
+    ${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

Index: pkgsrc/lang/ocaml/hacks.mk
diff -u pkgsrc/lang/ocaml/hacks.mk:1.9 pkgsrc/lang/ocaml/hacks.mk:1.10
--- pkgsrc/lang/ocaml/hacks.mk:1.9      Wed Dec  9 10:33:04 2020
+++ pkgsrc/lang/ocaml/hacks.mk  Sun Apr  9 07:28:27 2023
@@ -1,4 +1,4 @@
-# $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
@@ -14,7 +14,7 @@ OCAML_HACKS_MK=       defined
 ### 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

Index: pkgsrc/lang/ocaml/native.mk
diff -u pkgsrc/lang/ocaml/native.mk:1.1 pkgsrc/lang/ocaml/native.mk:1.2
--- pkgsrc/lang/ocaml/native.mk:1.1     Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/native.mk Sun Apr  9 07:28:27 2023
@@ -1,4 +1,4 @@
-# $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.
@@ -25,7 +25,7 @@ _DEF_VARS.ocaml=      \
 
 # 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
Index: pkgsrc/lang/ocaml/ocaml.mk
diff -u pkgsrc/lang/ocaml/ocaml.mk:1.1 pkgsrc/lang/ocaml/ocaml.mk:1.2
--- pkgsrc/lang/ocaml/ocaml.mk:1.1      Tue May 24 18:25:38 2022
+++ pkgsrc/lang/ocaml/ocaml.mk  Sun Apr  9 07:28:27 2023
@@ -1,4 +1,4 @@
-# $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.
@@ -109,11 +109,11 @@ 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
@@ -169,14 +169,14 @@ OCAML_FINDLIB_REGISTER?=  yes
 .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:
@@ -233,17 +233,17 @@ do-install:
 .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"