update to omake-0.9.8.5-3 with patch to work with ocaml-3.11

This commit is contained in:
avsm 2009-03-11 21:21:17 +00:00
parent 1f8ea8affe
commit 3dc674f002
7 changed files with 56 additions and 90 deletions

View File

@ -1,13 +1,15 @@
# $OpenBSD: Makefile,v 1.5 2007/09/16 02:53:02 merdely Exp $
# $OpenBSD: Makefile,v 1.6 2009/03/11 21:21:17 avsm Exp $
COMMENT= build system designed for scalability and portability
CATEGORIES= devel
V= 0.9.6.9-1
DISTNAME= omake-0.9.6.9-1
PKGNAME= omake-0.9.6.9pl1p2
WRKDIST= ${WRKDIR}/omake-0.9.6.9
MASTER_SITES= http://omake.metaprl.org/downloads/
V= 0.9.8.5
VEXTRA= 3
DISTNAME= omake-${V}-${VEXTRA}
PKGNAME= omake-${V}pl${VEXTRA}
WRKDIST= ${WRKDIR}/omake-${V}
MASTER_SITES= http://omake.metaprl.org/downloads/ \
http://www.ocaml-programming.de/godi-backup/
MAINTAINER= Anil Madhavapeddy <avsm@openbsd.org>
HOMEPAGE= http://omake.metaprl.org/
@ -22,6 +24,16 @@ MODULES= lang/ocaml
NO_REGRESS= Yes
DESTDIRNAME= INSTALL_ROOT
MAKE_ENV= MAN_ENABLED=Yes
WANTLIB= curses m pthread readline ncurses c
DOC_DIR= ${PREFIX}/share/doc/omake
DOC_FILES= LICENSE LICENSE.OMake doc/txt/omake-doc.txt doc/ps/omake-doc.ps \
doc/ps/omake-doc.pdf CHANGELOG.txt ocamldep/LICENSE.ocamldep-omake \
doc/html
post-install:
${INSTALL_DATA_DIR} ${DOC_DIR}
cd ${WRKSRC} && cp -R ${DOC_FILES} ${DOC_DIR}
.include <bsd.port.mk>

View File

@ -1,5 +1,5 @@
MD5 (omake-0.9.6.9-1.tar.gz) = gaRPz4GSFAsxR//oSYGHQg==
RMD160 (omake-0.9.6.9-1.tar.gz) = MS3iEP7tleKsLHD97hWD9lk0loQ=
SHA1 (omake-0.9.6.9-1.tar.gz) = eEnzxe219C7Phi0iMYYexuPBBdo=
SHA256 (omake-0.9.6.9-1.tar.gz) = +aKWsG1KaEB65Jn5X2AaSnuiygFXsbA4CBg7om4q/CY=
SIZE (omake-0.9.6.9-1.tar.gz) = 2046152
MD5 (omake-0.9.8.5-3.tar.gz) = 0RSzxCAYCKrNc+wamJZcRw==
RMD160 (omake-0.9.8.5-3.tar.gz) = I2TimnzJvWqvg3gYu+CmTvSvzhQ=
SHA1 (omake-0.9.8.5-3.tar.gz) = 54ydiFh0n14jTLowNjeYDiQIXLw=
SHA256 (omake-0.9.8.5-3.tar.gz) = W2deCfSf+CSad1eY8lqxJ1Fc8v7TlSeyAnhHV6Ne3a0=
SIZE (omake-0.9.8.5-3.tar.gz) = 3321245

View File

@ -1,11 +0,0 @@
$OpenBSD: patch-src_clib_fam_kqueue_c,v 1.1.1.1 2006/06/01 02:16:59 avsm Exp $
--- src/clib/fam_kqueue.c.orig Wed May 31 08:42:59 2006
+++ src/clib/fam_kqueue.c Wed May 31 08:43:10 2006
@@ -44,6 +44,7 @@
#include <unistd.h>
#include <stdlib.h>
#include <stdio.h>
+#include <stdint.h>
#include <fcntl.h>
#include <errno.h>

View File

