cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add some patches from upstream.

Browse Source 
One fixes a problem with dpb display, as reported by jasper@

OK jasper@
This commit is contained in:
dcoppa 2010-11-22 08:50:26 +00:00
parent e50b98837f
commit 841328cec5
4 changed files with 75 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
devel/omake/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.9 2010/11/15 19:46:00 espie Exp $
# $OpenBSD: Makefile,v 1.10 2010/11/22 08:50:26 dcoppa Exp $
COMMENT= build system designed for scalability and portability
CATEGORIES= devel
@ -7,7 +7,7 @@ V= 0.9.8.5
VEXTRA= 3
DISTNAME= omake-${V}-${VEXTRA}
PKGNAME= omake-${V}pl${VEXTRA}
REVISION = 1
REVISION = 2
WRKDIST= ${WRKDIR}/omake-${V}
MASTER_SITES= http://omake.metaprl.org/downloads/ \
http://www.ocaml-programming.de/godi-backup/

15
devel/omake/patches/patch-OMakefile Normal file
View File

@ -0,0 +1,15 @@
$OpenBSD: patch-OMakefile,v 1.1 2010/11/22 08:50:26 dcoppa Exp $
Make omake compile with Ocaml 3.12
--- OMakefile.orig Fri Jun 22 21:03:37 2007
+++ OMakefile Wed Nov 10 15:30:25 2010
@@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
#
# OCaml options
#
-OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z)
+OCAMLFLAGS[] += -w Aer-29$(if $(OCAML_ACCEPTS_Z_WARNING), z)
if $(THREADS_ENABLED)
OCAMLFLAGS += -thread
export

22
devel/omake/patches/patch-src_build_omake_rule_ml Normal file
View File

@ -0,0 +1,22 @@
$OpenBSD: patch-src_build_omake_rule_ml,v 1.1 2010/11/22 08:50:26 dcoppa Exp $
Patch from upstream: stdin <-> stdout fix (upstream r12115)
--- src/build/omake_rule.ml.orig Mon Jul 2 20:20:23 2007
+++ src/build/omake_rule.ml Wed Nov 10 15:29:58 2010
@@ -1040,12 +1040,12 @@ and eval_include_rule venv pos loc sources deps values
* Evaluate the commands NOW.
*)
and exec_commands venv pos loc commands =
- let stdin = channel_of_var venv pos loc stdin_var in
let stdout = channel_of_var venv pos loc stdout_var in
- let stdin = Lm_channel.descr stdin in
+ let stderr = channel_of_var venv pos loc stderr_var in
let stdout = Lm_channel.descr stdout in
+ let stderr = Lm_channel.descr stderr in
List.iter (fun command ->
- let pid = eval_shell_internal stdin stdout command in
+ let pid = eval_shell_internal stdout stderr command in
let status, _ = eval_shell_wait venv pos pid in
let code =
match status with

36
devel/omake/patches/patch-src_libmojave-external_cutil_lm_printf_c Normal file
View File

@ -0,0 +1,36 @@
$OpenBSD: patch-src_libmojave-external_cutil_lm_printf_c,v 1.1 2010/11/22 08:50:26 dcoppa Exp $
Patch from upstream: fix attempt to free a non-heap object
--- src/libmojave-external/cutil/lm_printf.c.orig Sun Jul 15 19:55:23 2007
+++ src/libmojave-external/cutil/lm_printf.c Wed Nov 10 15:30:18 2010
@@ -142,12 +142,12 @@ value ml_print_string(value v_fmt, value v_string)
#endif
if(code < 0) {
if(bufp != buffer)
- free(buffer);
+ free(bufp);
failwith("ml_print_string");
}
v_result = copy_string(bufp);
if(bufp != buffer)
- free(buffer);
+ free(bufp);
return v_result;
}
@@ -190,12 +190,12 @@ value ml_print_string2(value v_width, value v_fmt, val
#endif
if(code < 0) {
if(bufp != buffer)
- free(buffer);
+ free(bufp);
failwith("ml_print_string");
}
v_result = copy_string(bufp);
if(bufp != buffer)
- free(buffer);
+ free(bufp);
return v_result;
}