summaryrefslogtreecommitdiff
path: root/lang/ocaml
diff options
context:
space:
mode:
authorjlam <jlam>2006-04-04 14:33:27 +0000
committerjlam <jlam>2006-04-04 14:33:27 +0000
commit3cf680ecb611649d6f6c86000034fefeccc0e8e1 (patch)
tree4a0654c6be7929cae4bdea3a77e12c4b9cbb7838 /lang/ocaml
parentc06603182354e3175b619eda106d970019c73a4b (diff)
downloadpkgsrc-3cf680ecb611649d6f6c86000034fefeccc0e8e1.tar.gz
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 (limited to 'lang/ocaml')
-rw-r--r--lang/ocaml/Makefile26
-rw-r--r--lang/ocaml/PLIST3
-rw-r--r--lang/ocaml/PLIST.opt3
-rw-r--r--lang/ocaml/PLIST.prof3
-rw-r--r--lang/ocaml/PLIST.stub3
5 files changed, 22 insertions, 16 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile
index 054753d7b8e..9d4b2760a41 100644
--- a/lang/ocaml/Makefile
+++ b/lang/ocaml/Makefile
@@ -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_ARGS+= -no-tk
CONFIGURE_ENV+= disable_x11=yes
BUILD_TARGET= world
+
+###
+### 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 (${OPSYS} != "Darwin") && \
- !(${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "i386") && \
- !(${OPSYS} == "NetBSD" && ${MACHINE_ARCH} == "sparc")
+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
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "DragonFly" || ${OPSYS} == "NetBSD"
-PLIST_SRC+= ${PKGDIR}/PLIST.stub
-.endif
.include "../../mk/bsd.pkg.mk"
diff --git a/lang/ocaml/PLIST b/lang/ocaml/PLIST
index b6a540c225d..b826a719d23 100644
--- a/lang/ocaml/PLIST
+++ b/lang/ocaml/PLIST
@@ -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 @@ man/man3/Weak.S.3o
@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 --git a/lang/ocaml/PLIST.opt b/lang/ocaml/PLIST.opt
index 7c232171226..6d65ab1280a 100644
--- a/lang/ocaml/PLIST.opt
+++ b/lang/ocaml/PLIST.opt
@@ -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.cmx
lib/ocaml/unix.cmxa
lib/ocaml/unixLabels.cmx
lib/ocaml/weak.cmx
-@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}
diff --git a/lang/ocaml/PLIST.prof b/lang/ocaml/PLIST.prof
index 8d22924c724..8d2c930d836 100644
--- a/lang/ocaml/PLIST.prof
+++ b/lang/ocaml/PLIST.prof
@@ -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/string.p.cmx
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 --git a/lang/ocaml/PLIST.stub b/lang/ocaml/PLIST.stub
index 7ca7a465e71..c698b487c27 100644
--- a/lang/ocaml/PLIST.stub
+++ b/lang/ocaml/PLIST.stub
@@ -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/dllthreads.so
lib/ocaml/stublibs/dllunix.so
lib/ocaml/stublibs/dllvmthreads.so
@dirrm lib/ocaml/stublibs
-@unexec ${RMDIR} %D/lib/ocaml 2>/dev/null || ${TRUE}