tech-pkg archive

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

man3 location for ocaml



I'm looking at the history of lang/ocaml and trying to understand
why the section 3 manpages for OCaml are being installed into
/usr/pkg/lib/ocaml/{share/man,man}/man3 and then symlinked into
/usr/pkg/{share/man,man}/man3.  That seems convoluted for no
beneficial reason.

The log message for the original change by <tnn> says that it's to
match what lang/perl5 does with its manpages, but the reason that
the lang/perl5 package does it that way is to prevent manpage
conflicts with p5-* packages that override parts of the Perl
"standard" module library.  I don't see that happening with any
of the ocaml-* packages.

Why don't we just install the manpages into the proper location
and be done with it?  We can also enhance the regular expressions
that match manpages in mk/plist/plist-man.awk to match ".3o" for
OCaml and ".3p" for Perl:

diff --git a/mk/plist/plist-man.awk b/mk/plist/plist-man.awk
index 4cdab56a559..f322fe1b38c 100644
--- a/mk/plist/plist-man.awk
+++ b/mk/plist/plist-man.awk
@@ -76,8 +76,8 @@ BEGIN {
 	MANZ = getenv("MANZ", "no")
 	PKGMANDIR = getenv("PKGMANDIR", "man")
 	CATMAN_SECTION_SUFFIX = getenv("CATMAN_SECTION_SUFFIX", "no")
-	CATPAGE_REGEX = "cat[1-9ln](am|f)?/[^/]*\\.[0-9ln](am|f)?"
-	MANPAGE_REGEX = "(man|html)[1-9ln](am|f)?/[^/]*\\.([1-9ln](am|f)?|html)"
+	CATPAGE_REGEX = "cat[1-9ln](am|f|o|p)?/[^/]*\\.[0-9ln](am|f|o|p)?"
+	MANPAGE_REGEX = "(man|html)[1-9ln](am|f|o|p)?/[^/]*\\.([1-9ln](am|f|o|p)?|html)"
 	CATORMAN_REGEX = "(" MANPAGE_REGEX "|" CATPAGE_REGEX ")"
 }
-- 
Johnny C. Lam
jlam%NetBSD.org@localhost


Home | Main Index | Thread Index | Old Index