Avoid using the "3o" man page section, since plist-man.awk can't handle it.

Instead treat ocaml like we do with lang/perl5 and install the man pages in
the "3" section in /usr/pkg/lib/ocaml/man/man3.

6 files changed, 179 insertions, 151 deletions

diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 8c73886161e..c876ef2961d 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.94 2015/03/11 22:37:18 tnn Exp $
+# $NetBSD: Makefile,v 1.95 2015/04/02 22:40:09 tnn Exp $
 
 .include "Makefile.common"
+PKGREVISION=		1
 
 #CONFIGURE_ARGS+=	-no-tk
 CONFIGURE_ARGS+=	-cc ${CC}
@@ -84,6 +85,14 @@ SUBST_STAGE.extra-rt-libs=	pre-configure
 do-test:
 	cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
 
+post-install:
+	${INSTALL_MAN_DIR} ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1
+	set -e ; cd ${DESTDIR}${PREFIX}/lib/ocaml/${PKGMANDIR}/man1;	\
+	for m in *; do							\
+	  ln -s ${PREFIX}/lib/ocaml/${PKGMANDIR}/man1/$$m		\
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/$$m;		\
+	done
+
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../mk/termcap.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common
index 08964fb7426..809e7ea2f17 100644
--- a/lang/ocaml/Makefile.common
+++ b/lang/ocaml/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2015/01/20 14:12:25 jaapb Exp $
+# $NetBSD: Makefile.common,v 1.41 2015/04/02 22:40:09 tnn Exp $
 
 # used by x11/labltk/Makefile
 # used by x11/ocaml-graphics/Makefile
@@ -20,11 +20,9 @@ CONFIGURE_ARGS+=	-prefix ${PREFIX}
 CONFIGURE_ARGS+=	-libs ${LDFLAGS:Q}
 CONFIGURE_ARGS+=	-with-pthread
 CONFIGURE_ARGS+=	-host ${MACHINE_GNU_PLATFORM:Q}
-CONFIGURE_ARGS+=	-mandir ${PREFIX}/${PKGMANDIR}
+CONFIGURE_ARGS+=	-mandir ${PREFIX}/lib/ocaml/${PKGMANDIR}
 CPPFLAGS+=		-DDB_DBM_HSEARCH
 
-INSTALL_MAKE_FLAGS+=	PREFIX=${PREFIX} \
-			MANDIR=${PREFIX}/${PKGMANDIR}
 DISTINFO_FILE= ${.CURDIR}/../../lang/ocaml/distinfo
 PATCHDIR= ${.CURDIR}/../../lang/ocaml/patches
 
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index bf9f17d490d..073c436d336 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.28 2015/01/20 14:12:25 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.29 2015/04/02 22:40:09 tnn Exp $
 bin/ocaml
 bin/ocamlbuild
 bin/ocamlbuild.byte
@@ -277,6 +277,151 @@ lib/ocaml/list.mli
 lib/ocaml/listLabels.cmi
 lib/ocaml/listLabels.ml
 lib/ocaml/listLabels.mli
