From owner-svn-ports-head@FreeBSD.ORG Mon Sep 22 06:39:47 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id E6940C5B; Mon, 22 Sep 2014 06:39:46 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id C68D4289; Mon, 22 Sep 2014 06:39:46 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8M6dkoi079053; Mon, 22 Sep 2014 06:39:46 GMT (envelope-from antoine@FreeBSD.org) Received: (from antoine@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8M6dkD7079050; Mon, 22 Sep 2014 06:39:46 GMT (envelope-from antoine@FreeBSD.org) Message-Id: <201409220639.s8M6dkD7079050@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: antoine set sender to antoine@FreeBSD.org using -f From: Antoine Brodin Date: Mon, 22 Sep 2014 06:39:46 +0000 (UTC) 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 X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 22 Sep 2014 06:39:47 -0000 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 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