ports/103582: [maintainer update] math/orpie to 1.4.3 and build fix

Dylan Simon dylan at dylex.net
Sun Sep 24 19:00:27 UTC 2006


>Number:         103582
>Category:       ports
>Synopsis:       [maintainer update] math/orpie to 1.4.3 and build fix
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Sun Sep 24 19:00:26 GMT 2006
>Closed-Date:
>Last-Modified:
>Originator:     Dylan Simon
>Release:        FreeBSD 6.1-RELEASE i386
>Organization:
>Environment:
System: FreeBSD druid.pasadena.rainfinity.com 6.1-RELEASE FreeBSD 6.1-RELEASE #2: Mon May 15 17:48:05 PDT 2006 dylan at druid.pasadena.rainfinity.com:/usr/obj/usr/src/sys/QUARK i386

Unfortunately I don't currently have a 6.2 machine to fully test the recent build problem, but I believe this should fix it.
Hopefully I'll be able to bring one up next week and resolve it if there are further issues.

>Description:
Upgrade 1.4.1 to 1.4.3 and attempt to fix recent 6.2 build failure.
>How-To-Repeat:
>Fix:

--- orpie-1.4.3.patch begins here ---
diff -ruN orpie/Makefile orpie.new/Makefile
--- orpie/Makefile	Fri May  5 21:28:20 2006
+++ orpie.new/Makefile	Sun Sep 24 14:45:12 2006
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	orpie
-PORTVERSION=	1.4.1
-PORTREVISION=	1
+PORTVERSION=	1.4.3
 CATEGORIES+=	math
 MASTER_SITES=	http://www.eecs.umich.edu/~pelzlpj/orpie/
 
