Date: Mon, 22 Sep 2014 06:39:46 +0000 (UTC) From: Antoine Brodin <antoine@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r368811 - in head/devel/ocaml-findlib: . files Message-ID: <201409220639.s8M6dkD7079050@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: antoine Date: Mon Sep 22 06:39:45 2014 New Revision: 368811 URL: http://svnweb.freebsd.org/changeset/ports/368811 QAT: https://qat.redports.org/buildarchive/r368811/ Log: Allow staging as a regular user Added: head/devel/ocaml-findlib/files/patch-src__bytes__Makefile (contents, props changed) Modified: head/devel/ocaml-findlib/Makefile head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile Modified: head/devel/ocaml-findlib/Makefile ============================================================================== --- head/devel/ocaml-findlib/Makefile Mon Sep 22 06:30:47 2014 (r368810) +++ head/devel/ocaml-findlib/Makefile Mon Sep 22 06:39:45 2014 (r368811) @@ -43,12 +43,5 @@ post-install: 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 <bsd.port.mk> Added: head/devel/ocaml-findlib/files/patch-src__bytes__Makefile ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ocaml-findlib/files/patch-src__bytes__Makefile Mon Sep 22 06:39:45 2014 (r368811) @@ -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" Modified: head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile ============================================================================== --- head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile Mon Sep 22 06:30:47 2014 (r368810) +++ head/devel/ocaml-findlib/files/patch-src_findlib-toolbox_Makefile Mon Sep 22 06:39:45 2014 (r368811) @@ -5,7 +5,7 @@ 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409220639.s8M6dkD7079050>