> On Aug 17, 2019, at 5:24 PM, Christopher Zimmermann <chr...@openbsd.org>
> wrote:
>
> Hi,
>
> this is a straightforward upgrade of camlp5 to support upcoming OCaml
> 4.08. OK?
Looks good to me on i386 but defer to bcallah (maintainer) to ok it.
>
> Christopher
>
>
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml-camlp5/Makefile,v
> retrieving revision 1.4
> diff -u -p -r1.4 Makefile
> --- Makefile 12 Jul 2019 20:47:21 -0000 1.4
> +++ Makefile 17 Aug 2019 21:10:48 -0000
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.4 2019/07/12 20:47:21 sthen Exp $
>
> -V = 7.07
> +V = 7.08
> COMMENT = OCaml Preprocessor and Pretty-Printer
> DISTFILES = camlp5-rel${V}{rel${V:S/.//}}${EXTRACT_SUFX}
> PKGNAME = ocaml-camlp5-${V}
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/lang/ocaml-camlp5/distinfo,v
> retrieving revision 1.3
> diff -u -p -r1.3 distinfo
> --- distinfo 4 Mar 2019 12:51:15 -0000 1.3
> +++ distinfo 17 Aug 2019 21:10:48 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (camlp5-rel7.07.tar.gz) = osSTuDOyF635TSAA6xkBW5kMTkQb6zXPNrHTPtI1GZE=
> -SIZE (camlp5-rel7.07.tar.gz) = 813500
> +SHA256 (camlp5-rel7.08.tar.gz) = RuZ9jjbl5FWMQU8LVpUyoz06EtcSD/3EdKaz2hv/8WM=
> +SIZE (camlp5-rel7.08.tar.gz) = 849009
> Index: patches/patch-configure
> ===================================================================
> RCS file: patches/patch-configure
> diff -N patches/patch-configure
> --- patches/patch-configure 4 Mar 2019 12:51:15 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,25 +0,0 @@
> -$OpenBSD: patch-configure,v 1.1 2019/03/04 12:51:15 chrisz Exp $
> -
> -our builtin test/[ doesn't support the < comparator.
> -
> -Index: configure
> ---- configure.orig
> -+++ configure
> -@@ -188,7 +188,7 @@ if test "$x" = ""; then win=false; else win=true; fi
> - x="$(echo 'Sys.os_type;;' | ocaml | grep 'Win32')"
> - if test "$x" = ""; then win32=false; else win32=true; fi
> - OLIBDIR="$y"
> --if [ "$OVERSION" "<" "4.00" ]; then
> -+if /bin/\[ "$OVERSION" "<" "4.00" ]; then
> - OCLIBDIR="."
> - else
> - OCLIBDIR="+compiler-libs"
> -@@ -277,7 +277,7 @@ echo OCLIBDIR=$OCLIBDIR
> - if test "$prefix" != ""; then
> - echo PREFIX=$prefix
> - fi
> --if test "$OVERSION" "<" "4.00.0"; then
> -+if /bin/test "$OVERSION" "<" "4.00.0"; then
> - echo "OTOPP=\$(TOP)/ocaml_stuff$verspfx/$OVERSION/parsing"
> - echo "OTOPW=\$(TOP)/ocaml_stuff$verspfx/$OVERSION/utils"
> - else
> Index: patches/patch-etc_Makefile
> ===================================================================
> RCS file: patches/patch-etc_Makefile
> diff -N patches/patch-etc_Makefile
> --- patches/patch-etc_Makefile 4 Mar 2019 12:51:15 -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,13 +0,0 @@
> -$OpenBSD: patch-etc_Makefile,v 1.2 2019/03/04 12:51:15 chrisz Exp $
> -
> -Index: etc/Makefile
> ---- etc/Makefile.orig
> -+++ etc/Makefile
> -@@ -107,6 +107,7 @@ install:
> - cp $(OBJS) "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
> - cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
> - cp lib.sml "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
> -+ cp META "$(DESTDIR)$(LIBDIR)/$(CAMLP5N)/."
> - cp $(CAMLP5N)o$(EXE) $(CAMLP5N)sch$(EXE) "$(DESTDIR)$(BINDIR)/."
> - cp mk$(CAMLP5N).sh "$(DESTDIR)$(BINDIR)/mk$(CAMLP5N)"
> - chmod a+x "$(DESTDIR)$(BINDIR)/mk$(CAMLP5N)"
>
>
> --
> http://gmerlin.de
> OpenPGP: http://gmerlin.de/christopher.pub
> CB07 DA40 B0B6 571D 35E2 0DEF 87E2 92A7 13E5 DEE1
