Date: Wed, 5 Jun 2024 21:27:38 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 156840b3e289 - main - math/orpie: Update to 1.6.1 Message-ID: <202406052127.455LRcoQ047330@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=156840b3e2899ec640d4db73aa5be4adc0897421 commit 156840b3e2899ec640d4db73aa5be4adc0897421 Author: Benjamin Jacobs <freebsd@dev.thsi.be> AuthorDate: 2024-06-03 21:29:33 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2024-06-05 21:27:08 +0000 math/orpie: Update to 1.6.1 PR: 279509 --- math/orpie/Makefile | 47 ++++++++++++++++++----- math/orpie/distinfo | 5 ++- math/orpie/files/patch-Makefile.in | 64 ------------------------------- math/orpie/files/patch-gsl_gsl__sf.ml | 18 --------- math/orpie/files/patch-gsl_mlgsl__error.c | 10 ----- math/orpie/files/patch-gsl_mlgsl__sf.c | 36 ----------------- 6 files changed, 40 insertions(+), 140 deletions(-) diff --git a/math/orpie/Makefile b/math/orpie/Makefile index e5c37939ac5e..bfea43fd08bc 100644 --- a/math/orpie/Makefile +++ b/math/orpie/Makefile @@ -1,8 +1,7 @@ PORTNAME= orpie -PORTVERSION= 1.5.2 -PORTREVISION= 9 +PORTVERSION= 1.6.1 +DISTVERSIONPREFIX= release- CATEGORIES+= math -MASTER_SITES= https://github.com/pelzlpj/orpie/releases/download/release-${PORTVERSION}/ MAINTAINER= mt-bugs@markoturk.info COMMENT= Fullscreen RPN calculator for the console @@ -13,21 +12,49 @@ LICENSE= GPLv2 NOT_FOR_ARCHS= armv6 armv7 NOT_FOR_ARCHS_REASON= architectures with double-word alignment for doubles are not supported -BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num +BUILD_DEPENDS= ocaml-camlp5>=0:devel/ocaml-camlp5 \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/camlp-streams/META:devel/ocaml-camlp-streams \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/curses/META:devel/ocaml-curses \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/gsl/META:math/ocamlgsl \ + ${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num LIB_DEPENDS= libgsl.so:math/gsl -USES= gmake ncurses +USES= ncurses ocaml:dune +USE_GITHUB= yes +GH_ACCOUNT= pelzlpj USE_OCAML= yes -USE_OCAML_CAMLP4=yes -GNU_CONFIGURE= yes -GNU_CONFIGURE_MANPREFIX=${PREFIX}/share -MAKE_JOBS_UNSAFE= yes +#XXX DUNE_DOCSDIR= ${DOCSDIR} -PLIST_FILES= bin/orpie bin/orpie-curses-keys etc/orpierc \ +PORTDOCS= LICENSE.md README.adoc manual.html manual.pdf +PLIST_FILES= bin/orpie bin/orpie-curses-keys \ share/man/man1/orpie.1.gz share/man/man1/orpie-curses-keys.1.gz \ share/man/man5/orpierc.5.gz +# upstream changed to etc/orpie/orpierc, we stick to the old name (POLA) +PLIST_FILES+= "@sample etc/orpierc.sample" + +OPTIONS_DEFINE= DOCS + +post-patch: + @${REINPLACE_CMD} \ + -e 's,#use "topfind",#directory "+unix",' \ + -e 's,#require "unix",#load "unix.cma",' \ + ${WRKSRC}/scripts/compute_prefix + @${REINPLACE_CMD} \ + -e 's,(libraries,& camlp-streams,' \ + ${WRKSRC}/src/orpie/dune + @${REINPLACE_CMD} \ + -e '/^let sysconfdir =/s,"etc/orpie","etc",' \ + ${WRKSRC}/src/orpie/install.ml.in post-install: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @${INSTALL_DATA} ${PORTDOCS:@f@${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME}/$f@} \ + ${STAGEDIR}${DOCSDIR} + @${RM} ${PORTDOCS:@f@${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME}/$f@} + @${RMDIR} ${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME} ${STAGEDIR}${OCAML_DOCSDIR} + @${RM} -r ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR} + @${MV} ${STAGEDIR}${ETCDIR}/orpierc ${STAGEDIR}${PREFIX}/etc/orpierc.sample + @${RMDIR} ${STAGEDIR}${ETCDIR} @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* .include <bsd.port.mk> diff --git a/math/orpie/distinfo b/math/orpie/distinfo index 26203f81e260..9be0054c3f15 100644 --- a/math/orpie/distinfo +++ b/math/orpie/distinfo @@ -1,2 +1,3 @@ -SHA256 (orpie-1.5.2.tar.gz) = de557fc7f608c6cb1f44a965d3ae07fc6baf2b02a0d7994b89d6a0e0d87d3d6d -SIZE (orpie-1.5.2.tar.gz) = 379583 +TIMESTAMP = 1717439291 +SHA256 (pelzlpj-orpie-release-1.6.1_GH0.tar.gz) = 1ae5a99fbbf492869664e4bd81e6bf5cf65bdaf5027908c1e9313843bb5d5749 +SIZE (pelzlpj-orpie-release-1.6.1_GH0.tar.gz) = 277420 diff --git a/math/orpie/files/patch-Makefile.in b/math/orpie/files/patch-Makefile.in deleted file mode 100644 index 018925bc2e02..000000000000 --- a/math/orpie/files/patch-Makefile.in +++ /dev/null @@ -1,64 +0,0 @@ ---- Makefile.in.orig 2014-04-12 01:43:31 UTC -+++ Makefile.in -@@ -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 \ -- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo -+ gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo gsl/gsl_sf.cmo gsl/gsl_math.cmo - 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 @@ gsl-byte: $(GSL_BOBJS) - 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,13 +264,10 @@ units/%.cmi : units/%.mli - units/%.cmo : units/%.ml - $(OCAMLC) -c $(UNITS_BFLAGS) $< - --units/%.o : units/%.ml -+units/%.o units/%.cmx : units/%.ml - $(OCAMLOPT) -c $(UNITS_OFLAGS) $< - --units/%.cmx : units/%.ml -- $(OCAMLOPT) -c $(UNITS_OFLAGS) $< - -- - # 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) $< - - %.ml : %.mll - $(OCAMLLEX) $< - --%.ml : %.mly -+%.ml %.mli : %.mly - $(OCAMLYACC) -v $< -- --%.mli : %.mly -- $(OCAMLYACC) -v $< -- - - - # Emacs tags diff --git a/math/orpie/files/patch-gsl_gsl__sf.ml b/math/orpie/files/patch-gsl_gsl__sf.ml deleted file mode 100644 index 06cad5a5f304..000000000000 --- a/math/orpie/files/patch-gsl_gsl__sf.ml +++ /dev/null @@ -1,18 +0,0 @@ ---- gsl/gsl_sf.ml.orig 2014-04-12 01:43:31 UTC -+++ gsl/gsl_sf.ml -@@ -1142,6 +1142,7 @@ external legendre_Ql_e : int -> float -> result - - - -+(* - (* Associated LEGENDRE functions *) - external legendre_Plm : int -> int -> float -> float - = "ml_gsl_sf_legendre_Plm" -@@ -1167,6 +1168,7 @@ external legendre_sphPlm_array : int -> int -> float - - external legendre_array_size : int -> int -> int - = "ml_gsl_sf_legendre_array_size" -+*) - - - diff --git a/math/orpie/files/patch-gsl_mlgsl__error.c b/math/orpie/files/patch-gsl_mlgsl__error.c deleted file mode 100644 index f3fe29f8e194..000000000000 --- a/math/orpie/files/patch-gsl_mlgsl__error.c +++ /dev/null @@ -1,10 +0,0 @@ ---- gsl/mlgsl_error.c.orig 2014-04-12 01:43:31 UTC -+++ gsl/mlgsl_error.c -@@ -34,6 +34,7 @@ static value *ml_gsl_exn; - - static void ml_gsl_raise_exn(const char *msg, int gsl_errno) - { -+ CAMLparam0(); - CAMLlocal2(exn_msg, exn_arg); - exn_msg = copy_string(msg); - exn_arg = alloc_small(2, 0); diff --git a/math/orpie/files/patch-gsl_mlgsl__sf.c b/math/orpie/files/patch-gsl_mlgsl__sf.c deleted file mode 100644 index 3f7dec98222a..000000000000 --- a/math/orpie/files/patch-gsl_mlgsl__sf.c +++ /dev/null @@ -1,36 +0,0 @@ -Obtained from: -https://sources.debian.net/src/orpie/1.5.2-1/debian/patches/gsl-fix/ - -Description: fix some incompatibilities with libgsl 2.1 -Author: Uwe Steinmann <steinm@debian.org> -Forwarded: not-needed - ---- gsl/mlgsl_sf.c.orig 2014-04-12 01:43:31 UTC -+++ gsl/mlgsl_sf.c -@@ -258,7 +258,8 @@ SF2(ellint_Dcomp, Double_val, GSL_MODE_v - SF3(ellint_F, Double_val, Double_val, GSL_MODE_val) - SF3(ellint_E, Double_val, Double_val, GSL_MODE_val) - SF4(ellint_P, Double_val, Double_val, Double_val, GSL_MODE_val) --SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val) -+//SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val) -+SF3(ellint_D, Double_val, Double_val, GSL_MODE_val) - SF3(ellint_RC, Double_val, Double_val, GSL_MODE_val) - SF4(ellint_RD, Double_val, Double_val, Double_val, GSL_MODE_val) - SF4(ellint_RF, Double_val, Double_val, Double_val, GSL_MODE_val) -@@ -452,6 +453,7 @@ SF1(legendre_Q1, Double_val) - SF2(legendre_Ql, Int_val, Double_val) - - /* Associated Legendre Polynomials and Spherical Harmonics */ -+/* - SF3(legendre_Plm, Int_val, Int_val, Double_val) - CAMLprim value - ml_gsl_sf_legendre_Plm_array(value lmax, value m, value x, value result_array) -@@ -487,7 +489,7 @@ ml_gsl_sf_legendre_array_size(value lmax - ret = Val_int(gsl_ret); - CAMLreturn(ret); - } -- -+*/ - /* LOGARITHM and related functions */ - SF1(log, Double_val) - SF1(log_abs, Double_val)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202406052127.455LRcoQ047330>