diff options
| author | jaapb <jaapb@pkgsrc.org> | 2016-06-25 14:31:13 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2016-06-25 14:31:13 +0000 |
| commit | 328cc753f1e13f695b557348c0e7677ae5bc46e0 (patch) | |
| tree | 14456244ac335625bc740a8d7ef30da76e5d121b /textproc/ocaml-expat | |
| parent | 70ae7e7365ba687c1f88de655aa14b9a1ba8720d (diff) | |
| download | pkgsrc-328cc753f1e13f695b557348c0e7677ae5bc46e0.tar.gz | |
Updated package to use ocaml.mk framework. No upstream changes.
Diffstat (limited to 'textproc/ocaml-expat')
| -rw-r--r-- | textproc/ocaml-expat/Makefile | 16 | ||||
| -rw-r--r-- | textproc/ocaml-expat/PLIST | 22 |
2 files changed, 17 insertions, 21 deletions
diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile index 5aaed115dfc..d3b7198c1b1 100644 --- a/textproc/ocaml-expat/Makefile +++ b/textproc/ocaml-expat/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.9 2016/05/05 11:45:41 jaapb Exp $ +# $NetBSD: Makefile,v 1.10 2016/06/25 14:32:00 jaapb Exp $ # DISTNAME= ocaml-expat-0.9.1 -PKGREVISION= 6 +PKGREVISION= 7 CATEGORIES= textproc MASTER_SITES= http://mmzeeman.home.xs4all.nl/ocaml/ @@ -15,15 +15,13 @@ USE_TOOLS+= gmake USE_LANGUAGES= c BUILD_TARGET= all -PLIST_VARS+= opt -.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \ - (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \ - (${MACHINE_ARCH} == "arm") -PLIST.opt= yes +OCAML_USE_FINDLIB= yes + +.include "../../mk/ocaml.mk" + +.if (${OCAML_USE_OPT_COMPILER} == "yes") BUILD_TARGET+= allopt expat.cmxs .endif -.include "../../devel/ocaml-findlib/buildlink3.mk" -.include "../../lang/ocaml/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/textproc/ocaml-expat/PLIST b/textproc/ocaml-expat/PLIST index d8410f4267e..016cd572f5a 100644 --- a/textproc/ocaml-expat/PLIST +++ b/textproc/ocaml-expat/PLIST @@ -1,12 +1,10 @@ -@comment $NetBSD: PLIST,v 1.2 2013/06/16 09:45:19 jaapb Exp $ -@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/expat -lib/ocaml/site-lib/expat/META -lib/ocaml/site-lib/expat/dllmlexpat.so -${PLIST.opt}lib/ocaml/site-lib/expat/expat.a -lib/ocaml/site-lib/expat/expat.cma -${PLIST.opt}lib/ocaml/site-lib/expat/expat.cmxa -${PLIST.opt}lib/ocaml/site-lib/expat/expat.cmxs -lib/ocaml/site-lib/expat/expat.cmi -lib/ocaml/site-lib/expat/expat.mli -lib/ocaml/site-lib/expat/libmlexpat.a -@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/expat +@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:32:00 jaapb Exp $ +${OCAML_SITELIB}/expat/META +${OCAML_SITELIB}/expat/dllmlexpat.so +${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.a +${OCAML_SITELIB}/expat/expat.cma +${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.cmxa +${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.cmxs +${OCAML_SITELIB}/expat/expat.cmi +${OCAML_SITELIB}/expat/expat.mli +${OCAML_SITELIB}/expat/libmlexpat.a |