On Sun, Feb 09, 2025 at 02:56:41PM +0100, Sebastien Marie wrote:
> Hi,
>
> The following diff removes the CONFIGURE_STYLE for oasis from lang/ocaml
> module.
>
> The CONFIGURE_STYLE=oasis isn't currently used:
>
> $ sqlite3 /usr/local/share/sqlports
> sqlite3> select count() from PortsQ where CONFIGURE_STYLE like '%oasis%' ;
> 0
>
> it is adding sysutils/oasis to BUILD_DEPENDS, which doesn't currently
> exist (and didn't found it in Attic ?)
Only the undocumented oasis_setup CONFIGURE_STYLE depends on
sysutils/oasis. I suspect it was inadvertently added as part of the
4.02.1. Dropping the
. if ${CONFIGURE_STYLE:L:Moasis_setup}
BUILD_DEPENDS += sysutils/oasis
MODOASIS_configure += cd ${WRKSRC} && oasis setup &&
. endif
chunk makes sense to me.
> Comments or OK ?
IIRC I had suggested a diff similar to yours, but Christopher (or
maybe someone else) wanted to keep it, and I see no problem with that.
ok jca@ to drop "oasis_setup", I'd rather let Christopher and Anil
chime in wrt "oasis".
> --
> Sebastien Marie
>
>
>
> diff --git a/lang/ocaml/ocaml.port.mk b/lang/ocaml/ocaml.port.mk
> index 8362ea2878..593b390715 100644
> --- a/lang/ocaml/ocaml.port.mk
> +++ b/lang/ocaml/ocaml.port.mk
> @@ -51,82 +51,3 @@
>
> MODOCAML_pre-fake = \
> ${INSTALL_DATA_DIR} ${WRKINST}${LOCALBASE}/lib/ocaml/stublibs
> -
> -
> -######################################################################
> -#
> -# CONFIGURE_STYLE for oasis.
> -#
> -# Also overrides do-{build,install,test}
> -#
> -.if ${CONFIGURE_STYLE:L:Moasis}
> -
> -ALL_TARGET ?= -build -doc
> -# XXX can't do ?= here, because INSTALL_TARGET is already initialized
> -# with default value
> -INSTALL_TARGET = -install
> -TEST_TARGET ?= -test
> -_MODOASIS_SETUP = ${WRKDIR}/oasis_setup.byte
> -
> -
> -######################################################################
> -# CONFIGURE
> -.if ${PROPERTIES:Mocaml_native}
> -_MODOASIS_OCAMLC = ocamlc.opt
> -.else
> -_MODOASIS_OCAMLC = ocamlc
> -.endif
> -
> -. if ${CONFIGURE_STYLE:L:Moasis_setup}
> -BUILD_DEPENDS += sysutils/oasis
> -MODOASIS_configure += cd ${WRKSRC} && oasis setup &&
> -. endif
> -MODOASIS_configure += \
> - ${_MODOASIS_OCAMLC} -o ${_MODOASIS_SETUP} ${WRKSRC}/setup.ml && \
> - cd ${WRKSRC} && \
> - rm setup.cm[io] && \
> - ${SETENV} ${CONFIGURE_ENV} ${_MODOASIS_SETUP} -configure \
> - --destdir ${WRKINST} \
> - --mandir ${PREFIX}/man \
> - --infodir ${PREFIX}/info \
> - --override pkg_name ${PKGNAME:C/-[0-9].*//} \
> - ${CONFIGURE_ARGS}
> -
> -######################################################################
> -# BUILD
> -BUILD_DEPENDS+= sysutils/findlib
> -MODOASIS_BUILD_TARGET = cd ${WRKSRC}
> -. for TARGET in ${ALL_TARGET}
> -MODOASIS_BUILD_TARGET += \
> - && ${SETENV} ${MAKE_ENV} ${_MODOASIS_SETUP} ${TARGET}
> -. endfor
> -. if !target(do-build)
> -do-build:
> - ${MODOASIS_BUILD_TARGET}
> -. endif
> -
> -######################################################################
> -# INSTALL
> -MODOASIS_INSTALL_TARGET = cd ${WRKSRC}
> -. for TARGET in ${INSTALL_TARGET}
> -MODOASIS_INSTALL_TARGET += \
> - && ${SETENV} ${MAKE_ENV} ${_MODOASIS_SETUP} ${TARGET}
> -. endfor
> -. if !target(do-install)
> -do-install:
> - ${MODOASIS_INSTALL_TARGET}
> -. endif
> -
> -######################################################################
> -# TEST
> -MODOASIS_TEST_TARGET = cd ${WRKSRC}
> -. for TARGET in ${TEST_TARGET}
> -MODOASIS_TEST_TARGET += \
> - && ${SETENV} ${MAKE_ENV} ${_MODOASIS_SETUP} ${TARGET}
> -. endfor
> -. if !target(do-test)
> -do-test:
> - ${MODOASIS_TEST_TARGET}
> -. endif
> -
> -.endif
>
--
jca
