Re: Update sysutils/opam to 2.1.2

1) I get a bunch of failures like this when running "make test". we
probably have to neuter "-- strip-trailing-cr" usage?

var-option diff: unknown option -- strip-trailing-cr
usage: diff [-abdipTtw] [-c | -e | -f | -n | -q | -u] [-I pattern] [-L label]
file1 file2
diff [-abdipTtw] [-I pattern] [-L label] -C number file1 file2
diff [-abditw] [-I pattern] -D string file1 file2
diff [-abdipTtw] [-I pattern] [-L label] -U number file1 file2
diff [-abdiNPprsTtw] [-c | -e | -f | -n | -q | -u] [-I pattern]
[-L label] [-S name] [-X file] [-x pattern] dir1 dir2
[FAIL]

2) Running portcheck resulted in:

C++ libraries in WANTLIB with default COMPILER (most ports need
'COMPILER=base-clang ports-gcc' or 'COMPILER=base-clang ports-gcc
base-gcc')

On Fri, Dec 31, 2021 at 2:36 AM Christopher Zimmermann
<chrisz@openbsd.org> wrote:
>
> Hi,
>
> this update of opam changes to the build-utils shipped with opam and
> drops dependencies on our ports utils. This makes ports dune version
> independent of opam. OK?
>
> Christopher
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/sysutils/opam/Makefile,v
> retrieving revision 1.23
> diff -u -p -r1.23 Makefile
> --- Makefile 10 Dec 2021 04:11:00 -0000 1.23
> +++ Makefile 31 Dec 2021 07:34:49 -0000
> @@ -4,10 +4,9 @@ COMMENT = OCaml source-based package ma
>
> CATEGORIES = sysutils devel
>
> -V = 2.0.8
> +V = 2.1.2
> PKGNAME = opam-${V}
> DISTNAME = opam-full-${V}
> -REVISION = 1
>
> MASTER_SITES = https://github.com/ocaml/opam/releases/download/${V}/
>
> @@ -21,11 +20,7 @@ PERMIT_PACKAGE = Yes
> WANTLIB = ${COMPILER_LIBCXX} c m
>
> BUILD_DEPENDS = lang/ocaml \
> - sysutils/findlib \
> - devel/dune \
> - devel/ocaml-cppo \
> - archivers/bzip2 \
> - net/curl
> + archivers/bzip2
>
> RUN_DEPENDS = archivers/unzip \
> archivers/bzip2 \
> @@ -38,7 +33,8 @@ USE_GMAKE = Yes
>
> CONFIGURE_ENV += CFLAGS="${CFLAGS}" \
> LDFLAGS="${LDFLAGS}"
> -CONFIGURE_STYLE = gnu
> +CONFIGURE_STYLE = gnu autoconf no-autoheader
> +AUTOCONF_VERSION = 2.69
>
> ALL_TARGET = lib-ext all
> INSTALL_TARGET = install
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/sysutils/opam/distinfo,v
> retrieving revision 1.8
> diff -u -p -r1.8 distinfo
> --- distinfo 23 Feb 2021 05:25:04 -0000 1.8
> +++ distinfo 31 Dec 2021 07:34:49 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (opam-full-2.0.8.tar.gz) = e50pIz2WM+9QunZt8uORErFc0Fwcb+34C8tUjevN2b0=
> -SIZE (opam-full-2.0.8.tar.gz) = 8006252
> +SHA256 (opam-full-2.1.2.tar.gz) = 3h4+//1ZQuAQHvg9zerVSMxlqT4TmGrstKJkoFlFft4=
> +SIZE (opam-full-2.1.2.tar.gz) = 9442446
> Index: patches/patch-Makefile_config_in
> ===================================================================
> RCS file: patches/patch-Makefile_config_in
> diff -N patches/patch-Makefile_config_in
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-Makefile_config_in 31 Dec 2021 07:34:49 -0000
> @@ -0,0 +1,15 @@
> +$OpenBSD$
> +
> +don't use system wide installed ocaml packages
> +
> +Index: Makefile.config.in
> +--- Makefile.config.in.orig
> ++++ Makefile.config.in
> +@@ -17,7 +17,6 @@ OCAMLFIND = @OCAMLFIND@
> + OCAML = @OCAML@
> + OCAMLC = @OCAMLC@
> + OCAMLOPT = @OCAMLOPT@
> +-DUNE = @DUNE@
> + DUNE_SECONDARY = @DUNE_SECONDARY@
> + LN_S = @LN_S@
> +
> Index: patches/patch-configure_ac
> ===================================================================
> RCS file: patches/patch-configure_ac
> diff -N patches/patch-configure_ac
> --- /dev/null 1 Jan 1970 00:00:00 -0000
> +++ patches/patch-configure_ac 31 Dec 2021 07:34:49 -0000
> @@ -0,0 +1,16 @@
> +$OpenBSD$
> +
> +don't use system wide installed ocaml packages
> +
> +Index: configure.ac
> +--- configure.ac.orig
> ++++ configure.ac
> +@@ -255,8 +255,6 @@ AS_IF([test "x${enable_certificate_check}" = "xno"], [
> +
> + AC_CHECK_PROGS(FETCH,[curl wget],no)
> +
> +-AC_CHECK_TOOL(DUNE,dune)
> +-AC_CHECK_TOOL(CPPO,cppo)
> + AC_CHECK_TOOL(PATCH,patch)
> + AC_CHECK_TOOL(BUNZIP2,bunzip2)
> +
> Index: pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/sysutils/opam/pkg/PLIST,v
> retrieving revision 1.2
> diff -u -p -r1.2 PLIST
> --- pkg/PLIST 22 May 2020 19:31:20 -0000 1.2
> +++ pkg/PLIST 31 Dec 2021 07:34:49 -0000
> @@ -25,6 +25,8 @@
> @man man/man1/opam-installer.1
> @man man/man1/opam-lint.1
> @man man/man1/opam-list.1
> +@man man/man1/opam-lock.1
> +@man man/man1/opam-option.1
> @man man/man1/opam-pin.1
> @man man/man1/opam-reinstall.1
> @man man/man1/opam-remote.1
> @@ -47,6 +49,7 @@ share/doc/opam/depexts-plugins
> share/doc/opam/depopts-and-features
> share/doc/opam/pages/
> share/doc/opam/pages/About.md
> +share/doc/opam/pages/Distribution.md
> share/doc/opam/pages/External_solvers.md
> share/doc/opam/pages/FAQ.md
> share/doc/opam/pages/Install.md