summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorjoerg <joerg>2008-12-22 20:04:07 +0000
committerjoerg <joerg>2008-12-22 20:04:07 +0000
commitb607ddd5d41e2eb6b8152b2b0af4108caa05684b (patch)
tree91a63d214fdc658206ca1fdc8f76e1aa56ef37eb /x11
parent4ce1e8604c202c8b55dc7421b4561b0e26f12b87 (diff)
downloadpkgsrc-b607ddd5d41e2eb6b8152b2b0af4108caa05684b.tar.gz
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 (limited to 'x11')
-rw-r--r--x11/ocaml-graphics/Makefile12
-rw-r--r--x11/ocaml-graphics/PLIST4
2 files changed, 10 insertions, 6 deletions
diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile
index a982c1b91a5..8932b25ba8c 100644
--- a/x11/ocaml-graphics/Makefile
+++ b/x11/ocaml-graphics/Makefile
@@ -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 @@ BUILD_TARGET= all
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_FILES.depend= otherlibs/graph/.depend
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 --git a/x11/ocaml-graphics/PLIST b/x11/ocaml-graphics/PLIST
index 5ca64236310..db696e11e6d 100644
--- a/x11/ocaml-graphics/PLIST
+++ b/x11/ocaml-graphics/PLIST
@@ -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