Hi,

here's a diff to install the ocamlbuild manpage and backporting a fix
from upstream (can't remember which of my ports broke because of this bug).

OK?

Christopher

Index: Makefile
===================================================================
RCS file: /cvs/ports/lang/ocaml/Makefile,v
retrieving revision 1.66
diff -u -p -r1.66 Makefile
--- Makefile    4 Sep 2014 15:56:26 -0000       1.66
+++ Makefile    22 Sep 2014 12:14:39 -0000
@@ -11,7 +11,7 @@ COMMENT-graphics = OCaml Graphics librar
 # Do check that the ports that depend on it still work, or repair them. 
 # Don't forget to bump version in ocaml.port.mk, too!
 VERSION=4.02.0
-REVISION=0
+REVISION=1
 
 PKGNAME-main =         ocaml-${VERSION}
 PKGNAME-graphics =     ocaml-graphics-${VERSION}
@@ -72,6 +72,9 @@ post-install:
                ${PREFIX}/share/doc/ocaml/html
        @${INSTALL_DATA} ${WRKDIR}/htmlman/libref/* \
                ${PREFIX}/share/doc/ocaml/html/libref
+       ${INSTALL_DATA} \
+               ${WRKSRC}/ocamlbuild/man/ocamlbuild.1 \
+               ${PREFIX}/man/man1/
        @${INSTALL_DATA} \
                ${WRKSRC}/{LICENSE,Changes} \
                ${PREFIX}/share/doc/ocaml
Index: patches/patch-otherlibs_threads_Makefile
===================================================================
RCS file: patches/patch-otherlibs_threads_Makefile
diff -N patches/patch-otherlibs_threads_Makefile
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ patches/patch-otherlibs_threads_Makefile    22 Sep 2014 12:14:39 -0000
@@ -0,0 +1,43 @@
+$OpenBSD$
+
+PR#6544: Bytes and CamlinternalFormat missing from threads stdlib.cma
+
+--- otherlibs/threads/Makefile.orig    Tue May 27 08:10:47 2014
++++ otherlibs/threads/Makefile Mon Sep 22 14:04:13 2014
+@@ -27,21 +27,21 @@ CAML_OBJS=thread.cmo mutex.cmo condition.cmo event.cmo
+ 
+ LIB=../../stdlib
+ 
+-LIB_OBJS=$(LIB)/camlinternalFormatBasics.cmo pervasives.cmo \
+-  $(LIB)/array.cmo $(LIB)/list.cmo $(LIB)/char.cmo $(LIB)/string.cmo        \
+-  $(LIB)/sys.cmo $(LIB)/sort.cmo marshal.cmo $(LIB)/obj.cmo                 \
+-  $(LIB)/int32.cmo $(LIB)/int64.cmo $(LIB)/nativeint.cmo                    \
+-  $(LIB)/lexing.cmo $(LIB)/parsing.cmo $(LIB)/set.cmo $(LIB)/map.cmo        \
+-  $(LIB)/stack.cmo $(LIB)/queue.cmo $(LIB)/camlinternalLazy.cmo             \
+-  $(LIB)/lazy.cmo $(LIB)/stream.cmo $(LIB)/buffer.cmo                       \
+-  $(LIB)/printf.cmo $(LIB)/arg.cmo $(LIB)/printexc.cmo $(LIB)/gc.cmo        \
+-  $(LIB)/digest.cmo $(LIB)/random.cmo $(LIB)/hashtbl.cmo                    \
+-  $(LIB)/format.cmo $(LIB)/scanf.cmo $(LIB)/callback.cmo \
+-  $(LIB)/camlinternalOO.cmo              \
+-  $(LIB)/oo.cmo $(LIB)/camlinternalMod.cmo $(LIB)/genlex.cmo                \
+-  $(LIB)/weak.cmo $(LIB)/filename.cmo                   \
+-  $(LIB)/complex.cmo $(LIB)/arrayLabels.cmo $(LIB)/listLabels.cmo           \
+-  $(LIB)/stringLabels.cmo $(LIB)/stdLabels.cmo $(LIB)/moreLabels.cmo
++LIB_OBJS=$(LIB)/camlinternalFormatBasics.cmo pervasives.cmo           \
++  $(LIB)/array.cmo $(LIB)/list.cmo $(LIB)/char.cmo $(LIB)/bytes.cmo   \
++  $(LIB)/string.cmo $(LIB)/sys.cmo $(LIB)/sort.cmo $(LIB)/marshal.cmo \
++  $(LIB)/obj.cmo $(LIB)/int32.cmo $(LIB)/int64.cmo                    \
++  $(LIB)/nativeint.cmo $(LIB)/lexing.cmo $(LIB)/parsing.cmo           \
++  $(LIB)/set.cmo $(LIB)/map.cmo $(LIB)/stack.cmo $(LIB)/queue.cmo     \
++  $(LIB)/camlinternalLazy.cmo $(LIB)/lazy.cmo $(LIB)/stream.cmo               
\
++  $(LIB)/buffer.cmo $(LIB)/camlinternalFormat.cmo $(LIB)/printf.cmo   \
++  $(LIB)/arg.cmo $(LIB)/printexc.cmo $(LIB)/gc.cmo $(LIB)/digest.cmo  \
++  $(LIB)/random.cmo $(LIB)/hashtbl.cmo $(LIB)/format.cmo              \
++  $(LIB)/scanf.cmo $(LIB)/callback.cmo $(LIB)/camlinternalOO.cmo      \
++  $(LIB)/oo.cmo $(LIB)/camlinternalMod.cmo $(LIB)/genlex.cmo          \
++  $(LIB)/weak.cmo $(LIB)/filename.cmo $(LIB)/complex.cmo              \
++  $(LIB)/arrayLabels.cmo $(LIB)/listLabels.cmo $(LIB)/bytesLabels.cmo \
++  $(LIB)/stringLabels.cmo $(LIB)/moreLabels.cmo $(LIB)/stdLabels.cmo
+ 
+ UNIXLIB=../unix
+ 
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/lang/ocaml/pkg/PLIST-main,v
retrieving revision 1.3
diff -u -p -r1.3 PLIST-main
--- pkg/PLIST-main      3 Sep 2014 17:48:19 -0000       1.3
+++ pkg/PLIST-main      22 Sep 2014 12:14:39 -0000
@@ -411,6 +411,7 @@ lib/ocaml/weak.cmi
 lib/ocaml/weak.ml
 lib/ocaml/weak.mli
 @man man/man1/ocaml.1
+@man man/man1/ocamlbuild.1
 @man man/man1/ocamlc.1
 @man man/man1/ocamlc.opt.1
 @man man/man1/ocamlcp.1



-- 
http://gmerlin.de
OpenPGP: http://gmerlin.de/christopher.pub
F190 D013 8F01 AA53 E080  3F3C F17F B0A1 D44E 4FEE

Attachment: signature.asc
Description: PGP signature

Reply via email to