Index: head/devel/ocaml-findlib/Makefile =================================================================== --- head/devel/ocaml-findlib/Makefile (revision 368810) +++ head/devel/ocaml-findlib/Makefile (revision 368811) @@ -1,54 +1,47 @@ # Created by: ijliao # $FreeBSD$ PORTNAME= findlib PORTVERSION= 1.5.3 CATEGORIES= devel MASTER_SITES= http://download.camlcity.org/download/ PKGNAMEPREFIX= ocaml- MAINTAINER= johans@FreeBSD.org COMMENT= OCaml package manager USE_OCAML= yes HAS_CONFIGURE= yes USES= gmake ALL_TARGET= all opt CONFIGURE_ARGS= -bindir "${PREFIX}/bin" -mandir "${PREFIX}/man" \ -sitelib "${PREFIX}/${OCAML_SITELIBDIR}" \ -config "${PREFIX}/etc/findlib.conf" USE_OCAML_FINDLIB=yes OCAMLFIND_DEPEND= # Avoid dependency loop OPTIONS_DEFINE= TOOLBOX DOCS OPTIONS_DEFAULT=TOOLBOX OPTIONS_SUB= yes TOOLBOX_DESC= Include toolbox interface (requires OCaml with TK) TOOLBOX_CONFIGURE_ON= -with-toolbox MAKE_JOBS_UNSAFE= yes DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME} PORTDOCS= * post-patch: @${REINPLACE_CMD} -e 's,path="@SITELIB@,&:${PREFIX}/${OCAML_LIBDIR},' \ ${WRKSRC}/findlib.conf.in post-install: @-${CHMOD} 755 ${STAGEDIR}${PREFIX}/bin/ocamlfind \ ${STAGEDIR}${PREFIX}/${OCAML_SITELIBDIR}/findlib/make_wizard @${MKDIR} ${STAGEDIR}${DOCSDIR} cd ${WRKSRC}/doc && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR} \ "! -regex .*ref-man.*" @${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ocamlfind - # Copied from Makefile; requires functional installation: - cd ${WRKSRC}/src/bytes/_build && \ - ${SETENV} ${MAKE_ENV} \ - OCAMLFIND_CONF=${STAGEDIR}${PREFIX}/etc/findlib.conf \ - ${STAGEDIR}${PREFIX}/bin/ocamlfind install bytes ../META \ - bytes.cmi bytes.cma -optional \ - bytes.cmx bytes.cmxa bytes.a bytes.cmxs .include Index: head/devel/ocaml-findlib/files/patch-src__bytes__Makefile =================================================================== --- head/devel/ocaml-findlib/files/patch-src__bytes__Makefile (nonexistent) +++ head/devel/ocaml-findlib/files/patch-src__bytes__Makefile (revision 368811) @@ -0,0 +1,15 @@ +--- src/bytes/Makefile.orig 2014-09-16 11:21:46 UTC ++++ src/bytes/Makefile +@@ -19,9 +19,9 @@ + $(OCAMLBUILD) $$files + + install: all +- mkdir -p "$(prefix)$(OCAML_SITELIB)/bytes" +- cd _build/ && cp ../META $(BYTE_FILES) "$(prefix)$(OCAML_SITELIB)/bytes" +- cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(prefix)$(OCAML_SITELIB)/bytes"; fi; done ++ mkdir -p "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes" ++ cd _build/ && cp ../META $(BYTE_FILES) "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes" ++ cd _build/ && for f in $(NATIVE_FILES) $(NATIVE_FILES_DYNLINK); do if [ -f "$$f" ]; then cp $$f "$(DESTDIR)$(prefix)$(OCAML_SITELIB)/bytes"; fi; done + + uninstall: + rm -rf "$(prefix)$(OCAML_SITELIB)/bytes" Property changes on: head/devel/ocaml-findlib/files/patch-src__bytes__Makefile ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile =================================================================== --- head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile (revision 368810) +++ head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile (revision 368811) @@ -1,12 +1,12 @@ --- src/findlib-toolbox/Makefile.orig 2014-06-25 12:23:06.000000000 +0200 +++ src/findlib-toolbox/Makefile 2014-06-28 20:52:29.000000000 +0200 @@ -13,7 +13,8 @@ make_wizard$(EXEC_SUFFIX): make_wizard.m findlib.cma make_wizard.ml install: - cp make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(prefix)$(OCAML_SITELIB)/findlib -+ ${MKDIR} -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib ++ mkdir -p $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib + ${BSD_INSTALL_DATA} make_wizard$(EXEC_SUFFIX) make_wizard.pattern $(DESTDIR)$(prefix)$(OCAML_SITELIB)/findlib # uninstall: Nothing to do, because the removal of the findlib core also # deinstalls the make_wizard