[pkgsrc/trunk]: pkgsrc Fix PLIST of ocaml-graphics for architectures not usin...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c144c222573c
branches:  trunk
changeset: 552017:c144c222573c
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Mon Dec 22 20:04:07 2008 +0000

description:
Fix PLIST of ocaml-graphics for architectures not using the optimiser.
Add amd64 to that list. Bump revision of ocaml-graphics. Make ocaml
itself and ocaml-graphics destdir safe.

diffstat:

 lang/ocaml/Makefile         |   4 +++-
 lang/ocaml/Makefile.common  |   5 ++++-
 x11/ocaml-graphics/Makefile |  12 ++++++++----
 x11/ocaml-graphics/PLIST    |   4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diffs (78 lines):

diff -r 4bb99ca82bd6 -r c144c222573c lang/ocaml/Makefile
--- a/lang/ocaml/Makefile       Mon Dec 22 19:17:06 2008 +0000
+++ b/lang/ocaml/Makefile       Mon Dec 22 20:04:07 2008 +0000
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.59 2008/02/11 00:56:42 dbj Exp $
+# $NetBSD: Makefile,v 1.60 2008/12/22 20:04:07 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "Makefile.common"
 
diff -r 4bb99ca82bd6 -r c144c222573c lang/ocaml/Makefile.common
--- a/lang/ocaml/Makefile.common        Mon Dec 22 19:17:06 2008 +0000
+++ b/lang/ocaml/Makefile.common        Mon Dec 22 20:04:07 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2008/04/25 07:13:39 wiz Exp $
+# $NetBSD: Makefile.common,v 1.22 2008/12/22 20:04:07 joerg Exp $
 
 DISTNAME=      ocaml-3.10.2
 CATEGORIES=    lang
@@ -23,6 +23,9 @@
 CONFIGURE_ARGS+=       -mandir ${PREFIX}/${PKGMANDIR}
 CPPFLAGS+=             -DDB_DBM_HSEARCH
 
+INSTALL_MAKE_FLAGS+=   PREFIX=${DESTDIR}${PREFIX} \
+                       MANDIR=${DESTDIR}${PREFIX}/${PKGMANDIR}
+
 .include "../../mk/bsd.prefs.mk"
 
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "Linux"
diff -r 4bb99ca82bd6 -r c144c222573c x11/ocaml-graphics/Makefile
--- a/x11/ocaml-graphics/Makefile       Mon Dec 22 19:17:06 2008 +0000
+++ b/x11/ocaml-graphics/Makefile       Mon Dec 22 20:04:07 2008 +0000
@@ -1,9 +1,11 @@
-# $NetBSD: Makefile,v 1.8 2008/04/12 22:43:15 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2008/12/22 20:04:07 joerg Exp $
+
+PKG_DESTDIR_SUPPORT=   user-destdir
 
 .include "../../lang/ocaml/Makefile.common"
 
 PKGNAME=               ${DISTNAME:S/ocaml/ocaml-graphics/}
-PKGREVISION=           2
+PKGREVISION=           3
 
 COMMENT+=              (graphics library)
 
@@ -16,8 +18,8 @@
 INSTALL_TARGET=                install
 
 PLIST_VARS+=           opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc")
+.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \
+    ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "x86_64"
 BUILD_TARGET+=         allopt
 INSTALL_TARGET+=       installopt
 PLIST.opt=             yes
@@ -37,6 +39,8 @@
 SUBST_SED.depend=      -e 's,/usr/X11R6,${X11BASE},g'
 SUBST_MESSAGE.depend=  Fixing .depend in otherlibs/graph.
 
+INSTALLATION_DIRS+=    lib/ocaml/stublibs
+
 post-build:
        @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC
 
diff -r 4bb99ca82bd6 -r c144c222573c x11/ocaml-graphics/PLIST
--- a/x11/ocaml-graphics/PLIST  Mon Dec 22 19:17:06 2008 +0000
+++ b/x11/ocaml-graphics/PLIST  Mon Dec 22 20:04:07 2008 +0000
@@ -1,5 +1,5 @@
-@comment $NetBSD: PLIST,v 1.3 2008/04/12 22:43:15 jlam Exp $
-lib/ocaml/graphics.a
+@comment $NetBSD: PLIST,v 1.4 2008/12/22 20:04:07 joerg Exp $
+${PLIST.opt}lib/ocaml/graphics.a
 lib/ocaml/graphics.cma
 lib/ocaml/graphics.cmi
 ${PLIST.opt}lib/ocaml/graphics.cmxa