diff options
| -rw-r--r-- | lang/ocaml/Makefile | 4 | ||||
| -rw-r--r-- | lang/ocaml/Makefile.common | 5 | ||||
| -rw-r--r-- | x11/ocaml-graphics/Makefile | 12 | ||||
| -rw-r--r-- | x11/ocaml-graphics/PLIST | 4 |
4 files changed, 17 insertions, 8 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 5186d3b5cd9..6be0b703e20 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -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 --git a/lang/ocaml/Makefile.common b/lang/ocaml/Makefile.common index cb9733af201..08acf460fe1 100644 --- a/lang/ocaml/Makefile.common +++ b/lang/ocaml/Makefile.common @@ -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+= -host ${MACHINE_GNU_PLATFORM:Q} 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 --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 |