pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/devel/omake Update to 0.10.3 to fix build with current...
details: https://anonhg.NetBSD.org/pkgsrc/rev/6ebd93c3945a
branches: trunk
changeset: 375475:6ebd93c3945a
user: dholland <dholland%pkgsrc.org@localhost>
date: Mon Feb 12 11:03:34 2018 +0000
description:
Update to 0.10.3 to fix build with current OCaml.
New HOMEPAGE, MASTER_SITES.
The only upstream change log I can find is empty, but as this update
represents several years of maintenance that is probably inaccurate.
Almost all the pkgsrc patches were from upstream and are thus now
rolled in.
diffstat:
devel/omake/Makefile | 22 +-
devel/omake/PLIST | 5 +-
devel/omake/distinfo | 38 +-
devel/omake/patches/patch-aa | 15 -
devel/omake/patches/patch-ab | 26 -
devel/omake/patches/patch-ac | 25 -
devel/omake/patches/patch-ad | 17 -
devel/omake/patches/patch-ae | 177 ----
devel/omake/patches/patch-af | 127 ---
devel/omake/patches/patch-ag | 45 -
devel/omake/patches/patch-ah | 15 -
devel/omake/patches/patch-ai | 24 -
devel/omake/patches/patch-aj | 15 -
devel/omake/patches/patch-ak | 90 --
devel/omake/patches/patch-al | 96 --
devel/omake/patches/patch-am | 18 -
devel/omake/patches/patch-an | 33 -
devel/omake/patches/patch-ao | 35 -
devel/omake/patches/patch-ap | 117 ---
devel/omake/patches/patch-aq | 58 -
devel/omake/patches/patch-ar | 125 ---
devel/omake/patches/patch-as | 127 ---
devel/omake/patches/patch-at | 364 ---------
devel/omake/patches/patch-au | 24 -
devel/omake/patches/patch-av | 20 -
devel/omake/patches/patch-aw | 343 ---------
devel/omake/patches/patch-ax | 366 ----------
devel/omake/patches/patch-lib_build_OCaml.om | 29 +-
devel/omake/patches/patch-src_clib_fam__pseudo.h | 17 +
devel/omake/patches/patch-src_libmojave-external_cutil_fam__pseudo.h | 15 -
30 files changed, 50 insertions(+), 2378 deletions(-)
diffs (truncated from 2577 to 300 lines):
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/Makefile
--- a/devel/omake/Makefile Mon Feb 12 08:37:43 2018 +0000
+++ b/devel/omake/Makefile Mon Feb 12 11:03:34 2018 +0000
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.18 2018/02/04 08:06:22 dholland Exp $
+# $NetBSD: Makefile,v 1.19 2018/02/12 11:03:34 dholland Exp $
#
-DISTNAME= omake-${VERSION}-0.rc1
-PKGNAME= omake-${VERSION}.0rc1
-PKGREVISION= 13
+DISTNAME= omake-0.10.3
CATEGORIES= devel
-MASTER_SITES= http://omake.metaprl.org/downloads/
+MASTER_SITES= ${MASTER_SITE_GITHUB:=ocaml-omake/}
+GITHUB_TAG= ${PKGNAME}
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE= http://omake.metaprl.org/index.html
+HOMEPAGE= http://projects.camlcity.org/projects/omake.html
COMMENT= Build system designed for scalability and portability
LICENSE= gnu-gpl-v2 AND mit AND gnu-lgpl-v2.1
-BROKEN= Does not build with ocaml 4.06.
-
+HAS_CONFIGURE= yes
MAKE_JOBS_SAFE= no
-WRKSRC= ${WRKDIR}/omake-${VERSION}
+WRKSRC= ${WRKDIR}/omake-${DISTNAME}
-MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
-
-VERSION= 0.9.8.6
+CONFIGURE_ARGS+= -prefix=${PREFIX}
+BUILD_TARGET= force-bootstrap
+MAKE_ENV+= INSTALL_ROOT=${DESTDIR}
.include "../../lang/ocaml/buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/PLIST
--- a/devel/omake/PLIST Mon Feb 12 08:37:43 2018 +0000
+++ b/devel/omake/PLIST Mon Feb 12 11:03:34 2018 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/17 09:40:14 wiz Exp $
-bin/cvs_realclean
+@comment $NetBSD: PLIST,v 1.3 2018/02/12 11:03:34 dholland Exp $
bin/omake
bin/osh
lib/omake/OMakefile.default
@@ -15,7 +14,9 @@
lib/omake/configure/X.om
lib/omake/configure/fam.om
lib/omake/configure/fs_case_sensitive.om
+lib/omake/configure/moncontrol.om
lib/omake/configure/ncurses.om
+lib/omake/configure/posix_spawn.om
lib/omake/configure/readline.om
lib/omake/configure/snprintf.om
lib/omake/parse/C/Lex.om
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/distinfo
--- a/devel/omake/distinfo Mon Feb 12 08:37:43 2018 +0000
+++ b/devel/omake/distinfo Mon Feb 12 11:03:34 2018 +0000
@@ -1,32 +1,8 @@
-$NetBSD: distinfo,v 1.5 2015/11/03 03:27:53 agc Exp $
+$NetBSD: distinfo,v 1.6 2018/02/12 11:03:34 dholland Exp $
-SHA1 (omake-0.9.8.6-0.rc1.tar.gz) = f714fa992bf391b8bac49a488bc654128962d1cc
-RMD160 (omake-0.9.8.6-0.rc1.tar.gz) = b7ceebea6f4c40460625e2e9528257e200676bca
-SHA512 (omake-0.9.8.6-0.rc1.tar.gz) = 10a7ef6746c656d25852d408fafdd67a95acc59b73c892f0dbc316f2a01949b5349d5203c9fe2400cc7c05e14a7b1bc075603bd462ab74b60427d944f8e177d0
-Size (omake-0.9.8.6-0.rc1.tar.gz) = 3254283 bytes
-SHA1 (patch-aa) = 1cc195874da3db9f909993818b347211c9f3ff77
-SHA1 (patch-ab) = 449aae3ff362efbc50f188cba8a76a13334eb964
-SHA1 (patch-ac) = 21f4d1b8d822cebbd19ab2226193f137d66dfd7e
-SHA1 (patch-ad) = d522e9cd5fbbf74c876314afecbfecc85434210c
-SHA1 (patch-ae) = 2b0a400b4da3e557d6a14eab9fa76913059c084a
-SHA1 (patch-af) = 24731dd649379f22de0fd34d46d68e7acf6c8a61
-SHA1 (patch-ag) = e7c9e2e0826dc2ca69df4830f449a4d0946fd278
-SHA1 (patch-ah) = 35ffade097aa37b37be1e73b3f1521d57b9d1880
-SHA1 (patch-ai) = ea06c43ea427508f6eef0e0ade9b569977bd7ac1
-SHA1 (patch-aj) = 9c33be37c2dff423890b132984414c1fd1da457f
-SHA1 (patch-ak) = 20af5574290a4ee1dd98bcaff63ed7d93945029e
-SHA1 (patch-al) = 86b3e0bb348ad6d5813df20bad5ec8e0c77e372b
-SHA1 (patch-am) = 15f572056b66dc565cba65da04899909be784bf8
-SHA1 (patch-an) = 493e5e9bb25371b066aafe8aac70defee13370b7
-SHA1 (patch-ao) = 5f70ae344d3d0d822ed5a6ed21c75c33b2b10d0d
-SHA1 (patch-ap) = 93db626ca9bee439d513014c9aa23212d3e42a70
-SHA1 (patch-aq) = 9531c72e6d6c417b10059dabbf37b8e3a1324b02
-SHA1 (patch-ar) = 936c185d4a290ae2acb0b6f6788cef9996d2e197
-SHA1 (patch-as) = fa7a7720867a5e5b53df8c3d80f35d0aa27b5b80
-SHA1 (patch-at) = cb81d50d1a85dac9cb0fa81046b8a7b255387a4c
-SHA1 (patch-au) = efb7a298c259e645d2031fee5b016a47389621dd
-SHA1 (patch-av) = 10edbea63bca8788f922c9debb2ebc50655760a5
-SHA1 (patch-aw) = 4999a863230373cca75a6e5cbc4203430823468d
-SHA1 (patch-ax) = 0a91c5d1a561b319885e848def2a3c54d52751d7
-SHA1 (patch-lib_build_OCaml.om) = 19cf48d1480086db866e7f5d095ace4edf3db8c9
-SHA1 (patch-src_libmojave-external_cutil_fam__pseudo.h) = cffac5428d8ff93db0773e5604176df974321b2e
+SHA1 (omake-0.10.3.tar.gz) = 5a48e4cade84b2e7224c18cf22115e7168caaebd
+RMD160 (omake-0.10.3.tar.gz) = f1281155c9b88817a9ac5a1abcb95dd96ff847fe
+SHA512 (omake-0.10.3.tar.gz) = 8fc042cccd9d3b03fc16e29ac19368e078d0f8c14ed60862fe787248c5a4f88995ffd43ab0a9b416ec7f4b7762ab57c293ef3ea0b9dcbbd21c1c767ab41c2cc3
+Size (omake-0.10.3.tar.gz) = 1491587 bytes
+SHA1 (patch-lib_build_OCaml.om) = 59e5e40e745be24556f9f545d51a2403118a5847
+SHA1 (patch-src_clib_fam__pseudo.h) = 2e09ebe793d16c6877a4810559a54dd56e1e676b
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/patches/patch-aa
--- a/devel/omake/patches/patch-aa Mon Feb 12 08:37:43 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,15 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- OMakefile.orig 2010-10-27 00:42:37.000000000 +0000
-+++ OMakefile
-@@ -57,7 +57,7 @@ if $(not $(defined CAMLLIB))
- #
- # OCaml options
- #
--OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z)
-+OCAMLFLAGS[] += -w Ae$(if $(OCAML_ACCEPTS_Z_WARNING), z-9-29)
- if $(THREADS_ENABLED)
- OCAMLFLAGS += -thread
- export
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/patches/patch-ab
--- a/devel/omake/patches/patch-ab Mon Feb 12 08:37:43 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2010/05/29 10:43:14 obache Exp $
-
---- src/libmojave-external/cutil/fam_kqueue.c.orig 2010-05-28 09:23:46.000000000 +0000
-+++ src/libmojave-external/cutil/fam_kqueue.c
-@@ -181,6 +181,12 @@ static kevent_t *new_kevent() {
- return ev;
- }
-
-+#if defined(__NetBSD__)
-+typedef intptr_t kqueue_udata_t;
-+#else
-+typedef void *kqueue_udata_t;
-+#endif
-+
- /*
- * Start monitoring a directory.
- * We store the DirInfo pointer as the userdata in the kevent.
-@@ -199,7 +205,7 @@ static int monitor_start(FAMConnection *
- dir->kevent = kev;
- /* Register interest in the MON_FLAGS flags of the dir */
- EV_SET(kev, dir->handle, EVFILT_VNODE, EV_ADD | EV_CLEAR, MON_FLAGS,
-- (intptr_t) NULL, (void *)dir);
-+ (intptr_t) NULL, (kqueue_udata_t) dir);
- code = kevent(fc->id, kev, 1, NULL, 0, &gTime0);
- #ifdef FAM_DEBUG
- fprintf(stderr,
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/patches/patch-ac
--- a/devel/omake/patches/patch-ac Mon Feb 12 08:37:43 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,25 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/build/omake_rule.ml.orig 2010-10-07 19:59:08.000000000 +0000
-+++ src/build/omake_rule.ml
-@@ -768,7 +768,7 @@ let lazy_command venv pos command =
- let fv = free_vars_exp_list el in
- CommandSection (eval_string_exp venv pos s, fv, el)
- | ShellExp (loc, s) ->
-- CommandValue (loc, ValStringExp (venv_get_env venv, s))
-+ CommandValue (loc, venv_get_env venv, s)
- | _ ->
- let fv = free_vars_exp command in
- CommandSection (ValData "eval", fv, [command])
-@@ -1121,7 +1121,8 @@ and eval_rule venv loc target sources sl
- let commands = ([], CommandEval e) :: commands in
- let fv = free_vars_union fv fv' in
- commands, fv
-- | CommandValue (loc, v) ->
-+ | CommandValue (loc, env, s) ->
-+ let v = ValStringExp (env, s) in
- let commands =
- try
- let flags, pipe = pipe_of_value venv find_alias options pos loc v in
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/patches/patch-ad
--- a/devel/omake/patches/patch-ad Mon Feb 12 08:37:43 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-$NetBSD: patch-ad,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/builtin/omake_builtin_target.ml.orig 2008-01-15 19:57:00.000000000 +0000
-+++ src/builtin/omake_builtin_target.ml
-@@ -221,8 +221,8 @@ let split_command venv (values1, lines1)
- match line with
- CommandSection (_, _, e) ->
- ValBody (e, ExportNone)
-- | CommandValue (_, v) ->
-- v
-+ | CommandValue (_, exp, v) ->
-+ ValStringExp(exp,v)
- in
- v :: lines) lines1 lines2
- in
diff -r 7957665d74f2 -r 6ebd93c3945a devel/omake/patches/patch-ae
--- a/devel/omake/patches/patch-ae Mon Feb 12 08:37:43 2018 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,177 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2010/12/17 09:40:14 wiz Exp $
-
-From upstream SVN.
-
---- src/clib/omake_shell_sys.c.orig 2007-12-01 21:32:13.000000000 +0000
-+++ src/clib/omake_shell_sys.c
-@@ -551,7 +551,7 @@ value omake_shell_sys_suspend(value v_pg
- fflush(stderr);
- #endif
- if(process_group_map(suspend_process, Int_val(v_pgrp)) < 0)
-- failwith("omake_shell_sys_suspend");
-+ caml_failwith("omake_shell_sys_suspend");
- CAMLreturn(Val_unit);
- }
-
-@@ -563,7 +563,7 @@ value omake_shell_sys_resume(value v_pgr
- fflush(stderr);
- #endif
- if(process_group_map(resume_process, Int_val(v_pgrp)) < 0)
-- failwith("omake_shell_sys_resume");
-+ caml_failwith("omake_shell_sys_resume");
- CAMLreturn(Val_unit);
- }
-
-@@ -575,7 +575,7 @@ value omake_shell_sys_kill(value v_pgrp)
- fflush(stderr);
- #endif
- if(process_group_map(kill_process, Int_val(v_pgrp)) < 0)
-- failwith("omake_shell_sys_kill");
-+ caml_failwith("omake_shell_sys_kill");
- CAMLreturn(Val_unit);
- }
-
-@@ -600,14 +600,14 @@ value omake_shell_sys_create_thread_pid(
- /* Allocate the process data */
- processp = (Process *) malloc(sizeof(Process));
- if(processp == 0)
-- failwith("omake_shell_sys_create_thread_pid: out of memory");
-+ caml_failwith("omake_shell_sys_create_thread_pid: out of memory");
- memset(processp, 0, sizeof(Process));
-
- /* Create an event for waiting on the thread */
- event = CreateEvent(NULL, FALSE, FALSE, NULL);
- if(event == NULL) {
- free(processp);
-- failwith("omake_shell_sys_create_thread_pid: can't create event");
-+ caml_failwith("omake_shell_sys_create_thread_pid: can't create event");
- }
-
- pgrp = Int_val(v_pgrp);
-@@ -645,7 +645,7 @@ value omake_shell_sys_init_thread_pid(va
- break;
- }
- if(processp == 0)
-- raise_not_found();
-+ caml_raise_not_found();
-
- /* Process has terminated */
- processp->thread = GetCurrentThreadId();
-@@ -679,7 +679,7 @@ value omake_shell_sys_release_thread_pid
- break;
- }
- if(processp == 0)
-- raise_not_found();
-+ caml_raise_not_found();
-
- /* Process has terminated */
- processp->changed = 1;
-@@ -771,7 +771,7 @@ value omake_shell_sys_wait(value v_pgrp,
- goto done;
- else {
- if(ncount == MAXIMUM_WAIT_OBJECTS)
-- invalid_argument("omake_shell_sys_wait: too many processes");
-+ caml_invalid_argument("omake_shell_sys_wait: too many processes");
- processes[ncount] = processp->pid;
- handles[ncount] = processp->handle;
- ncount++;
-@@ -787,11 +787,11 @@ value omake_shell_sys_wait(value v_pgrp,
- /* Wait for an event */
- while(1) {
- /* Perform the wait */
-- enter_blocking_section();
-+ caml_enter_blocking_section();
- index = WaitForMultipleObjects(ncount, handles, FALSE, timeout);
- if(index == WAIT_FAILED)
- code = GetLastError();
-- leave_blocking_section();
-+ caml_leave_blocking_section();
-
- /* See if something has changed */
- if(index == WAIT_OBJECT_0) {
-@@ -810,7 +810,7 @@ value omake_shell_sys_wait(value v_pgrp,
- else if(index >= WAIT_ABANDONED_0 + 1 && index < WAIT_ABANDONED_0 + ncount)
- index -= WAIT_ABANDONED_0;
Home |
Main Index |
Thread Index |
Old Index