From owner-svn-ports-all@FreeBSD.ORG Fri Jul 11 13:47:04 2014 Return-Path: Delivered-To: svn-ports-all@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 83D7B17E; Fri, 11 Jul 2014 13:47:04 +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 559742AC9; Fri, 11 Jul 2014 13:47:04 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6BDl4Vu084846; Fri, 11 Jul 2014 13:47:04 GMT (envelope-from vanilla@svn.freebsd.org) Received: (from vanilla@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6BDl3Yq084844; Fri, 11 Jul 2014 13:47:03 GMT (envelope-from vanilla@svn.freebsd.org) Message-Id: <201407111347.s6BDl3Yq084844@svn.freebsd.org> From: "Vanilla I. Shu" Date: Fri, 11 Jul 2014 13:47:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r361533 - head/devel/ocaml-ounit X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 11 Jul 2014 13:47:04 -0000 Author: vanilla Date: Fri Jul 11 13:47:03 2014 New Revision: 361533 URL: http://svnweb.freebsd.org/changeset/ports/361533 QAT: https://qat.redports.org/buildarchive/r361533/ Log: 1: Stagify. 2: switch to OCAML_* variables. Modified: head/devel/ocaml-ounit/Makefile head/devel/ocaml-ounit/pkg-plist Modified: head/devel/ocaml-ounit/Makefile ============================================================================== --- head/devel/ocaml-ounit/Makefile Fri Jul 11 13:24:16 2014 (r361532) +++ head/devel/ocaml-ounit/Makefile Fri Jul 11 13:47:03 2014 (r361533) @@ -11,29 +11,24 @@ PKGNAMEPREFIX= ocaml- MAINTAINER= ports@FreeBSD.org COMMENT= OCaml unit test framework -BUILD_DEPENDS= ocamlc:${PORTSDIR}/lang/ocaml \ - ocamlfind:${PORTSDIR}/devel/ocaml-findlib - USES= gmake - +USE_OCAML= yes +USE_OCAML_FINDLIB= yes +USE_OCAMLFIND_PLIST= yes +OCAML_PKGDIRS= oUnit DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} -PORTDOCS= README style.css *.html - ALL_TARGET= all allopt testall doc - MAKE_ENV= OCAMLFIND_DESTDIR=${PREFIX}/lib/ocaml/site-lib +OPTIONS_DEFINE= DOCS -NO_STAGE= yes post-install: -.if !defined(NOPORTDOCS) @${ECHO_MSG} "==> Installing port documentation for ${PKGORIGIN}..." - @${MKDIR} ${DOCSDIR} - @( cd ${WRKSRC}; ${INSTALL_DATA} README ${DOCSDIR} ) + @${MKDIR} ${STAGEDIR}${DOCSDIR} + @( cd ${WRKSRC}; ${INSTALL_DATA} README ${STAGEDIR}${DOCSDIR} ) @( cd ${WRKSRC}/doc; \ - ${INSTALL_DATA} style.css ${DOCSDIR}; \ + ${INSTALL_DATA} style.css ${STAGEDIR}${DOCSDIR}; \ for f in `${FIND} . -type f -name \\*.html -print`; do \ - ${INSTALL_DATA} $${f} ${DOCSDIR}; \ + ${INSTALL_DATA} $${f} ${STAGEDIR}${DOCSDIR}; \ done ) -.endif .include Modified: head/devel/ocaml-ounit/pkg-plist ============================================================================== --- head/devel/ocaml-ounit/pkg-plist Fri Jul 11 13:24:16 2014 (r361532) +++ head/devel/ocaml-ounit/pkg-plist Fri Jul 11 13:47:03 2014 (r361533) @@ -1,8 +1,15 @@ -lib/ocaml/site-lib/oUnit/oUnit.a -lib/ocaml/site-lib/oUnit/oUnit.cmxa -lib/ocaml/site-lib/oUnit/oUnit.cma -lib/ocaml/site-lib/oUnit/oUnit.cmi -lib/ocaml/site-lib/oUnit/oUnit.mli -lib/ocaml/site-lib/oUnit/META -@dirrm lib/ocaml/site-lib/oUnit -@unexec ocamlfind remove oUnit 2> /dev/null || true +%%PORTDOCS%%%%DOCSDIR%%/OUnit.html +%%PORTDOCS%%%%DOCSDIR%%/README +%%PORTDOCS%%%%DOCSDIR%%/index.html +%%PORTDOCS%%%%DOCSDIR%%/index_attributes.html +%%PORTDOCS%%%%DOCSDIR%%/index_class_types.html +%%PORTDOCS%%%%DOCSDIR%%/index_classes.html +%%PORTDOCS%%%%DOCSDIR%%/index_exceptions.html +%%PORTDOCS%%%%DOCSDIR%%/index_methods.html +%%PORTDOCS%%%%DOCSDIR%%/index_module_types.html +%%PORTDOCS%%%%DOCSDIR%%/index_modules.html +%%PORTDOCS%%%%DOCSDIR%%/index_types.html +%%PORTDOCS%%%%DOCSDIR%%/index_values.html +%%PORTDOCS%%%%DOCSDIR%%/style.css +%%PORTDOCS%%%%DOCSDIR%%/type_OUnit.html +%%PORTDOCS%%@dirrm %%DOCSDIR%%