pkg/42750: lang/ocaml's PLIST.opt has files not installed on some systems

[Taylor R Campbell <campbell%mumble.net@localhost>]

>Number:         42750
>Category:       pkg
>Synopsis:       lang/ocaml's PLIST.opt has files not installed on some systems
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    pkg-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Fri Feb 05 14:35:00 +0000 2010
>Originator:     Taylor R Campbell <campbell%mumble.net@localhost>
>Release:        pkgsrc-2009Q4
>Organization:
>Environment:
>Description:

        On platforms other than GNU/Linux, FreeBSD, OpenBSD, and
        NetBSD, the following files are not installed:

                lib/ocaml/bigarray.cmxs
                lib/ocaml/dbm.cmxs
                lib/ocaml/nums.cmxs
                lib/ocaml/str.cmxs
                lib/ocaml/unix.cmxs

        Hence file-check fails on, say, Darwin.

>How-To-Repeat:

        Build lang/ocaml on any platform other than GNU/Linux,
        FreeBSD, OpenBSD, or NetBSD.  Watch file-check fail.

>Fix:

        Apply the following patch, which adds a new packing list,
        PLIST.opts, for the files that are peculiar to GNU/Linux,
        FreeBSD, OpenBSD, and NetBSD.  Tested on Darwin and NetBSD
        (both i386).  I don't think this will need to be amended when
        lang/ocaml is upgraded to 3.11.2 -- the relevant part of the
        configure script hasn't changed.

Index: lang/ocaml/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ocaml/Makefile,v
retrieving revision 1.64
diff -p -u -r1.64 Makefile
--- lang/ocaml/Makefile 19 Nov 2009 03:18:58 -0000      1.64
+++ lang/ocaml/Makefile 5 Feb 2010 14:15:21 -0000
@@ -30,6 +30,10 @@ PLIST_SRC+=  ${PKGDIR}/PLIST.stub
     (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64")
 BUILD_TARGET+= opt opt.opt
 PLIST_SRC+=    ${PKGDIR}/PLIST.opt
+.  if ${OPSYS} == "Linux" || ${OPSYS} == "FreeBSD" || \
+      ${OPSYS} == "OpenBSD" || ${OPSYS} == "NetBSD"
+PLIST_SRC+=    ${PKGDIR}/PLIST.opts
+.  endif
 .  if empty(MACHINE_PLATFORM:MDarwin-*-powerpc) && \
       empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
       empty(MACHINE_PLATFORM:MNetBSD-*-powerpc) && \
Index: lang/ocaml/PLIST.opt
===================================================================
RCS file: /cvsroot/pkgsrc/lang/ocaml/PLIST.opt,v
retrieving revision 1.15
diff -p -u -r1.15 PLIST.opt
--- lang/ocaml/PLIST.opt        7 Sep 2009 21:48:13 -0000       1.15
+++ lang/ocaml/PLIST.opt        5 Feb 2010 14:15:21 -0000
@@ -20,7 +20,6 @@ lib/ocaml/big_int.cmx
 lib/ocaml/bigarray.a
 lib/ocaml/bigarray.cmx
 lib/ocaml/bigarray.cmxa
-lib/ocaml/bigarray.cmxs
 lib/ocaml/buffer.cmx
 lib/ocaml/callback.cmx
 lib/ocaml/camlinternalLazy.cmx
@@ -65,7 +64,6 @@ lib/ocaml/complex.cmx
 lib/ocaml/dbm.a
 lib/ocaml/dbm.cmx
 lib/ocaml/dbm.cmxa
-lib/ocaml/dbm.cmxs
 lib/ocaml/digest.cmx
 lib/ocaml/dynlink.a
 lib/ocaml/dynlink.cmx
@@ -94,7 +92,6 @@ lib/ocaml/nativeint.cmx
 lib/ocaml/num.cmx
 lib/ocaml/nums.a
 lib/ocaml/nums.cmxa
-lib/ocaml/nums.cmxs
 lib/ocaml/obj.cmx
 lib/ocaml/ocamlbuild/ocamlbuild.cmx
 lib/ocaml/ocamlbuild/ocamlbuild_executor.cmx
@@ -127,7 +124,6 @@ lib/ocaml/stdlib.p.cmxa
 lib/ocaml/str.a
 lib/ocaml/str.cmx
 lib/ocaml/str.cmxa
-lib/ocaml/str.cmxs
 lib/ocaml/stream.cmx
 lib/ocaml/string.cmx
 lib/ocaml/stringLabels.cmx
@@ -142,6 +138,5 @@ lib/ocaml/threads/threads.cmxa
 lib/ocaml/unix.a
 lib/ocaml/unix.cmx
 lib/ocaml/unix.cmxa
-lib/ocaml/unix.cmxs
 lib/ocaml/unixLabels.cmx
 lib/ocaml/weak.cmx
Index: lang/ocaml/PLIST.opts
===================================================================
RCS file: lang/ocaml/PLIST.opts
diff -N lang/ocaml/PLIST.opts
--- /dev/null   1 Jan 1970 00:00:00 -0000
+++ lang/ocaml/PLIST.opts       5 Feb 2010 14:15:21 -0000
@@ -0,0 +1,6 @@
+@comment $NetBSD$
+lib/ocaml/bigarray.cmxs
+lib/ocaml/dbm.cmxs
+lib/ocaml/nums.cmxs
+lib/ocaml/str.cmxs
+lib/ocaml/unix.cmxs