+lib/ocaml/${PKGMANDIR}/man1/ocaml.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlc.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlc.opt.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlcp.1
+lib/ocaml/${PKGMANDIR}/man1/ocamldebug.1
+lib/ocaml/${PKGMANDIR}/man1/ocamldep.1
+lib/ocaml/${PKGMANDIR}/man1/ocamldoc.1
+lib/ocaml/${PKGMANDIR}/man1/ocamllex.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlmktop.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlopt.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlopt.opt.1
+lib/ocaml/${PKGMANDIR}/man1/ocamloptp.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlprof.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlrun.1
+lib/ocaml/${PKGMANDIR}/man1/ocamlyacc.1
+lib/ocaml/${PKGMANDIR}/man3/Arg.3
+lib/ocaml/${PKGMANDIR}/man3/Array.3
+lib/ocaml/${PKGMANDIR}/man3/ArrayLabels.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cf.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Ci.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cl.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Csig.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cstr.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Ctf.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Cty.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Exp.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Incl.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mb.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Md.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mod.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mtd.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Mty.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Opn.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Pat.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Sig.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Str.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Te.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Typ.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Type.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Val.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_helper.Vb.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_mapper.3
+lib/ocaml/${PKGMANDIR}/man3/Asttypes.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array1.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array2.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array3.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.Genarray.3
+lib/ocaml/${PKGMANDIR}/man3/Buffer.3
+lib/ocaml/${PKGMANDIR}/man3/Bytes.3
+lib/ocaml/${PKGMANDIR}/man3/BytesLabels.3
+lib/ocaml/${PKGMANDIR}/man3/Callback.3
+lib/ocaml/${PKGMANDIR}/man3/CamlinternalFormat.3
+lib/ocaml/${PKGMANDIR}/man3/CamlinternalFormatBasics.3
+lib/ocaml/${PKGMANDIR}/man3/CamlinternalLazy.3
+lib/ocaml/${PKGMANDIR}/man3/CamlinternalMod.3
+lib/ocaml/${PKGMANDIR}/man3/CamlinternalOO.3
+lib/ocaml/${PKGMANDIR}/man3/Char.3
+lib/ocaml/${PKGMANDIR}/man3/Complex.3
+lib/ocaml/${PKGMANDIR}/man3/Digest.3
+lib/ocaml/${PKGMANDIR}/man3/Filename.3
+lib/ocaml/${PKGMANDIR}/man3/Format.3
+lib/ocaml/${PKGMANDIR}/man3/Gc.3
+lib/ocaml/${PKGMANDIR}/man3/Genlex.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.HashedType.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.MakeSeeded.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.S.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.SeededHashedType.3
+lib/ocaml/${PKGMANDIR}/man3/Hashtbl.SeededS.3
+lib/ocaml/${PKGMANDIR}/man3/Int32.3
+lib/ocaml/${PKGMANDIR}/man3/Int64.3
+lib/ocaml/${PKGMANDIR}/man3/Lazy.3
+lib/ocaml/${PKGMANDIR}/man3/Lexer.3
+lib/ocaml/${PKGMANDIR}/man3/Lexing.3
+lib/ocaml/${PKGMANDIR}/man3/List.3
+lib/ocaml/${PKGMANDIR}/man3/ListLabels.3
+lib/ocaml/${PKGMANDIR}/man3/Location.3
+lib/ocaml/${PKGMANDIR}/man3/Longident.3
+lib/ocaml/${PKGMANDIR}/man3/Map.3
+lib/ocaml/${PKGMANDIR}/man3/Map.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Map.OrderedType.3
+lib/ocaml/${PKGMANDIR}/man3/Map.S.3
+lib/ocaml/${PKGMANDIR}/man3/Marshal.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.HashedType.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.Make.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.MakeSeeded.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.S.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.SeededHashedType.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Hashtbl.SeededS.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.Make.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.OrderedType.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Map.S.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.Make.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.OrderedType.3
+lib/ocaml/${PKGMANDIR}/man3/MoreLabels.Set.S.3
+lib/ocaml/${PKGMANDIR}/man3/Nativeint.3
+lib/ocaml/${PKGMANDIR}/man3/Num.3
+lib/ocaml/${PKGMANDIR}/man3/Obj.3
+lib/ocaml/${PKGMANDIR}/man3/Oo.3
+lib/ocaml/${PKGMANDIR}/man3/Parse.3
+lib/ocaml/${PKGMANDIR}/man3/Parser.3
+lib/ocaml/${PKGMANDIR}/man3/Parsetree.3
+lib/ocaml/${PKGMANDIR}/man3/Parsing.3
+lib/ocaml/${PKGMANDIR}/man3/Pervasives.3
+lib/ocaml/${PKGMANDIR}/man3/Pervasives.LargeFile.3
+lib/ocaml/${PKGMANDIR}/man3/Pprintast.3
+lib/ocaml/${PKGMANDIR}/man3/Pprintast.printer.3
+lib/ocaml/${PKGMANDIR}/man3/Printast.3
+lib/ocaml/${PKGMANDIR}/man3/Printexc.3
+lib/ocaml/${PKGMANDIR}/man3/Printexc.Slot.3
+lib/ocaml/${PKGMANDIR}/man3/Printf.3
+lib/ocaml/${PKGMANDIR}/man3/Queue.3
+lib/ocaml/${PKGMANDIR}/man3/Random.3
+lib/ocaml/${PKGMANDIR}/man3/Random.State.3
+lib/ocaml/${PKGMANDIR}/man3/Scanf.3
+lib/ocaml/${PKGMANDIR}/man3/Scanf.Scanning.3
+lib/ocaml/${PKGMANDIR}/man3/Set.3
+lib/ocaml/${PKGMANDIR}/man3/Set.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Set.OrderedType.3
+lib/ocaml/${PKGMANDIR}/man3/Set.S.3
+lib/ocaml/${PKGMANDIR}/man3/Sort.3
+lib/ocaml/${PKGMANDIR}/man3/Stack.3
+lib/ocaml/${PKGMANDIR}/man3/StdLabels.3
+lib/ocaml/${PKGMANDIR}/man3/StdLabels.Array.3
+lib/ocaml/${PKGMANDIR}/man3/StdLabels.Bytes.3
+lib/ocaml/${PKGMANDIR}/man3/StdLabels.List.3
+lib/ocaml/${PKGMANDIR}/man3/StdLabels.String.3
+lib/ocaml/${PKGMANDIR}/man3/Str.3
+lib/ocaml/${PKGMANDIR}/man3/Stream.3
+lib/ocaml/${PKGMANDIR}/man3/String.3
+lib/ocaml/${PKGMANDIR}/man3/StringLabels.3
+lib/ocaml/${PKGMANDIR}/man3/Syntaxerr.3
+lib/ocaml/${PKGMANDIR}/man3/Sys.3
+lib/ocaml/${PKGMANDIR}/man3/Unix.3
+lib/ocaml/${PKGMANDIR}/man3/Unix.LargeFile.3
+lib/ocaml/${PKGMANDIR}/man3/Weak.3
+lib/ocaml/${PKGMANDIR}/man3/Weak.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Weak.S.3
 lib/ocaml/map.cmi
 lib/ocaml/map.ml
 lib/ocaml/map.mli
