diff options
Diffstat (limited to 'devel/ocaml-findlib/Makefile')
| -rw-r--r-- | devel/ocaml-findlib/Makefile | 25 |
1 files changed, 9 insertions, 16 deletions
diff --git a/devel/ocaml-findlib/Makefile b/devel/ocaml-findlib/Makefile index 8de85e2b19c5..f61db9ce2bce 100644 --- a/devel/ocaml-findlib/Makefile +++ b/devel/ocaml-findlib/Makefile @@ -1,6 +1,6 @@ PORTNAME= findlib PORTVERSION= 1.9.6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- @@ -15,8 +15,6 @@ LICENSE_FILE= ${WRKSRC}/LICENSE USES= gmake USE_OCAML= yes USE_OCAML_CAMLP4=yes -USE_OCAML_FINDLIB=yes -OCAMLFIND_DEPEND= # Avoid dependency loop HAS_CONFIGURE= yes CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/share/man" \ -sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \ @@ -24,7 +22,7 @@ CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/share/man" \ MAKE_ENV= OCAML_LIBDIR="${PREFIX}/${OCAML_LIBDIR}" ALL_TARGET= all opt MAKE_JOBS_UNSAFE= yes -DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} +DOCSDIR= ${OCAML_DOCSDIR}/${PORTNAME} PORTDOCS= * OPTIONS_DEFINE= TOOLBOX DOCS @@ -39,21 +37,16 @@ TOOLBOX_BUILD_DEPENDS= ${TOOLBOX_RUN_DEPENDS} .include <bsd.port.pre.mk> post-install: - cd ${STAGEDIR}${PREFIX} && \ + # META files provided by the respective ocaml-* package, + # (those libraries used to be belong in the core ocaml + # compiler package). + @for oldlib in camlp4 graphics labltk ocamlbuild; \ + do ${RM} -r ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/$$oldlib ; done + @(cd ${STAGEDIR}${PREFIX} && \ ${STRIP_CMD} bin/ocamlfind \ ${OCAML_SITELIBDIR}/findlib/findlib.cmxs \ ${OCAML_SITELIBDIR}/findlib/findlib_dynload.cmxs \ - ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs -.if !exists(${LOCALBASE}/lib/ocaml/graphics.cmi) - @${REINPLACE_CMD} -e '/graphics\/META/d' ${TMPPLIST} -.endif -.if !exists(${LOCALBASE}/lib/ocaml/ocamlbuild/ocamlbuildlib.cma) - @${REINPLACE_CMD} -e '/ocamlbuild\/META/d' ${TMPPLIST} -.endif -# Spacetime profiling is only available for native code on 64-bit targets -.if ${ARCH} == armv7 || ${ARCH} == i386 || ${ARCH} == powerpc || ${ARCH} == powerpcspe - @${REINPLACE_CMD} -e '/raw_spacetime/d' ${TMPPLIST} -.endif + ${OCAML_SITELIBDIR}/findlib/findlib_top.cmxs) post-install-TOOLBOX-on: ${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ |