math/orpie: update to 1.5.2

PR:		190901

4 files changed, 59 insertions, 180 deletions

diff --git a/math/orpie/Makefile b/math/orpie/Makefile
index e4d0e14135ea..abfc0a1868db 100644
--- a/math/orpie/Makefile
+++ b/math/orpie/Makefile
@@ -2,24 +2,27 @@
 # $FreeBSD$
 
 PORTNAME=	orpie
-PORTVERSION=	1.5.1
-PORTREVISION=	6
+PORTVERSION=	1.5.2
 CATEGORIES+=	math
 MASTER_SITES=	http://pessimization.com/software/orpie/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Fullscreen RPN calculator for the console
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml
+LICENSE=	GPLv2
+
 LIB_DEPENDS=	libgsl.so:${PORTSDIR}/math/gsl
 
-GNU_CONFIGURE=	yes
 USES=		gmake
-CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-L${LOCALBASE}/lib
+USE_OCAML=	yes
+GNU_CONFIGURE=	yes
+MAKE_JOBS_UNSAFE=	yes
 
 PLIST_FILES=	bin/orpie bin/orpie-curses-keys etc/orpierc \
 		man/man1/orpie.1.gz man/man1/orpie-curses-keys.1.gz \
 		man/man5/orpierc.5.gz
 
+post-install:
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+
 .include <bsd.port.mk>