@@ -461,133 +606,3 @@ man/man1/ocamloptp.1
 man/man1/ocamlprof.1
 man/man1/ocamlrun.1
 man/man1/ocamlyacc.1
-man/man3o/Arg.3o
-man/man3o/Array.3o
-man/man3o/ArrayLabels.3o
-man/man3o/Ast_helper.3o
-man/man3o/Ast_helper.Cf.3o
-man/man3o/Ast_helper.Ci.3o
-man/man3o/Ast_helper.Cl.3o
-man/man3o/Ast_helper.Csig.3o
-man/man3o/Ast_helper.Cstr.3o
-man/man3o/Ast_helper.Ctf.3o
-man/man3o/Ast_helper.Cty.3o
-man/man3o/Ast_helper.Exp.3o
-man/man3o/Ast_helper.Incl.3o
-man/man3o/Ast_helper.Mb.3o
-man/man3o/Ast_helper.Md.3o
-man/man3o/Ast_helper.Mod.3o
-man/man3o/Ast_helper.Mtd.3o
-man/man3o/Ast_helper.Mty.3o
-man/man3o/Ast_helper.Opn.3o
-man/man3o/Ast_helper.Pat.3o
-man/man3o/Ast_helper.Sig.3o
-man/man3o/Ast_helper.Str.3o
-man/man3o/Ast_helper.Te.3o
-man/man3o/Ast_helper.Typ.3o
-man/man3o/Ast_helper.Type.3o
-man/man3o/Ast_helper.Val.3o
-man/man3o/Ast_helper.Vb.3o
-man/man3o/Ast_mapper.3o
-man/man3o/Asttypes.3o
-man/man3o/Bigarray.3o
-man/man3o/Bigarray.Array1.3o
-man/man3o/Bigarray.Array2.3o
-man/man3o/Bigarray.Array3.3o
-man/man3o/Bigarray.Genarray.3o
-man/man3o/Buffer.3o
-man/man3o/Bytes.3o
-man/man3o/BytesLabels.3o
-man/man3o/Callback.3o
-man/man3o/CamlinternalFormat.3o
-man/man3o/CamlinternalFormatBasics.3o
-man/man3o/CamlinternalLazy.3o
-man/man3o/CamlinternalMod.3o
-man/man3o/CamlinternalOO.3o
-man/man3o/Char.3o
-man/man3o/String.3o
-man/man3o/Complex.3o
-man/man3o/Digest.3o
-man/man3o/Filename.3o
-man/man3o/Format.3o
-man/man3o/Gc.3o
-man/man3o/Genlex.3o
-man/man3o/Hashtbl.3o
-man/man3o/Hashtbl.HashedType.3o
-man/man3o/Hashtbl.Make.3o
-man/man3o/Hashtbl.MakeSeeded.3o
-man/man3o/Hashtbl.S.3o
-man/man3o/Hashtbl.SeededHashedType.3o
-man/man3o/Hashtbl.SeededS.3o
-man/man3o/Int32.3o
-man/man3o/Int64.3o
-man/man3o/Lazy.3o
-man/man3o/Lexer.3o
-man/man3o/Lexing.3o
-man/man3o/List.3o
-man/man3o/ListLabels.3o
-man/man3o/Location.3o
-man/man3o/Longident.3o
-man/man3o/Map.3o
-man/man3o/Map.Make.3o
-man/man3o/Map.OrderedType.3o
-man/man3o/Map.S.3o
-man/man3o/Marshal.3o
-man/man3o/MoreLabels.3o
-man/man3o/MoreLabels.Hashtbl.3o
-man/man3o/MoreLabels.Hashtbl.HashedType.3o
-man/man3o/MoreLabels.Hashtbl.Make.3o
-man/man3o/MoreLabels.Hashtbl.MakeSeeded.3o
-man/man3o/MoreLabels.Hashtbl.S.3o
-man/man3o/MoreLabels.Hashtbl.SeededHashedType.3o
-man/man3o/MoreLabels.Hashtbl.SeededS.3o
-man/man3o/MoreLabels.Map.3o
-man/man3o/MoreLabels.Map.Make.3o
-man/man3o/MoreLabels.Map.OrderedType.3o
-man/man3o/MoreLabels.Map.S.3o
-man/man3o/MoreLabels.Set.3o
-man/man3o/MoreLabels.Set.Make.3o
-man/man3o/MoreLabels.Set.OrderedType.3o
-man/man3o/MoreLabels.Set.S.3o
-man/man3o/Nativeint.3o
-man/man3o/Num.3o
-man/man3o/Obj.3o
-man/man3o/Oo.3o
-man/man3o/Parse.3o
-man/man3o/Parser.3o
-man/man3o/Parsetree.3o
-man/man3o/Parsing.3o
-man/man3o/Pervasives.3o
-man/man3o/Pervasives.LargeFile.3o
-man/man3o/Pprintast.3o
-man/man3o/Pprintast.printer.3o
-man/man3o/Printast.3o
-man/man3o/Printexc.3o
-man/man3o/Printexc.Slot.3o
-man/man3o/Printf.3o
-man/man3o/Queue.3o
-man/man3o/Random.3o
-man/man3o/Random.State.3o
-man/man3o/Scanf.3o
-man/man3o/Scanf.Scanning.3o
-man/man3o/Set.3o
-man/man3o/Set.Make.3o
-man/man3o/Set.OrderedType.3o
-man/man3o/Set.S.3o
-man/man3o/Sort.3o
-man/man3o/Stack.3o
-man/man3o/StdLabels.3o
-man/man3o/StdLabels.Array.3o
-man/man3o/StdLabels.Bytes.3o
-man/man3o/StdLabels.List.3o
-man/man3o/StdLabels.String.3o
-man/man3o/Str.3o
-man/man3o/Stream.3o
-man/man3o/StringLabels.3o
-man/man3o/Syntaxerr.3o
-man/man3o/Sys.3o
-man/man3o/Unix.3o
-man/man3o/Unix.LargeFile.3o
-man/man3o/Weak.3o
-man/man3o/Weak.Make.3o
-man/man3o/Weak.S.3o
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index db30290fb72..d95619ae7e6 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.82 2015/03/17 14:14:43 jperkin Exp $
+$NetBSD: distinfo,v 1.83 2015/04/02 22:40:09 tnn Exp $
 
 SHA1 (ocaml-4.02.1.tar.gz) = 6af8c67f2badece81d8e1d1ce70568a16e42313e
 RMD160 (ocaml-4.02.1.tar.gz) = fcb30200e9675d92e402b4b7101a032f918f80c1
