Attachment #251205 for bug #279509

View | Details | Raw Unified | Return to bug 279509
Collapse All | Expand All

Lines 1-8 Link Here

(-)b/math/orpie/Makefile (-10 / +37 lines)
1	PORTNAME= orpie	1	PORTNAME= orpie
2	PORTVERSION= 1.5.2	2	PORTVERSION= 1.6.1
3	PORTREVISION= 9	3	DISTVERSIONPREFIX= release-
4	CATEGORIES+= math	4	CATEGORIES+= math
5	MASTER_SITES= https://github.com/pelzlpj/orpie/releases/download/release-${PORTVERSION}/
6		5
7	MAINTAINER= mt-bugs@markoturk.info	6	MAINTAINER= mt-bugs@markoturk.info
8	COMMENT= Fullscreen RPN calculator for the console	7	COMMENT= Fullscreen RPN calculator for the console
Lines 13-33 LICENSE= GPLv2 Link Here
13	NOT_FOR_ARCHS= armv6 armv7	12	NOT_FOR_ARCHS= armv6 armv7
14	NOT_FOR_ARCHS_REASON= architectures with double-word alignment for doubles are not supported	13	NOT_FOR_ARCHS_REASON= architectures with double-word alignment for doubles are not supported
15		14
16	BUILD_DEPENDS= ${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num	15	BUILD_DEPENDS= ocaml-camlp5>=0:devel/ocaml-camlp5 \
		16	${LOCALBASE}/${OCAML_SITELIBDIR}/camlp-streams/META:devel/ocaml-camlp-streams \
		17	${LOCALBASE}/${OCAML_SITELIBDIR}/curses/META:devel/ocaml-curses \
		18	${LOCALBASE}/${OCAML_SITELIBDIR}/gsl/META:math/ocamlgsl \
		19	${LOCALBASE}/${OCAML_SITELIBDIR}/num/META:math/ocaml-num
17	LIB_DEPENDS= libgsl.so:math/gsl	20	LIB_DEPENDS= libgsl.so:math/gsl
18		21
19	USES= gmake ncurses	22	USES= ncurses ocaml:dune
		23	USE_GITHUB= yes
		24	GH_ACCOUNT= pelzlpj
20	USE_OCAML= yes	25	USE_OCAML= yes
21	USE_OCAML_CAMLP4=yes	26	#XXX DUNE_DOCSDIR= ${DOCSDIR}
22	GNU_CONFIGURE= yes
23	GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
24	MAKE_JOBS_UNSAFE= yes
25		27
26	PLIST_FILES= bin/orpie bin/orpie-curses-keys etc/orpierc \	28	PORTDOCS= LICENSE.md README.adoc manual.html manual.pdf
		29	PLIST_FILES= bin/orpie bin/orpie-curses-keys \
27	share/man/man1/orpie.1.gz share/man/man1/orpie-curses-keys.1.gz \	30	share/man/man1/orpie.1.gz share/man/man1/orpie-curses-keys.1.gz \
28	share/man/man5/orpierc.5.gz	31	share/man/man5/orpierc.5.gz
		32	# upstream changed to etc/orpie/orpierc, we stick to the old name (POLA)
		33	PLIST_FILES+= "@sample etc/orpierc.sample"
		34
		35	OPTIONS_DEFINE= DOCS
		36
		37	post-patch:
		38	@${REINPLACE_CMD} \
		39	-e 's,#use "topfind",#directory "+unix",' \
		40	-e 's,#require "unix",#load "unix.cma",' \
		41	${WRKSRC}/scripts/compute_prefix
		42	@${REINPLACE_CMD} \
		43	-e 's,(libraries,& camlp-streams,' \
		44	${WRKSRC}/src/orpie/dune
		45	@${REINPLACE_CMD} \
		46	-e '/^let sysconfdir =/s,"etc/orpie","etc",' \
		47	${WRKSRC}/src/orpie/install.ml.in
29		48
30	post-install:	49	post-install:
		50	@${MKDIR} ${STAGEDIR}${DOCSDIR}
		51	@${INSTALL_DATA} ${PORTDOCS:@f@${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME}/$f@} \
		52	${STAGEDIR}${DOCSDIR}
		53	@${RM} ${PORTDOCS:@f@${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME}/$f@}
		54	@${RMDIR} ${STAGEDIR}${OCAML_DOCSDIR}/${PORTNAME} ${STAGEDIR}${OCAML_DOCSDIR}
		55	@${RM} -r ${STAGEDIR}${PREFIX}/${OCAML_LIBDIR}
		56	@${MV} ${STAGEDIR}${ETCDIR}/orpierc ${STAGEDIR}${PREFIX}/etc/orpierc.sample
		57	@${RMDIR} ${STAGEDIR}${ETCDIR}
31	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*	58	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
32		59
33	.include <bsd.port.mk>	60	.include <bsd.port.mk>

Lines 1-2 Link Here

(-)b/math/orpie/distinfo (-2 / +3 lines)
1	SHA256 (orpie-1.5.2.tar.gz) = de557fc7f608c6cb1f44a965d3ae07fc6baf2b02a0d7994b89d6a0e0d87d3d6d	1	TIMESTAMP = 1717439291
2	SIZE (orpie-1.5.2.tar.gz) = 379583	2	SHA256 (pelzlpj-orpie-release-1.6.1_GH0.tar.gz) = 1ae5a99fbbf492869664e4bd81e6bf5cf65bdaf5027908c1e9313843bb5d5749
		3	SIZE (pelzlpj-orpie-release-1.6.1_GH0.tar.gz) = 277420




--- 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




--- 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"
+*)
 
 
 

