pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/lang/ocaml Avoid using the "3o" man page section, sinc...
details: https://anonhg.NetBSD.org/pkgsrc/rev/9000c712ca88
branches: trunk
changeset: 649333:9000c712ca88
user: tnn <tnn%pkgsrc.org@localhost>
date: Thu Apr 02 22:40:09 2015 +0000
description:
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.
diffstat:
lang/ocaml/Makefile | 11 +-
lang/ocaml/Makefile.common | 6 +-
lang/ocaml/PLIST | 277 ++++++++++---------
lang/ocaml/distinfo | 5 +-
lang/ocaml/patches/patch-ocamldoc_Makefile | 18 +-
lang/ocaml/patches/patch-ocamldoc_odoc__messages.ml | 13 +
6 files changed, 179 insertions(+), 151 deletions(-)
diffs (truncated from 407 to 300 lines):
diff -r 3aa828c4b325 -r 9000c712ca88 lang/ocaml/Makefile
--- a/lang/ocaml/Makefile Thu Apr 02 22:40:04 2015 +0000
+++ b/lang/ocaml/Makefile Thu Apr 02 22:40:09 2015 +0000
@@ -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 @@
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 -r 3aa828c4b325 -r 9000c712ca88 lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common Thu Apr 02 22:40:04 2015 +0000
+++ b/lang/ocaml/Makefile.common Thu Apr 02 22:40:09 2015 +0000
@@ -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+= -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 -r 3aa828c4b325 -r 9000c712ca88 lang/ocaml/PLIST
--- a/lang/ocaml/PLIST Thu Apr 02 22:40:04 2015 +0000
+++ b/lang/ocaml/PLIST Thu Apr 02 22:40:09 2015 +0000
@@ -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/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/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
Home |
Main Index |
Thread Index |
Old Index