@ -0,0 +1,12 @@
$OpenBSD: patch-src_exec_omake_exec_ml,v 1.1 2009/03/11 21:21:17 avsm Exp $
--- src/exec/omake_exec.ml.orig Thu Nov 27 14:20:45 2008
+++ src/exec/omake_exec.ml Thu Nov 27 14:20:50 2008
@@ -46,8 +46,6 @@ open Omake_exec_notify
open Omake_options
open Omake_command_type
-external sync : unit -> unit = "caml_sync"
-
module Exec =
struct
(*

View File

@ -1,36 +0,0 @@
$OpenBSD: patch-src_libmojave-external_cutil_lm_heap_c,v 1.1.1.1 2006/06/01 02:16:59 avsm Exp $
--- src/libmojave-external/cutil/lm_heap.c.orig Mon Apr 3 23:31:06 2006
+++ src/libmojave-external/cutil/lm_heap.c Wed May 31 09:14:55 2006
@@ -82,7 +82,7 @@ static void lm_heap_check_aux1(char *nam
start = caml_young_start;
ptr = caml_young_ptr;
end = caml_young_end;
-
+#if 0
fprintf(stderr, "AAA: %s: [0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx] (%d/%d/%d bytes)\n",
name,
(unsigned long) caml_young_start,
@@ -93,6 +93,7 @@ static void lm_heap_check_aux1(char *nam
caml_young_end - caml_young_limit,
caml_young_end - caml_young_start);
fflush(stderr);
+#endif
/*
* Phase 1: check that the headers have the right sizes.
@@ -167,6 +168,7 @@ static void lm_heap_check_aux2(char *nam
ptr = caml_young_ptr;
end = caml_young_end;
+#if 0
fprintf(stderr, "AAA: %s: [0x%08lx, 0x%08lx, 0x%08lx, 0x%08lx] (%d/%d/%d bytes)\n",
name,
(unsigned long) caml_young_start,
@@ -177,6 +179,7 @@ static void lm_heap_check_aux2(char *nam
caml_young_end - caml_young_limit,
caml_young_end - caml_young_start);
fflush(stderr);
+#endif
/*
* Phase 1: check that the headers have the right sizes.

View File

@ -1,17 +0,0 @@
$OpenBSD: patch-src_libmojave-external_stdlib_lm_filename_util_ml,v 1.1.1.1 2006/06/01 02:16:59 avsm Exp $
--- src/libmojave-external/stdlib/lm_filename_util.ml.orig Wed May 31 09:12:59 2006
+++ src/libmojave-external/stdlib/lm_filename_util.ml Wed May 31 09:13:27 2006
@@ -492,9 +492,10 @@ let mkdirhier dir mode =
head :: path ->
let dir = Filename.concat dir head in
let () =
- try Unix.mkdir dir mode with
- Unix.Unix_error (Unix.EEXIST, _, _) ->
- ()
+ if not (Sys.file_exists dir) then
+ try Unix.mkdir dir mode with
+ Unix.Unix_error (Unix.EEXIST, _, _) ->
+ ()
in
mkdir dir path
| [] ->

View File

@ -1,6 +1,7 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2006/06/01 02:16:59 avsm Exp $
bin/cvs_realclean
bin/omake
@comment $OpenBSD: PLIST,v 1.2 2009/03/11 21:21:18 avsm Exp $
@bin bin/cvs_realclean
bin/ocamldep-omake
@bin bin/omake
bin/osh
lib/omake/
lib/omake/OMakefile.default
@ -12,24 +13,29 @@ lib/omake/build/C.om
lib/omake/build/Common.om
lib/omake/build/LaTeX.om
lib/omake/build/OCaml.om
lib/omake/build/svn_realclean.om
lib/omake/configure/
lib/omake/configure/Configure.om
lib/omake/configure/X.om
lib/omake/configure/fam.om
lib/omake/configure/fs_case_sensitive.om
lib/omake/configure/ncurses.om
lib/omake/configure/readline.om
lib/omake/configure/snprintf.om
lib/omake/parse/
lib/omake/parse/C/
lib/omake/parse/C/Lex.om
lib/omake/parse/C/Parse.om
@man man/man1/omake-base.1
@man man/man1/omake-doc.1
@man man/man1/omake-language.1
@man man/man1/omake-options.1
@man man/man1/omake-pervasives.1
@man man/man1/omake-quickstart.1
@man man/man1/omake-root.1
@man man/man1/omake-rules.1
@man man/man1/omake-shell.1
@man man/man1/omake-system.1
@man man/man1/omake.1
@man man/man1/osh.1
share/doc/omake/
share/doc/omake/CHANGELOG.txt
share/doc/omake/LICENSE
share/doc/omake/LICENSE.OMake
share/doc/omake/LICENSE.ocamldep-omake
share/doc/omake/html/
share/doc/omake/html/announce.txt
share/doc/omake/html/changelog.html
share/doc/omake/html/contents_motif.gif
share/doc/omake/html/download.html
share/doc/omake/omake-doc.pdf
share/doc/omake/omake-doc.ps
share/doc/omake/omake-doc.txt