diff options
| author | jaapb <jaapb> | 2014-10-13 13:25:44 +0000 |
|---|---|---|
| committer | jaapb <jaapb> | 2014-10-13 13:25:44 +0000 |
| commit | baff8d7483adbdaf0f4127c37b839a575a7ff707 (patch) | |
| tree | 995da08f71ea8fe19189b491bcf8808c6b96cc73 /x11/ocaml-graphics | |
| parent | 3e33b8ca15d06cff1cddaf935652f21b375ddeee (diff) | |
| download | pkgsrc-baff8d7483adbdaf0f4127c37b839a575a7ff707.tar.gz | |
- Removed -no-tk option (thanks to joerg@ for reporting)
- Package now uses ocaml.mk framework
Diffstat (limited to 'x11/ocaml-graphics')
| -rw-r--r-- | x11/ocaml-graphics/Makefile | 25 | ||||
| -rw-r--r-- | x11/ocaml-graphics/PLIST | 6 |
2 files changed, 14 insertions, 17 deletions
diff --git a/x11/ocaml-graphics/Makefile b/x11/ocaml-graphics/Makefile index 213a334a8db..eb2428ac036 100644 --- a/x11/ocaml-graphics/Makefile +++ b/x11/ocaml-graphics/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2014/10/09 19:14:05 jaapb Exp $ +# $NetBSD: Makefile,v 1.22 2014/10/13 13:25:44 jaapb Exp $ .include "../../lang/ocaml/Makefile.common" DISTINFO_FILE= ${PKGDIR}/../../lang/ocaml/distinfo @@ -11,18 +11,16 @@ COMMENT+= (graphics library) CONFIGURE_ARGS+= -x11include ${X11BASE}/include CONFIGURE_ARGS+= -x11lib ${X11BASE}/lib -CONFIGURE_ARGS+= -no-tk BUILD_DIRS= otherlibs/graph BUILD_TARGET= all INSTALL_TARGET= install -PLIST_VARS+= opt -.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "powerpc" || \ - ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "x86_64" +.include "../../mk/ocaml.mk" + +.if ${OCAML_USE_OPT_COMPILER} == "yes" BUILD_TARGET+= allopt INSTALL_TARGET+= installopt -PLIST.opt= yes .endif PLIST_VARS+= natdynlib @@ -56,18 +54,17 @@ SUBST_FILES.mklib= otherlibs/Makefile.shared SUBST_SED.mklib= -e 's,^MKLIB=.*,MKLIB=ocamlmklib,g' SUBST_MESSAGE.mklib= Fixing MKLIB in otherlibs/Makefile.shared. -SUBST_CLASSES+= comp -SUBST_STAGE.comp= post-patch -SUBST_FILES.comp= otherlibs/Makefile -SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' -SUBST_SED.comp+= -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g' -SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. +SUBST_CLASSES+= comp +SUBST_STAGE.comp= post-patch +SUBST_FILES.comp= otherlibs/Makefile +SUBST_SED.comp= -e 's,^CAMLC=.*,CAMLC=ocamlc,g' +SUBST_SED.comp+= -e 's,^CAMLOPT=.*,CAMLOPT=ocamlopt,g' +SUBST_MESSAGE.comp= Fixing CAMLC OCAMLOPT in otherlibs/Makefile. INSTALLATION_DIRS+= lib/ocaml/stublibs post-build: - @${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC + ${CP} ${PKGDIR}/PLIST ${WRKDIR}/.PLIST_SRC -.include "../../lang/ocaml/buildlink3.mk" .include "../../x11/libX11/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/x11/ocaml-graphics/PLIST b/x11/ocaml-graphics/PLIST index 98469a5334c..e27615bac80 100644 --- a/x11/ocaml-graphics/PLIST +++ b/x11/ocaml-graphics/PLIST @@ -1,9 +1,9 @@ -@comment $NetBSD: PLIST,v 1.7 2010/11/07 18:36:08 tonio Exp $ -${PLIST.opt}lib/ocaml/graphics.a +@comment $NetBSD: PLIST,v 1.8 2014/10/13 13:25:44 jaapb Exp $ +${PLIST.ocaml-opt}lib/ocaml/graphics.a lib/ocaml/graphics.cma lib/ocaml/graphics.cmi lib/ocaml/graphics.cmx -${PLIST.opt}lib/ocaml/graphics.cmxa +${PLIST.ocaml-opt}lib/ocaml/graphics.cmxa ${PLIST.natdynlib}lib/ocaml/graphics.cmxs lib/ocaml/graphics.mli lib/ocaml/graphicsX11.cmi |