pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/lang/ocaml ocaml: Fix PKGMANDIR.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ea3aaed589c
branches:  trunk
changeset: 368910:1ea3aaed589c
user:      jperkin <jperkin%pkgsrc.org@localhost>
date:      Thu Sep 21 13:56:59 2017 +0000

description:
ocaml: Fix PKGMANDIR.

Add a PRINT_PLIST_AWK to help avoid this being removed again in the future,
though with all the PLIST_VARS used it's still difficult to keep updated.  It
is probably worth splitting the vars into individual PLIST files instead.

diffstat:

 lang/ocaml/Makefile |    4 +-
 lang/ocaml/PLIST    |  348 ++++++++++++++++++++++++++--------------------------
 2 files changed, 177 insertions(+), 175 deletions(-)

diffs (truncated from 380 to 300 lines):

diff -r c38bea1b61da -r 1ea3aaed589c lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Thu Sep 21 11:42:40 2017 +0000
+++ b/lang/ocaml/Makefile       Thu Sep 21 13:56:59 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.113 2017/09/08 09:12:44 jaapb Exp $
+# $NetBSD: Makefile,v 1.114 2017/09/21 13:56:59 jperkin Exp $
 
 .include "Makefile.common"
 
@@ -90,6 +90,8 @@
 SUBST_STAGE.linkopts=  pre-configure
 SUBST_MESSAGE.linkopts=        Honor LDFLAGS.
 
+PRINT_PLIST_AWK+=      { gsub(/lib\/ocaml\/${PKGMANDIR:S|/|\\/|}/, "lib/ocaml/$${PKGMANDIR}"); }
+
 do-test:
        cd ${WRKSRC}/testsuite && ${MAKE_PROGRAM} all
 
diff -r c38bea1b61da -r 1ea3aaed589c lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Thu Sep 21 11:42:40 2017 +0000
+++ b/lang/ocaml/PLIST  Thu Sep 21 13:56:59 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.41 2017/09/08 09:12:44 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.42 2017/09/21 13:56:59 jperkin Exp $
 bin/ocaml
 bin/ocamlc
 bin/ocamlc.byte
@@ -1397,179 +1397,179 @@
 lib/ocaml/listLabels.mli
 ${PLIST.ocaml-prof}lib/ocaml/listLabels.p.cmt
 ${PLIST.ocaml-prof}${PLIST.ocaml-opt}lib/ocaml/listLabels.p.cmx
