Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jul 2014 13:47:03 +0000 (UTC)
From:      "Vanilla I. Shu" <vanilla@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r361533 - head/devel/ocaml-ounit
Message-ID:  <201407111347.s6BDl3Yq084844@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
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 <bsd.port.mk>

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%%



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201407111347.s6BDl3Yq084844>