Attachment 172585 Details for Bug 210853 – Proposed patch (since 417685 revision)

[patch] Proposed patch (since 417685 revision)

omake.diff (text/plain), 16.16 KB, created by lightside on 2016-07-16 18:03:22 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: lightside

Created: 2016-07-16 18:03:22 UTC

Size: 16.16 KB

patch

obsolete

>diff -ruN omake.orig/Makefile omake/Makefile
>--- omake.orig/Makefile	2016-06-28 01:30:34.400484000 +0400
>+++ omake/Makefile	2016-07-16 20:51:16.793724000 +0400
>@@ -5,15 +5,12 @@
> DISTVERSION=	0.9.8.6-0.rc1
> PORTREVISION=	1
> CATEGORIES=	devel
>-MASTER_SITES=	http://main.metaprl.org/download/omake/
>+MASTER_SITES=	http://pkgs.fedoraproject.org/repo/pkgs/ocaml-omake/omake-0.9.8.6-0.rc1.tar.gz/fe39a476ef4e33b7ba2ca77a6bcaded2/ \
>+		http://download.camlcity.org/download/
> 
> MAINTAINER=	ports@FreeBSD.org
> COMMENT=	Flexible build system
> 
>-BROKEN=		unfetchable
>-DEPRECATED=	Broken for more than 6 months
>-EXPIRATION_DATE=	2016-07-04
>-
> WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION:C|-.*||}
> USE_OCAML=	yes
> NO_OCAML_RUNDEPENDS=yes
>diff -ruN omake.orig/files/patch-OMakefile omake/files/patch-OMakefile
>--- omake.orig/files/patch-OMakefile	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-OMakefile	2016-07-16 20:51:00.050707000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- OMakefile.orig	2010-10-27 00:42:37.000000000 +0000
>+--- OMakefile.orig	2010-10-27 00:42:37 UTC
> +++ OMakefile
> @@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
>  #
>diff -ruN omake.orig/files/patch-lib_build_OCaml.om omake/files/patch-lib_build_OCaml.om
>--- omake.orig/files/patch-lib_build_OCaml.om	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-lib_build_OCaml.om	2016-07-16 20:51:00.055445000 +0400
>@@ -6,7 +6,7 @@
> warn-error flag is to remove all these unreferenced functions and
> constants via patches.
> 
>---- lib/build/OCaml.om.orig	2008-03-05 01:07:25.000000000 +0000
>+--- lib/build/OCaml.om.orig	2008-03-05 01:07:25 UTC
> +++ lib/build/OCaml.om
> @@ -176,7 +176,7 @@ public.PREFIXED_OCAMLPACKS =\
>  #
>diff -ruN omake.orig/files/patch-src_build_omake_rule.ml omake/files/patch-src_build_omake_rule.ml
>--- omake.orig/files/patch-src_build_omake_rule.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_build_omake_rule.ml	2016-07-16 20:51:00.060185000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/build/omake_rule.ml.orig	2010-10-07 19:59:08.000000000 +0000
>+--- src/build/omake_rule.ml.orig	2010-10-07 19:59:08 UTC
> +++ src/build/omake_rule.ml
> @@ -768,7 +768,7 @@ let lazy_command venv pos command =
>           let fv = free_vars_exp_list el in
>diff -ruN omake.orig/files/patch-src_builtin_omake__builtin__target.ml omake/files/patch-src_builtin_omake__builtin__target.ml
>--- omake.orig/files/patch-src_builtin_omake__builtin__target.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_builtin_omake__builtin__target.ml	2016-07-16 20:51:00.064882000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/builtin/omake_builtin_target.ml.orig	2008-01-15 19:57:00.000000000 +0000
>+--- src/builtin/omake_builtin_target.ml.orig	2008-01-15 19:57:00 UTC
> +++ src/builtin/omake_builtin_target.ml
> @@ -221,8 +221,8 @@ let split_command venv (values1, lines1)
>                 match line with
>diff -ruN omake.orig/files/patch-src_clib_omake__shell__sys.c omake/files/patch-src_clib_omake__shell__sys.c
>--- omake.orig/files/patch-src_clib_omake__shell__sys.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_clib_omake__shell__sys.c	2016-07-16 20:51:00.069665000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/clib/omake_shell_sys.c.orig	2007-12-01 21:32:13.000000000 +0000
>+--- src/clib/omake_shell_sys.c.orig	2007-12-01 21:32:13 UTC
> +++ src/clib/omake_shell_sys.c
> @@ -551,7 +551,7 @@ value omake_shell_sys_suspend(value v_pg
>      fflush(stderr);
>diff -ruN omake.orig/files/patch-src_clib_readline.c omake/files/patch-src_clib_readline.c
>--- omake.orig/files/patch-src_clib_readline.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_clib_readline.c	2016-07-16 20:51:00.074350000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/clib/readline.c.orig	2007-05-15 19:03:03.000000000 +0000
>+--- src/clib/readline.c.orig	2007-05-15 19:03:03 UTC
> +++ src/clib/readline.c
> @@ -134,7 +134,7 @@ static char **readline_completion(char *
>          CAMLreturnT(char **, 0);
>diff -ruN omake.orig/files/patch-src_env_omake__env.ml omake/files/patch-src_env_omake__env.ml
>--- omake.orig/files/patch-src_env_omake__env.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_env_omake__env.ml	2016-07-16 20:51:00.079247000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/env/omake_env.ml.orig	2008-01-15 19:57:00.000000000 +0000
>+--- src/env/omake_env.ml.orig	2008-01-15 19:57:00 UTC
> +++ src/env/omake_env.ml
> @@ -404,8 +404,8 @@ let rec pp_print_command buf command =
>     match command with
>diff -ruN omake.orig/files/patch-src_ir_omake__value__type.ml omake/files/patch-src_ir_omake__value__type.ml
>--- omake.orig/files/patch-src_ir_omake__value__type.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_ir_omake__value__type.ml	2016-07-16 20:51:00.083956000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/ir/omake_value_type.ml.orig	2010-10-07 19:59:08.000000000 +0000
>+--- src/ir/omake_value_type.ml.orig	2010-10-07 19:59:08 UTC
> +++ src/ir/omake_value_type.ml
> @@ -162,7 +162,7 @@ type path =
>   *)
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_fam__pseudo.h omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h
>--- omake.orig/files/patch-src_libmojave-external_cutil_fam__pseudo.h	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_fam__pseudo.h	2016-07-16 20:51:00.088674000 +0400
>@@ -1,6 +1,6 @@
> $NetBSD: patch-src_libmojave-external_cutil_fam__pseudo.h,v 1.1 2012/11/16 00:46:04 joerg Exp $
> 
>---- src/libmojave-external/cutil/fam_pseudo.h.orig	2012-11-08 22:16:13.000000000 +0000
>+--- src/libmojave-external/cutil/fam_pseudo.h.orig	2006-07-15 17:23:37 UTC
> +++ src/libmojave-external/cutil/fam_pseudo.h
> @@ -43,7 +43,10 @@
>  /*
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__channel.c omake/files/patch-src_libmojave-external_cutil_lm__channel.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__channel.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__channel.c	2016-07-16 20:51:00.093427000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_channel.c.orig	2006-07-15 17:23:37.000000000 +0000
>+--- src/libmojave-external/cutil/lm_channel.c.orig	2006-07-15 17:23:37 UTC
> +++ src/libmojave-external/cutil/lm_channel.c
> @@ -57,7 +57,7 @@ value omake_shell_peek_pipe(value v_fd)
>                             &total,              // Total number of bytes available
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__ctype.c omake/files/patch-src_libmojave-external_cutil_lm__ctype.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__ctype.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__ctype.c	2016-07-16 20:51:00.098106000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_ctype.c.orig	2006-12-01 21:13:14.000000000 +0000
>+--- src/libmojave-external/cutil/lm_ctype.c.orig	2006-12-01 21:13:14 UTC
> +++ src/libmojave-external/cutil/lm_ctype.c
> @@ -59,7 +59,7 @@ static value get_chars(int (*f)(int))
>          if(f(i))
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__notify.c omake/files/patch-src_libmojave-external_cutil_lm__notify.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__notify.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__notify.c	2016-07-16 20:51:00.102865000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_notify.c.orig	2007-07-27 17:58:13.000000000 +0000
>+--- src/libmojave-external/cutil/lm_notify.c.orig	2007-07-27 17:58:13 UTC
> +++ src/libmojave-external/cutil/lm_notify.c
> @@ -74,13 +74,13 @@ typedef struct {
>  
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__printf.c omake/files/patch-src_libmojave-external_cutil_lm__printf.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__printf.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__printf.c	2016-07-16 20:51:00.107735000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_printf.c.orig	2009-02-06 16:41:21.000000000 +0000
>+--- src/libmojave-external/cutil/lm_printf.c.orig	2009-02-06 16:41:21 UTC
> +++ src/libmojave-external/cutil/lm_printf.c
> @@ -61,12 +61,12 @@ value ml_print_char(value v_fmt, value v
>      char c = (char) Int_val(v_char);
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__terminfo.c omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__terminfo.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__terminfo.c	2016-07-16 20:51:00.112672000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_terminfo.c.orig	2007-05-15 19:03:32.000000000 +0000
>+--- src/libmojave-external/cutil/lm_terminfo.c.orig	2007-05-15 19:03:32 UTC
> +++ src/libmojave-external/cutil/lm_terminfo.c
> @@ -75,9 +75,9 @@ value caml_tgetstr(value id) {
>  
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__termsize.c omake/files/patch-src_libmojave-external_cutil_lm__termsize.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__termsize.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__termsize.c	2016-07-16 20:51:00.117432000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_termsize.c.orig	2008-03-19 00:44:12.000000000 +0000
>+--- src/libmojave-external/cutil/lm_termsize.c.orig	2008-03-19 00:44:12 UTC
> +++ src/libmojave-external/cutil/lm_termsize.c
> @@ -45,7 +45,7 @@ value caml_term_size(value arg)
>      CAMLlocal1(buf);
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__uname__ext.c omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__uname__ext.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__uname__ext.c	2016-07-16 20:51:00.121994000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_uname_ext.c.orig	2006-12-08 19:21:40.000000000 +0000
>+--- src/libmojave-external/cutil/lm_uname_ext.c.orig	2006-12-08 19:21:40 UTC
> +++ src/libmojave-external/cutil/lm_uname_ext.c
> @@ -147,21 +147,21 @@ value lm_uname(value x)
>  
>diff -ruN omake.orig/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c
>--- omake.orig/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_cutil_lm__unix__cutil.c	2016-07-16 20:51:00.126767000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/cutil/lm_unix_cutil.c.orig	2007-07-18 17:42:32.000000000 +0000
>+--- src/libmojave-external/cutil/lm_unix_cutil.c.orig	2007-07-18 17:42:32 UTC
> +++ src/libmojave-external/cutil/lm_unix_cutil.c
> @@ -87,9 +87,9 @@ value home_win32(value v_unit)
>      TCHAR path[MAX_PATH];
>diff -ruN omake.orig/files/patch-src_libmojave-external_stdlib_lm__debug.ml omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml
>--- omake.orig/files/patch-src_libmojave-external_stdlib_lm__debug.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_stdlib_lm__debug.ml	2016-07-16 20:51:00.131481000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/stdlib/lm_debug.ml.orig	2006-08-03 22:51:52.000000000 +0000
>+--- src/libmojave-external/stdlib/lm_debug.ml.orig	2006-08-03 22:51:52 UTC
> +++ src/libmojave-external/stdlib/lm_debug.ml
> @@ -173,11 +173,10 @@ let create_debug
>   *)
>diff -ruN omake.orig/files/patch-src_libmojave-external_stdlib_lm__string__util.ml omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml
>--- omake.orig/files/patch-src_libmojave-external_stdlib_lm__string__util.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_stdlib_lm__string__util.ml	2016-07-16 20:51:00.136217000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/stdlib/lm_string_util.ml.orig	2008-06-28 01:21:34.000000000 +0000
>+--- src/libmojave-external/stdlib/lm_string_util.ml.orig	2008-06-28 01:21:34 UTC
> +++ src/libmojave-external/stdlib/lm_string_util.ml
> @@ -613,18 +613,13 @@ let tokens_create wrap group =
>   * Get the tokens list.
>diff -ruN omake.orig/files/patch-src_libmojave-external_unix_lm__notify.ml omake/files/patch-src_libmojave-external_unix_lm__notify.ml
>--- omake.orig/files/patch-src_libmojave-external_unix_lm__notify.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_unix_lm__notify.ml	2016-07-16 20:51:00.141341000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/unix/lm_notify.ml.orig	2007-07-19 21:06:05.000000000 +0000
>+--- src/libmojave-external/unix/lm_notify.ml.orig	2007-07-19 21:06:05 UTC
> +++ src/libmojave-external/unix/lm_notify.ml
> @@ -153,10 +153,8 @@ let is_path_prefix (root1, path1) (root2
>  let is_monitored_name requests name =
>diff -ruN omake.orig/files/patch-src_libmojave-external_util_lm__channel.ml omake/files/patch-src_libmojave-external_util_lm__channel.ml
>--- omake.orig/files/patch-src_libmojave-external_util_lm__channel.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_util_lm__channel.ml	2016-07-16 20:51:00.146189000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/util/lm_channel.ml.orig	2007-07-16 21:10:43.000000000 +0000
>+--- src/libmojave-external/util/lm_channel.ml.orig	2007-07-16 21:10:43 UTC
> +++ src/libmojave-external/util/lm_channel.ml
> @@ -337,12 +337,10 @@ let of_string s =
>     of_string string_sym 1 0 (String.copy s)
>diff -ruN omake.orig/files/patch-src_libmojave-external_util_lm__filename__util.ml omake/files/patch-src_libmojave-external_util_lm__filename__util.ml
>--- omake.orig/files/patch-src_libmojave-external_util_lm__filename__util.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_util_lm__filename__util.ml	2016-07-16 20:51:00.174981000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/util/lm_filename_util.ml.orig	2007-01-29 20:14:42.000000000 +0000
>+--- src/libmojave-external/util/lm_filename_util.ml.orig	2007-01-29 20:14:42 UTC
> +++ src/libmojave-external/util/lm_filename_util.ml
> @@ -48,12 +48,11 @@ let groups =
>  let unix_is_executable s =
>diff -ruN omake.orig/files/patch-src_libmojave-external_util_lm__glob.ml omake/files/patch-src_libmojave-external_util_lm__glob.ml
>--- omake.orig/files/patch-src_libmojave-external_util_lm__glob.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_util_lm__glob.ml	2016-07-16 20:51:00.179736000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/util/lm_glob.ml.orig	2007-09-04 16:12:33.000000000 +0000
>+--- src/libmojave-external/util/lm_glob.ml.orig	2007-09-04 16:12:33 UTC
> +++ src/libmojave-external/util/lm_glob.ml
> @@ -157,11 +157,8 @@ let home_dir =
>  let getusers () =
>diff -ruN omake.orig/files/patch-src_libmojave-external_util_lm__lexer.ml omake/files/patch-src_libmojave-external_util_lm__lexer.ml
>--- omake.orig/files/patch-src_libmojave-external_util_lm__lexer.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_util_lm__lexer.ml	2016-07-16 20:51:00.184327000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/util/lm_lexer.ml.orig	2007-01-25 18:31:18.000000000 +0000
>+--- src/libmojave-external/util/lm_lexer.ml.orig	2007-01-25 18:31:18 UTC
> +++ src/libmojave-external/util/lm_lexer.ml
> @@ -1325,10 +1325,8 @@ struct
>      * Expressions.
>diff -ruN omake.orig/files/patch-src_libmojave-external_util_lm__parser.ml omake/files/patch-src_libmojave-external_util_lm__parser.ml
>--- omake.orig/files/patch-src_libmojave-external_util_lm__parser.ml	2014-03-26 21:53:01.764931000 +0400
>+++ omake/files/patch-src_libmojave-external_util_lm__parser.ml	2016-07-16 20:51:00.189035000 +0400
>@@ -2,7 +2,7 @@
> 
> From upstream SVN.
> 
>---- src/libmojave-external/util/lm_parser.ml.orig	2007-01-25 18:31:18.000000000 +0000
>+--- src/libmojave-external/util/lm_parser.ml.orig	2007-01-25 18:31:18 UTC
> +++ src/libmojave-external/util/lm_parser.ml
> @@ -282,15 +282,11 @@ struct
>        let debug = "ProdItem"

Actions: View | Diff

Attachments on bug 210853: 172154 | 172585