diff --git a/math/orpie/distinfo b/math/orpie/distinfo
index 8a72997e068a..26203f81e260 100644
--- a/math/orpie/distinfo
+++ b/math/orpie/distinfo
@@ -1,2 +1,2 @@
-SHA256 (orpie-1.5.1.tar.gz) = f68ee37a5351c1dd32a68edae253a22a913fc2124bace1f6cf19cc2d422100cd
-SIZE (orpie-1.5.1.tar.gz) = 370851
+SHA256 (orpie-1.5.2.tar.gz) = de557fc7f608c6cb1f44a965d3ae07fc6baf2b02a0d7994b89d6a0e0d87d3d6d
+SIZE (orpie-1.5.2.tar.gz) = 379583
diff --git a/math/orpie/files/patch-Makefile.in b/math/orpie/files/patch-Makefile.in
new file mode 100644
index 000000000000..a4b77a26dff9
--- /dev/null
+++ b/math/orpie/files/patch-Makefile.in
@@ -0,0 +1,48 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -201,7 +201,7 @@
+ GSL_INCLUDES = -I ./gsl
+ GSL_BFLAGS = -g $(GSL_INCLUDES) -thread
+ GSL_OFLAGS = $(GSL_INCLUDES) -thread
+-GSL_CFLAGS = @GSL_CFLAGS@ $(CPPFLAGS) $(CFLAGS) -DHAVE_INLINE -DHAVE_FENV -g -O2
++GSL_CFLAGS = @GSL_CFLAGS@ $(CPPFLAGS) $(CFLAGS) -DHAVE_INLINE -DHAVE_FENV
+ 
+ gsl/%.cmi : gsl/%.mli
+ 	$(OCAMLC) -c $(GSL_BFLAGS) $<
+@@ -264,10 +264,7 @@
+ 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) $<
+ 
+ 
+@@ -278,22 +275,15 @@
+ %.cmo : %.ml
+ 	$(OCAMLC) -c $(BFLAGS) $<
+ 
+-%.o : %.ml
+-	$(OCAMLOPT) -c $(OFLAGS) $<
+-
+-%.cmx : %.ml
++%.o %.cmx : %.ml
+ 	$(OCAMLOPT) -c $(OFLAGS) $<
+ 
+ %.ml : %.mll
+ 	$(OCAMLLEX) $<
+ 
+-%.ml : %.mly
++%.ml %.mli : %.mly
+ 	$(OCAMLYACC) -v $<
+ 
+-%.mli : %.mly
+-	$(OCAMLYACC) -v $<
+-
+-
+ 
+ # Emacs tags
+ ############
diff --git a/math/orpie/files/patch-gsl b/math/orpie/files/patch-gsl
deleted file mode 100644
index 52eb876d2689..000000000000
--- a/math/orpie/files/patch-gsl
+++ /dev/null
@@ -1,172 +0,0 @@
-diff -aru gsl.orig/gsl_blas.ml gsl/gsl_blas.ml
---- gsl.orig/gsl_blas.ml	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_blas.ml	2009-04-20 15:08:34.000000000 -0400
-@@ -115,7 +115,7 @@
-     beta:float -> c:matrix -> unit
- 	= "ml_gsl_blas_dsyr2k_bc" "ml_gsl_blas_dsyr2k"
- 
--
-+(*
- (** {3 Single precision} *)
- 
- open Gsl_vector.Single
-@@ -187,7 +187,7 @@
-     alpha:float -> a:matrix -> b:matrix -> unit
- 	= "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm"
-   end
--
-+*)
- 
- (** {3 Complex} *)
- open Gsl_vector_complex
-@@ -272,6 +272,7 @@
-   end
- 
- 
-+(*
- (** {3 Complex single precision} *)
- 
- open Gsl_vector_complex.Single
-@@ -354,3 +355,4 @@
-     a:matrix -> b:matrix -> beta:float -> c:matrix -> unit
- 	= "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k"
-   end
-+*)
-diff -aru gsl.orig/gsl_blas.mli gsl/gsl_blas.mli
---- gsl.orig/gsl_blas.mli	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_blas.mli	2009-04-20 15:08:50.000000000 -0400
-@@ -115,7 +115,7 @@
-     beta:float -> c:matrix -> unit
- 	= "ml_gsl_blas_dsyr2k_bc" "ml_gsl_blas_dsyr2k"
- 
--
-+(*
- (** {3 Single precision} *)
- 
- open Gsl_vector.Single
-@@ -187,7 +187,7 @@
-     alpha:float -> a:matrix -> b:matrix -> unit
- 	= "ml_gsl_blas_strsm_bc" "ml_gsl_blas_strsm"
-   end
--
-+*)
- 
- (** {3 Complex} *)
- open Gsl_vector_complex
-@@ -271,7 +271,7 @@
- 	= "ml_gsl_blas_zher2k_bc" "ml_gsl_blas_zher2k"
-   end
- 
--
-+(*
- (** {3 Complex single precision} *)
- 
- open Gsl_vector_complex.Single
-@@ -354,3 +354,4 @@
-     a:matrix -> b:matrix -> beta:float -> c:matrix -> unit
- 	= "ml_gsl_blas_cher2k_bc" "ml_gsl_blas_cher2k"
-   end
-+*)
-diff -aru gsl.orig/gsl_matrix.ml gsl/gsl_matrix.ml
---- gsl.orig/gsl_matrix.ml	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_matrix.ml	2009-04-20 15:09:28.000000000 -0400
-@@ -84,7 +84,7 @@
- let row =
-   Array2.slice_left
- 
--
-+(*
- 
- module Single = 
-   struct
-@@ -164,3 +164,4 @@
-   external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy"
-   external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose"
-   end
-+*)
-diff -aru gsl.orig/gsl_matrix.mli gsl/gsl_matrix.mli
---- gsl.orig/gsl_matrix.mli	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_matrix.mli	2009-04-20 15:09:27.000000000 -0400
-@@ -44,7 +44,7 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_transpose"
- 
--
-+(*
- module Single : sig
- 
-   type float_mat_bigarr = 
-@@ -87,3 +87,4 @@
-   external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_float_transpose_memcpy"
-   external transpose_in_place : matrix -> unit = "ml_gsl_matrix_float_transpose"
- end
-+*)
-diff -aru gsl.orig/gsl_matrix_complex.ml gsl/gsl_matrix_complex.ml
---- gsl.orig/gsl_matrix_complex.ml	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_matrix_complex.ml	2009-04-20 15:09:49.000000000 -0400
-@@ -106,7 +106,7 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_transpose"
- 
--
-+(*
- 
- module Single = 
-   struct
-@@ -208,3 +208,4 @@
-   external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy"
-   external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose"
-   end
-+*)
-diff -aru gsl.orig/gsl_matrix_complex.mli gsl/gsl_matrix_complex.mli
---- gsl.orig/gsl_matrix_complex.mli	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_matrix_complex.mli	2009-04-20 15:09:49.000000000 -0400
-@@ -50,7 +50,7 @@
- external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_transpose_memcpy"
- external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_transpose"
- 
--
-+(*
- module Single : sig
- 
-   type complex_float_mat_bigarr = 
-@@ -96,3 +96,4 @@
-   external transpose : matrix -> matrix -> unit = "ml_gsl_matrix_complex_float_transpose_memcpy"
-   external transpose_in_place : matrix -> unit = "ml_gsl_matrix_complex_float_transpose"
- end
-+*)
-diff -aru gsl.orig/gsl_vector.ml gsl/gsl_vector.ml
---- gsl.orig/gsl_vector.ml	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_vector.ml	2009-04-20 15:11:08.000000000 -0400
-@@ -93,7 +93,7 @@
-     = "ml_gsl_vector_minmaxindex"
- 
- 
--
-+(*
- 
- module Single = 
- struct
-@@ -178,3 +178,4 @@
-   external minmax_index : vector -> int * int
-       = "ml_gsl_vector_float_minmaxindex"
- end
-+*)
-diff -aru gsl.orig/gsl_vector.mli gsl/gsl_vector.mli
---- gsl.orig/gsl_vector.mli	2007-09-13 23:31:23.000000000 -0400
-+++ gsl/gsl_vector.mli	2009-04-20 15:11:08.000000000 -0400
-@@ -63,6 +63,7 @@
- 
- val subvector : vector -> off:int -> len:int -> vector
- 
-+(*
- (** {3 Single precision} *)
- 
- module Single : sig
-@@ -121,3 +122,4 @@
-       
-   val subvector : vector -> off:int -> len:int -> vector
- end
-+*)
-
-