diff -ruN orpie/distinfo orpie.new/distinfo
--- orpie/distinfo	Sun Jan 22 07:56:34 2006
+++ orpie.new/distinfo	Sun Sep 24 14:22:33 2006
@@ -1,3 +1,3 @@
-MD5 (orpie-1.4.1.tar.gz) = 04a3d7d4afc5374d8bcc476b348e6561
-SHA256 (orpie-1.4.1.tar.gz) = c9e5e8dc37558627337cafb5bf8e3828482b2a6ad473588f6179befedca1fb67
-SIZE (orpie-1.4.1.tar.gz) = 373649
+MD5 (orpie-1.4.3.tar.gz) = 1c9d87cf3f8d982a9a3662d48e13de55
+SHA256 (orpie-1.4.3.tar.gz) = beb46341286a8b4c38ce21a2e93cbd9e32924c5d4bb5015baf2dbf756d6dafc3
+SIZE (orpie-1.4.3.tar.gz) = 356721
diff -ruN orpie/files/patch-Makefile orpie.new/files/patch-Makefile
--- orpie/files/patch-Makefile	Mon Aug  9 17:09:53 2004
+++ orpie.new/files/patch-Makefile	Wed Dec 31 19:00:00 1969
@@ -1,53 +0,0 @@
---- Makefile.in.orig	Thu Jul 22 11:33:41 2004
-+++ Makefile.in	Thu Aug  5 11:49:03 2004
-@@ -41,8 +41,8 @@
- INCLUDES = -I ./curses -I ./gsl
- BFLAGS   = -pp camlp4o -g $(INCLUDES) -thread
- OFLAGS   = -pp camlp4o $(INCLUDES) -thread
--BLFLAGS  = -custom -cclib '$(CURSES_LIB) $(GSL_LIB) -lm'
--OLFLAGS  = -cclib '$(CURSES_LIB) $(GSL_LIB) -lm'
-+BLFLAGS  = -custom -cclib '@LDFLAGS@ $(CURSES_LIB) $(GSL_LIB) -lm'
-+OLFLAGS  = -cclib '@LDFLAGS@ $(CURSES_LIB) $(GSL_LIB) -lm'
- DEPFLAGS = -pp camlp4o
- 
- # main target
-@@ -144,21 +144,21 @@
- 		mkdir -p $(DESTDIR)/$(prefix)/etc; \
- 		install -m 644 orpierc $(DESTDIR)/$(prefix)/etc; \
- 	fi
--	install -m 644 -D doc/orpie.1 $(MANDIR)/man1/orpie.1
--	install -m 644 -D doc/orpie-curses-keys.1 $(MANDIR)/man1/orpie-curses-keys.1
--	install -m 644 -D doc/orpierc.5 $(MANDIR)/man5/orpierc.5
-+	install -m 644 doc/orpie.1 $(MANDIR)/man1/orpie.1
-+	install -m 644 doc/orpie-curses-keys.1 $(MANDIR)/man1/orpie-curses-keys.1
-+	install -m 644 doc/orpierc.5 $(MANDIR)/man5/orpierc.5
- 
- install: install-indep
--	install -m 755 -D $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
--	install -m 755 -D $(NAME2).$(OCAMLBEST) $(BINDIR)/$(NAME2)$(EXE)
-+	install -m 755 $(NAME).$(OCAMLBEST) $(BINDIR)/$(NAME)$(EXE)
-+	install -m 755 $(NAME2).$(OCAMLBEST) $(BINDIR)/$(NAME2)$(EXE)
- 
- install-byte: install-indep
--	install -m 755 -D $(NAME).byte $(BINDIR)/$(NAME)$(EXE)
--	install -m 755 -D $(NAME2).byte $(BINDIR)/$(NAME2)$(EXE)
-+	install -m 755 $(NAME).byte $(BINDIR)/$(NAME)$(EXE)
-+	install -m 755 $(NAME2).byte $(BINDIR)/$(NAME2)$(EXE)
- 
- install-opt: install-indep
--	install -m 755 -D $(NAME).opt $(BINDIR)/$(NAME)$(EXE)
--	install -m 755 -D $(NAME2).opt $(BINDIR)/$(NAME2)$(EXE)
-+	install -m 755 $(NAME).opt $(BINDIR)/$(NAME)$(EXE)
-+	install -m 755 $(NAME2).opt $(BINDIR)/$(NAME2)$(EXE)
- 
- uninstall:
- 	rm -f $(BINDIR)/$(NAME)$(EXE)
-@@ -185,7 +185,7 @@
- GSL_INCLUDES = -I ./gsl
- GSL_BFLAGS = -g $(GSL_INCLUDES) -thread
- GSL_OFLAGS = $(GSL_INCLUDES) -thread
--GSL_CFLAGS = -Wall -fPIC -DPIC
-+GSL_CFLAGS = -Wall -fPIC -DPIC @CPPFLAGS@
- 
- gsl/%.cmi : gsl/%.mli
- 	$(OCAMLC) -c $(GSL_BFLAGS) $<
diff -ruN orpie/files/patch-gsl::mlgsl_error.c orpie.new/files/patch-gsl::mlgsl_error.c
--- orpie/files/patch-gsl::mlgsl_error.c	Wed Dec 31 19:00:00 1969
+++ orpie.new/files/patch-gsl::mlgsl_error.c	Sun Sep 24 14:42:42 2006
@@ -0,0 +1,12 @@
+--- gsl/mlgsl_error.c.orig	Sat Oct 29 22:40:23 2005
++++ gsl/mlgsl_error.c	Sun Sep 24 14:42:12 2006
+@@ -43,7 +43,8 @@
+   exn_arg = alloc_small(2, 0);
+   Store_field(exn_arg, 0, Val_int(conv_err_code(gsl_errno)));
+   Store_field(exn_arg, 1, copy_string(ml_gsl_exn_msg));
+-  CAMLreturn(raise_with_arg(*ml_gsl_exn, exn_arg));
++  raise_with_arg(*ml_gsl_exn, exn_arg);
++  CAMLreturn0;
+ }
+ 
+ static void ml_gsl_error_handler(const char *reason, const char *file,
diff -ruN orpie/files/patch-gsl::wrappers.h orpie.new/files/patch-gsl::wrappers.h
--- orpie/files/patch-gsl::wrappers.h	Mon Aug  9 17:09:53 2004
+++ orpie.new/files/patch-gsl::wrappers.h	Wed Dec 31 19:00:00 1969
@@ -1,11 +0,0 @@
---- gsl/wrappers.h.orig	Thu Jul 22 11:33:38 2004
-+++ gsl/wrappers.h	Thu Aug  5 11:10:31 2004
-@@ -70,7 +70,7 @@
- #define CONCAT3(a,b,c) CONCAT3x(a,b,c)
- 
- #ifndef DONT_USE_ALLOCA
--#include <malloc.h>
-+#include <stdlib.h>
- #define LOCALARRAY(type, x, len)  type * x = ( type *) alloca(sizeof( type ) * (len))
- #else
- #define LOCALARRAY(type, x, len)  type x [(len)] 
--- orpie-1.4.3.patch ends here ---


>Release-Note:
>Audit-Trail:
>Unformatted:



More information about the freebsd-ports-bugs mailing list