-lib/ocaml/man/man1/ocaml.1
-lib/ocaml/man/man1/ocamlc.1
-lib/ocaml/man/man1/ocamlc.opt.1
-lib/ocaml/man/man1/ocamlcp.1
-lib/ocaml/man/man1/ocamldebug.1
-lib/ocaml/man/man1/ocamldep.1
-lib/ocaml/man/man1/ocamldoc.1
-lib/ocaml/man/man1/ocamllex.1
-lib/ocaml/man/man1/ocamlmktop.1
-lib/ocaml/man/man1/ocamlopt.1
-lib/ocaml/man/man1/ocamlopt.opt.1
-lib/ocaml/man/man1/ocamloptp.1
-lib/ocaml/man/man1/ocamlprof.1
-lib/ocaml/man/man1/ocamlrun.1
-lib/ocaml/man/man1/ocamlyacc.1
-lib/ocaml/man/man3/Arg.3
-lib/ocaml/man/man3/Array.3
-lib/ocaml/man/man3/ArrayLabels.3
-lib/ocaml/man/man3/Ast_helper.3
-lib/ocaml/man/man3/Ast_helper.Cf.3
-lib/ocaml/man/man3/Ast_helper.Ci.3
-lib/ocaml/man/man3/Ast_helper.Cl.3
-lib/ocaml/man/man3/Ast_helper.Const.3
-lib/ocaml/man/man3/Ast_helper.Csig.3
-lib/ocaml/man/man3/Ast_helper.Cstr.3
-lib/ocaml/man/man3/Ast_helper.Ctf.3
-lib/ocaml/man/man3/Ast_helper.Cty.3
-lib/ocaml/man/man3/Ast_helper.Exp.3
-lib/ocaml/man/man3/Ast_helper.Incl.3
-lib/ocaml/man/man3/Ast_helper.Mb.3
-lib/ocaml/man/man3/Ast_helper.Md.3
-lib/ocaml/man/man3/Ast_helper.Mod.3
-lib/ocaml/man/man3/Ast_helper.Mtd.3
-lib/ocaml/man/man3/Ast_helper.Mty.3
-lib/ocaml/man/man3/Ast_helper.Opn.3
-lib/ocaml/man/man3/Ast_helper.Pat.3
-lib/ocaml/man/man3/Ast_helper.Sig.3
-lib/ocaml/man/man3/Ast_helper.Str.3
-lib/ocaml/man/man3/Ast_helper.Te.3
-lib/ocaml/man/man3/Ast_helper.Typ.3
-lib/ocaml/man/man3/Ast_helper.Type.3
-lib/ocaml/man/man3/Ast_helper.Val.3
-lib/ocaml/man/man3/Ast_helper.Vb.3
-lib/ocaml/man/man3/Ast_invariants.3
-lib/ocaml/man/man3/Ast_iterator.3
-lib/ocaml/man/man3/Ast_mapper.3
-lib/ocaml/man/man3/Asttypes.3
-lib/ocaml/man/man3/Attr_helper.3
-lib/ocaml/man/man3/Bigarray.3
-lib/ocaml/man/man3/Bigarray.Array0.3
-lib/ocaml/man/man3/Bigarray.Array1.3
-lib/ocaml/man/man3/Bigarray.Array2.3
-lib/ocaml/man/man3/Bigarray.Array3.3
-lib/ocaml/man/man3/Bigarray.Genarray.3
-lib/ocaml/man/man3/Buffer.3
-lib/ocaml/man/man3/Builtin_attributes.3
-lib/ocaml/man/man3/Bytes.3
-lib/ocaml/man/man3/BytesLabels.3
-lib/ocaml/man/man3/Callback.3
-lib/ocaml/man/man3/CamlinternalFormat.3
-lib/ocaml/man/man3/CamlinternalFormatBasics.3
-lib/ocaml/man/man3/CamlinternalLazy.3
-lib/ocaml/man/man3/CamlinternalMod.3
-lib/ocaml/man/man3/CamlinternalOO.3
-lib/ocaml/man/man3/Char.3
-lib/ocaml/man/man3/Complex.3
-lib/ocaml/man/man3/Depend.3
-lib/ocaml/man/man3/Depend.StringMap.3
-lib/ocaml/man/man3/Depend.StringSet.3
-lib/ocaml/man/man3/Digest.3
-lib/ocaml/man/man3/Docstrings.3
-lib/ocaml/man/man3/Ephemeron.3
-lib/ocaml/man/man3/Ephemeron.GenHashTable.3
-lib/ocaml/man/man3/Ephemeron.GenHashTable.MakeSeeded.3
-lib/ocaml/man/man3/Ephemeron.K1.3
-lib/ocaml/man/man3/Ephemeron.K1.Make.3
-lib/ocaml/man/man3/Ephemeron.K1.MakeSeeded.3
-lib/ocaml/man/man3/Ephemeron.K2.3
-lib/ocaml/man/man3/Ephemeron.K2.Make.3
-lib/ocaml/man/man3/Ephemeron.K2.MakeSeeded.3
-lib/ocaml/man/man3/Ephemeron.Kn.3
-lib/ocaml/man/man3/Ephemeron.Kn.Make.3
-lib/ocaml/man/man3/Ephemeron.Kn.MakeSeeded.3
-lib/ocaml/man/man3/Ephemeron.S.3
-lib/ocaml/man/man3/Ephemeron.SeededS.3
-lib/ocaml/man/man3/Filename.3
-lib/ocaml/man/man3/Format.3
-lib/ocaml/man/man3/Gc.3
-lib/ocaml/man/man3/Genlex.3
-lib/ocaml/man/man3/Hashtbl.3
-lib/ocaml/man/man3/Hashtbl.HashedType.3
-lib/ocaml/man/man3/Hashtbl.Make.3
-lib/ocaml/man/man3/Hashtbl.MakeSeeded.3
-lib/ocaml/man/man3/Hashtbl.S.3
-lib/ocaml/man/man3/Hashtbl.SeededHashedType.3
-lib/ocaml/man/man3/Hashtbl.SeededS.3
-lib/ocaml/man/man3/Int32.3
-lib/ocaml/man/man3/Int64.3
-lib/ocaml/man/man3/Lazy.3
-lib/ocaml/man/man3/Lexer.3
-lib/ocaml/man/man3/Lexing.3
-lib/ocaml/man/man3/List.3
-lib/ocaml/man/man3/ListLabels.3
-lib/ocaml/man/man3/Location.3
-lib/ocaml/man/man3/Longident.3
-lib/ocaml/man/man3/Map.3
-lib/ocaml/man/man3/Map.Make.3
-lib/ocaml/man/man3/Map.OrderedType.3
-lib/ocaml/man/man3/Map.S.3
-lib/ocaml/man/man3/Marshal.3
-lib/ocaml/man/man3/MoreLabels.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.HashedType.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.Make.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.MakeSeeded.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.S.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.SeededHashedType.3
-lib/ocaml/man/man3/MoreLabels.Hashtbl.SeededS.3
-lib/ocaml/man/man3/MoreLabels.Map.3
-lib/ocaml/man/man3/MoreLabels.Map.Make.3
-lib/ocaml/man/man3/MoreLabels.Map.OrderedType.3
-lib/ocaml/man/man3/MoreLabels.Map.S.3
-lib/ocaml/man/man3/MoreLabels.Set.3
-lib/ocaml/man/man3/MoreLabels.Set.Make.3
-lib/ocaml/man/man3/MoreLabels.Set.OrderedType.3
-lib/ocaml/man/man3/MoreLabels.Set.S.3
-lib/ocaml/man/man3/Nativeint.3
-lib/ocaml/man/man3/Num.3
-lib/ocaml/man/man3/Obj.3
-lib/ocaml/man/man3/Obj.Ephemeron.3
-lib/ocaml/man/man3/Oo.3
-lib/ocaml/man/man3/Parse.3
-lib/ocaml/man/man3/Parser.3
-lib/ocaml/man/man3/Parsetree.3
-lib/ocaml/man/man3/Parsing.3
-lib/ocaml/man/man3/Pervasives.3
-lib/ocaml/man/man3/Pervasives.LargeFile.3
-lib/ocaml/man/man3/Pprintast.3
-lib/ocaml/man/man3/Printast.3
-lib/ocaml/man/man3/Printexc.3
-lib/ocaml/man/man3/Printexc.Slot.3
-lib/ocaml/man/man3/Printf.3
-lib/ocaml/man/man3/Queue.3
-lib/ocaml/man/man3/Random.3
-lib/ocaml/man/man3/Random.State.3
-lib/ocaml/man/man3/Scanf.3
-lib/ocaml/man/man3/Scanf.Scanning.3
-lib/ocaml/man/man3/Set.3
-lib/ocaml/man/man3/Set.Make.3
-lib/ocaml/man/man3/Set.OrderedType.3
-lib/ocaml/man/man3/Set.S.3
-lib/ocaml/man/man3/Sort.3
-lib/ocaml/man/man3/Spacetime.3
-lib/ocaml/man/man3/Spacetime.Series.3
-lib/ocaml/man/man3/Spacetime.Snapshot.3
-lib/ocaml/man/man3/Stack.3
-lib/ocaml/man/man3/StdLabels.3
-lib/ocaml/man/man3/StdLabels.Array.3
-lib/ocaml/man/man3/StdLabels.Bytes.3
-lib/ocaml/man/man3/StdLabels.List.3
-lib/ocaml/man/man3/StdLabels.String.3
-lib/ocaml/man/man3/Str.3
-lib/ocaml/man/man3/Stream.3
-lib/ocaml/man/man3/String.3
-lib/ocaml/man/man3/StringLabels.3
-lib/ocaml/man/man3/Syntaxerr.3
-lib/ocaml/man/man3/Sys.3
-lib/ocaml/man/man3/Uchar.3
-lib/ocaml/man/man3/Unix.3
-lib/ocaml/man/man3/Unix.LargeFile.3
-lib/ocaml/man/man3/Weak.3
-lib/ocaml/man/man3/Weak.Make.3
-lib/ocaml/man/man3/Weak.S.3
+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.Const.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_invariants.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_iterator.3
+lib/ocaml/${PKGMANDIR}/man3/Ast_mapper.3
+lib/ocaml/${PKGMANDIR}/man3/Asttypes.3
+lib/ocaml/${PKGMANDIR}/man3/Attr_helper.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.3
+lib/ocaml/${PKGMANDIR}/man3/Bigarray.Array0.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/Builtin_attributes.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/Depend.3
+lib/ocaml/${PKGMANDIR}/man3/Depend.StringMap.3
+lib/ocaml/${PKGMANDIR}/man3/Depend.StringSet.3
+lib/ocaml/${PKGMANDIR}/man3/Digest.3
+lib/ocaml/${PKGMANDIR}/man3/Docstrings.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.GenHashTable.MakeSeeded.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K1.MakeSeeded.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.K2.MakeSeeded.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.Make.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.Kn.MakeSeeded.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.S.3
+lib/ocaml/${PKGMANDIR}/man3/Ephemeron.SeededS.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



Home | Main Index | Thread Index | Old Index