Removed Link Here

(-)a/math/orpie/files/patch-gsl_mlgsl__error.c (-10 lines)
1	--- gsl/mlgsl_error.c.orig 2014-04-12 01:43:31 UTC
2	+++ gsl/mlgsl_error.c
3	@@ -34,6 +34,7 @@ static value *ml_gsl_exn;
4
5	static void ml_gsl_raise_exn(const char *msg, int gsl_errno)
6	{
7	+ CAMLparam0();
8	CAMLlocal2(exn_msg, exn_arg);
9	exn_msg = copy_string(msg);
10	exn_arg = alloc_small(2, 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)

Return to bug 279509

Removed Link Here

(-)a/math/orpie/files/patch-Makefile.in (-64 lines)
1	--- Makefile.in.orig 2014-04-12 01:43:31 UTC
2	+++ Makefile.in
3	@@ -81,7 +81,7 @@ CURSES_OOBJS = $(CURSES_CMX) $(CURSES_COBJS)
4	GSL_CMO = gsl/gsl_error.cmo gsl/gsl_blas.cmo gsl/gsl_complex.cmo gsl/gsl_matrix.cmo gsl/gsl_matrix_complex.cmo \
5	gsl/gsl_vector.cmo gsl/gsl_vector_complex.cmo gsl/gsl_vector_flat.cmo gsl/gsl_matrix_flat.cmo \
6	gsl/gsl_vector_complex_flat.cmo gsl/gsl_matrix_complex_flat.cmo gsl/gsl_vectmat.cmo \
7	- gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo
8	+ gsl/gsl_permut.cmo gsl/gsl_linalg.cmo gsl/gsl_fun.cmo gsl/gsl_sf.cmo gsl/gsl_math.cmo
9	GSL_CMX = $(GSL_CMO:.cmo=.cmx)
10	GSL_COBJS = gsl/mlgsl_error.o gsl/mlgsl_blas.o gsl/mlgsl_blas_complex.o gsl/mlgsl_complex.o gsl/mlgsl_blas_float.o \
11	gsl/mlgsl_blas_complex_float.o gsl/mlgsl_matrix_complex.o gsl/mlgsl_matrix_double.o gsl/mlgsl_matrix_float.o \
12	@@ -201,7 +201,7 @@ gsl-byte: $(GSL_BOBJS)
13	GSL_INCLUDES = -I ./gsl
14	GSL_BFLAGS = -g $(GSL_INCLUDES) -thread
15	GSL_OFLAGS = $(GSL_INCLUDES) -thread
16	-GSL_CFLAGS = @GSL_CFLAGS@ $(CPPFLAGS) $(CFLAGS) -DHAVE_INLINE -DHAVE_FENV -g -O2
17	+GSL_CFLAGS = @GSL_CFLAGS@ $(CPPFLAGS) $(CFLAGS) -DHAVE_INLINE -DHAVE_FENV
18
19	gsl/%.cmi : gsl/%.mli
20	$(OCAMLC) -c $(GSL_BFLAGS) $<
21	@@ -264,13 +264,10 @@ units/%.cmi : units/%.mli
22	units/%.cmo : units/%.ml
23	$(OCAMLC) -c $(UNITS_BFLAGS) $<
24
25	-units/%.o : units/%.ml
26	+units/%.o units/%.cmx : units/%.ml
27	$(OCAMLOPT) -c $(UNITS_OFLAGS) $<
28
29	-units/%.cmx : units/%.ml
30	- $(OCAMLOPT) -c $(UNITS_OFLAGS) $<
31
32	-
33	# generic build rules for toplevel directory
34	%.cmi : %.mli
35	$(OCAMLC) -c $(BFLAGS) $<
36	@@ -278,21 +275,20 @@ units/%.cmx : units/%.ml
37	%.cmo : %.ml
38	$(OCAMLC) -c $(BFLAGS) $<
39
40	-%.o : %.ml
41	- $(OCAMLOPT) -c $(OFLAGS) $<
42	+interface_draw.cmx: interface_draw.ml
43	+ $(OCAMLOPT) -c $(OFLAGS) -unsafe-string $<
44
45	-%.cmx : %.ml
46	+interface_main.cmx: interface_main.ml
47	+ $(OCAMLOPT) -c $(OFLAGS) -unsafe-string $<
48	+
49	+%.o %.cmx : %.ml
50	$(OCAMLOPT) -c $(OFLAGS) $<
51
52	%.ml : %.mll
53	$(OCAMLLEX) $<
54
55	-%.ml : %.mly
56	+%.ml %.mli : %.mly
57	$(OCAMLYACC) -v $<
58	-
59	-%.mli : %.mly
60	- $(OCAMLYACC) -v $<
61	-
62
63
64	# Emacs tags

Removed Link Here

(-)a/math/orpie/files/patch-gsl_gsl__sf.ml (-18 lines)
1	--- gsl/gsl_sf.ml.orig 2014-04-12 01:43:31 UTC
2	+++ gsl/gsl_sf.ml
3	@@ -1142,6 +1142,7 @@ external legendre_Ql_e : int -> float -> result
4
5
6
7	+(*
8	(* Associated LEGENDRE functions *)
9	external legendre_Plm : int -> int -> float -> float
10	= "ml_gsl_sf_legendre_Plm"
11	@@ -1167,6 +1168,7 @@ external legendre_sphPlm_array : int -> int -> float
12
13	external legendre_array_size : int -> int -> int
14	= "ml_gsl_sf_legendre_array_size"
15	+*)
16
17
18

Removed Link Here

(-)a/math/orpie/files/patch-gsl_mlgsl__sf.c (-36 lines)
1	Obtained from:
2	https://sources.debian.net/src/orpie/1.5.2-1/debian/patches/gsl-fix/
3
4	Description: fix some incompatibilities with libgsl 2.1
5	Author: Uwe Steinmann <steinm@debian.org>
6	Forwarded: not-needed
7
8	--- gsl/mlgsl_sf.c.orig 2014-04-12 01:43:31 UTC
9	+++ gsl/mlgsl_sf.c
10	@@ -258,7 +258,8 @@ SF2(ellint_Dcomp, Double_val, GSL_MODE_v
11	SF3(ellint_F, Double_val, Double_val, GSL_MODE_val)
12	SF3(ellint_E, Double_val, Double_val, GSL_MODE_val)
13	SF4(ellint_P, Double_val, Double_val, Double_val, GSL_MODE_val)
14	-SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val)
15	+//SF4(ellint_D, Double_val, Double_val, Double_val, GSL_MODE_val)
16	+SF3(ellint_D, Double_val, Double_val, GSL_MODE_val)
17	SF3(ellint_RC, Double_val, Double_val, GSL_MODE_val)
18	SF4(ellint_RD, Double_val, Double_val, Double_val, GSL_MODE_val)
19	SF4(ellint_RF, Double_val, Double_val, Double_val, GSL_MODE_val)
20	@@ -452,6 +453,7 @@ SF1(legendre_Q1, Double_val)
21	SF2(legendre_Ql, Int_val, Double_val)
22
23	/* Associated Legendre Polynomials and Spherical Harmonics */
24	+/*
25	SF3(legendre_Plm, Int_val, Int_val, Double_val)
26	CAMLprim value
27	ml_gsl_sf_legendre_Plm_array(value lmax, value m, value x, value result_array)
28	@@ -487,7 +489,7 @@ ml_gsl_sf_legendre_array_size(value lmax
29	ret = Val_int(gsl_ret);
30	CAMLreturn(ret);
31	}
32	-
33	+*/
34	/* LOGARITHM and related functions */
35	SF1(log, Double_val)
36	SF1(log_abs, Double_val)