@@ -21,7 +21,8 @@ SHA1 (patch-driver_main_args.ml) = 1e80cc88607f20954d1d5cb38ebcf2ad02d34261
 SHA1 (patch-driver_main_args.mli) = 66c691031f8fe726dc3c5c00a058b484213da703
 SHA1 (patch-driver_optmain.ml) = e8b347eb49d9f72e0af6f69c2b6aacd41d8eec4a
 SHA1 (patch-man_Makefile) = 7d8c1468c3365803505841a7f688d84c07231a3c
-SHA1 (patch-ocamldoc_Makefile) = bf76adf76a2b65c3983dccb483c857600ed9dde8
+SHA1 (patch-ocamldoc_Makefile) = fe85a5ba0e9f9536ae4f80c0337a8cde9c542862
+SHA1 (patch-ocamldoc_odoc__messages.ml) = 24527a34f07dceddd4f82d55fa47da57840bda7c
 SHA1 (patch-otherlibs_Makefile) = 08ccf5fd4900d59f1ad32346d8e81388c0cdd92c
 SHA1 (patch-otherlibs_Makefile.shared) = c5de4dd0f2be9cd35ba61b480b222ffa7baa891d
 SHA1 (patch-otherlibs_dynlink_Makefile) = 41cecb61230880a40c55f2f8f25d2b250864eb24
