git: 65849f986701 - main - math/orpie: unbreak against safe-by-default strings in OCaml 4.06+.

[Alexey Dokuchaev]

The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=65849f986701d082eefd254dab784c051b24dc76

commit 65849f986701d082eefd254dab784c051b24dc76
Author:     Alexey Dokuchaev <danfe at FreeBSD.org>
AuthorDate: 2021-09-03 03:09:48 +0000
Commit:     Alexey Dokuchaev <danfe at FreeBSD.org>
CommitDate: 2021-09-03 03:09:52 +0000

    math/orpie: unbreak against safe-by-default strings in OCaml 4.06+.
---
 math/orpie/files/patch-Makefile.in | 31 +++++++++++++++++++------------
 1 file changed, 19 insertions(+), 12 deletions(-)

diff --git a/math/orpie/files/patch-Makefile.in b/math/orpie/files/patch-Makefile.in
index 73797efdf893..018925bc2e02 100644
--- a/math/orpie/files/patch-Makefile.in
+++ b/math/orpie/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig
+--- Makefile.in.orig	2014-04-12 01:43:31 UTC
 +++ Makefile.in
-@@ -81,7 +81,7 @@ CURSES_OOBJS = $(CURSES_CMX) $(CURSES_CO
+@@ -81,7 +81,7 @@ CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS)
  GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \
  		gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \
  		gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
@@ -9,7 +9,7 @@
  GSL_CMX = $(GSL_CMO:.cmo=.cmx)
  GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o gsl/mlgsl_blas_float.o \
  		 gsl/mlgsl_blas_complex_float.o gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_matrix_float.o \
-@@ -201,7 +201,7 @@
+@@ -201,7 +201,7 @@ gsl-byte: $(GSL_BOBJS)
  GSL_INCLUDES = -I ./gsl
  GSL_BFLAGS = -g $(GSL_INCLUDES) -thread
  GSL_OFLAGS = $(GSL_INCLUDES) -thread
@@ -18,26 +18,34 @@
  
  gsl/%.cmi : gsl/%.mli
  	$(OCAMLC) -c $(GSL_BFLAGS) $<
-@@ -264,10 +264,7 @@
+@@ -264,13 +264,10 @@ units/%.cmi : units/%.mli
  units/%.cmo : units/%.ml
  	$(OCAMLC) -c $(UNITS_BFLAGS) $<
  
 -units/%.o : units/%.ml
--	$(OCAMLOPT) -c $(UNITS_OFLAGS) $<
--
--units/%.cmx : units/%.ml
 +units/%.o units/%.cmx : units/%.ml
  	$(OCAMLOPT) -c $(UNITS_OFLAGS) $<
  
+-units/%.cmx : units/%.ml
+-	$(OCAMLOPT) -c $(UNITS_OFLAGS) $<
  
-@@ -278,22 +275,15 @@
+-
+ # generic build rules for toplevel directory
+ %.cmi : %.mli
+ 	$(OCAMLC) -c $(BFLAGS) $<
+@@ -278,21 +275,20 @@ units/%.cmx : units/%.ml
  %.cmo : %.ml
  	$(OCAMLC) -c $(BFLAGS) $<
  
 -%.o : %.ml
 -	$(OCAMLOPT) -c $(OFLAGS) $<
--
++interface_draw.cmx: interface_draw.ml
++	$(OCAMLOPT) -c $(OFLAGS) -unsafe-string $<
+ 
 -%.cmx : %.ml
++interface_main.cmx: interface_main.ml
++	$(OCAMLOPT) -c $(OFLAGS) -unsafe-string $<
++
 +%.o %.cmx : %.ml
  	$(OCAMLOPT) -c $(OFLAGS) $<
  
@@ -47,11 +55,10 @@
 -%.ml : %.mly
 +%.ml %.mli : %.mly
  	$(OCAMLYACC) -v $<
- 
+-
 -%.mli : %.mly
 -	$(OCAMLYACC) -v $<
 -
--
+ 
  
  # Emacs tags
- ############