[pkgsrc/trunk]: pkgsrc/lang/ocaml Reorder PLIST components so that directorie...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3b3dca5295bb
branches:  trunk
changeset: 510801:3b3dca5295bb
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Tue Apr 04 14:33:27 2006 +0000

description:
Reorder PLIST components so that directories are removed in the correct
order.  Remove "@unexec rmdir" lines made redundant by the reordering.
Also, use a more succinct way to match ${OPSYS} + ${MACHINE_ARCH} by
just checking ${MACHINE_PLATFORM}.

diffstat:

 lang/ocaml/Makefile   |  34 ++++++++++++++++++++++------------
 lang/ocaml/PLIST      |   3 +--
 lang/ocaml/PLIST.opt  |   3 +--
 lang/ocaml/PLIST.prof |   3 +--
 lang/ocaml/PLIST.stub |   3 +--
 5 files changed, 26 insertions(+), 20 deletions(-)

diffs (108 lines):

diff -r 596d83b93c59 -r 3b3dca5295bb lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Tue Apr 04 14:22:48 2006 +0000
+++ b/lang/ocaml/Makefile       Tue Apr 04 14:33:27 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/04/04 14:22:48 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2006/04/04 14:33:27 jlam Exp $
 
 .include "Makefile.common"
 
@@ -8,20 +8,30 @@
 CONFIGURE_ENV+=                disable_x11=yes
 
 BUILD_TARGET=          world
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc")
-BUILD_TARGET+= opt opt.opt
-PLIST_SRC=     ${PKGDIR}/PLIST.opt
-.  if (${OPSYS} != "Darwin") && \
-      !(${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386") && \
-      !(${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc")
-PLIST_SRC+=    ${PKGDIR}/PLIST.prof
-.  endif
-.endif
-PLIST_SRC+=    ${PKGDIR}/PLIST
 
+###
+### PLIST components
+###
+
+# Stub libraries for functions missing from base system.
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
 PLIST_SRC+=    ${PKGDIR}/PLIST.stub
 .endif
 
+# Optional components built only on certain platforms.
+.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
+    (${MACHINE_ARCH} == "sparc")
+BUILD_TARGET+= opt opt.opt
+PLIST_SRC+=    ${PKGDIR}/PLIST.opt
+.  if empty(MACHINE_PLATFORM:MDarwin-*-*) && \
+      empty(MACHINE_PLATFORM:MSunOS-*-i386) && \
+      empty(MACHINE_PLATFORM:MNetBSD-*-sparc)
+PLIST_SRC+=    ${PKGDIR}/PLIST.prof
+.  endif
+.endif
+
+# Common ocaml files.
+PLIST_SRC+=    ${PKGDIR}/PLIST
+
+
 .include "../../mk/bsd.pkg.mk"
diff -r 596d83b93c59 -r 3b3dca5295bb lang/ocaml/PLIST
--- a/lang/ocaml/PLIST  Tue Apr 04 14:22:48 2006 +0000
+++ b/lang/ocaml/PLIST  Tue Apr 04 14:33:27 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2006/01/16 09:41:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2006/04/04 14:33:27 jlam Exp $
 bin/camlp4
 bin/camlp4o
 bin/camlp4r
@@ -460,5 +460,4 @@
 @dirrm lib/ocaml/ocamldoc
 @dirrm lib/ocaml/camlp4
 @dirrm lib/ocaml/caml
-@unexec ${RMDIR} %D/lib/ocaml/stublibs 2>/dev/null || ${TRUE}
 @unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff -r 596d83b93c59 -r 3b3dca5295bb lang/ocaml/PLIST.opt
--- a/lang/ocaml/PLIST.opt      Tue Apr 04 14:22:48 2006 +0000
+++ b/lang/ocaml/PLIST.opt      Tue Apr 04 14:33:27 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.opt,v 1.11 2006/01/16 09:41:48 adam Exp $
+@comment $NetBSD: PLIST.opt,v 1.12 2006/04/04 14:33:27 jlam Exp $
 bin/camlp4o.opt
 bin/camlp4r.opt
 bin/ocamlc.opt
@@ -161,4 +161,3 @@
 lib/ocaml/unix.cmxa
 lib/ocaml/unixLabels.cmx
 lib/ocaml/weak.cmx
-@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff -r 596d83b93c59 -r 3b3dca5295bb lang/ocaml/PLIST.prof
--- a/lang/ocaml/PLIST.prof     Tue Apr 04 14:22:48 2006 +0000
+++ b/lang/ocaml/PLIST.prof     Tue Apr 04 14:33:27 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.prof,v 1.4 2006/01/16 09:41:48 adam Exp $
+@comment $NetBSD: PLIST.prof,v 1.5 2006/04/04 14:33:27 jlam Exp $
 lib/ocaml/arg.p.cmx
 lib/ocaml/array.p.cmx
 lib/ocaml/arrayLabels.p.cmx
@@ -42,4 +42,3 @@
 lib/ocaml/stringLabels.p.cmx
 lib/ocaml/sys.p.cmx
 lib/ocaml/weak.p.cmx
-@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff -r 596d83b93c59 -r 3b3dca5295bb lang/ocaml/PLIST.stub
--- a/lang/ocaml/PLIST.stub     Tue Apr 04 14:22:48 2006 +0000
+++ b/lang/ocaml/PLIST.stub     Tue Apr 04 14:33:27 2006 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.stub,v 1.2 2005/12/05 20:50:26 rillig Exp $
+@comment $NetBSD: PLIST.stub,v 1.3 2006/04/04 14:33:27 jlam Exp $
 lib/ocaml/stublibs/dllbigarray.so
 lib/ocaml/stublibs/dllmldbm.so
 lib/ocaml/stublibs/dllnums.so
@@ -7,4 +7,3 @@
 lib/ocaml/stublibs/dllunix.so
 lib/ocaml/stublibs/dllvmthreads.so
 @dirrm lib/ocaml/stublibs
-@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}