diff --git a/lang/ocaml/patches/patch-ocamldoc_Makefile b/lang/ocaml/patches/patch-ocamldoc_Makefile
index 6198b3328df..aebc8fd50ab 100644
--- a/lang/ocaml/patches/patch-ocamldoc_Makefile
+++ b/lang/ocaml/patches/patch-ocamldoc_Makefile
@@ -1,18 +1,10 @@
-$NetBSD: patch-ocamldoc_Makefile,v 1.2 2014/10/09 19:08:28 jaapb Exp $
+$NetBSD: patch-ocamldoc_Makefile,v 1.3 2015/04/02 22:40:09 tnn Exp $
 
-Use BSD_INSTALL_* instead of mkdir and cp; install in man3o
---- ocamldoc/Makefile.orig	2014-07-21 15:44:24.000000000 +0000
+Use BSD_INSTALL_* instead of mkdir and cp
+
+--- ocamldoc/Makefile.orig	2014-10-04 10:38:53.000000000 +0000
 +++ ocamldoc/Makefile
-@@ -41,7 +41,7 @@ INSTALL_LIBDIR=$(DESTDIR)$(OCAMLLIB)/oca
- INSTALL_CUSTOMDIR=$(INSTALL_LIBDIR)/custom
- INSTALL_BINDIR=$(DESTDIR)$(OCAMLBIN)
- #MANO: man ocamldoc
--INSTALL_MANODIR=$(DESTDIR)$(MANDIR)/man3
-+INSTALL_MANODIR=$(DESTDIR)$(MANDIR)/man3o
- 
- INSTALL_MLIS=odoc_info.mli
- INSTALL_CMIS=$(INSTALL_MLIS:.mli=.cmi)
-@@ -240,24 +240,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
+@@ -241,24 +241,24 @@ odoc_see_lexer.ml: odoc_see_lexer.mll
  # Installation targets
  ######################
  install: dummy
diff --git a/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml b/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml
new file mode 100644
index 00000000000..a38a2da6bc1
--- /dev/null
+++ b/lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml
@@ -0,0 +1,13 @@
+$NetBSD: patch-ocamldoc_odoc__messages.ml,v 1.1 2015/04/02 22:40:09 tnn Exp $
+
+--- ocamldoc/odoc_messages.ml.orig	2014-09-26 13:00:20.000000000 +0000
++++ ocamldoc/odoc_messages.ml
+@@ -89,7 +89,7 @@ let default_man_section = "3"
+ let man_section = "<section> Use <section> in man page files "^
+   "(default is "^default_man_section^") "^man_only^"\n"
+ 
+-let default_man_suffix = default_man_section^"o"
++let default_man_suffix = default_man_section
+ let man_suffix = "<suffix> Use <suffix> for man page files "^
+   "(default is "^default_man_suffix^") "^man_only^"\n"
+