Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 11 Jul 2014 12:55:45 +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: r361528 - head/textproc/ocaml-expat
Message-ID:  <201407111255.s6BCtjMU060630@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: vanilla
Date: Fri Jul 11 12:55:44 2014
New Revision: 361528
URL: http://svnweb.freebsd.org/changeset/ports/361528
QAT: https://qat.redports.org/buildarchive/r361528/

Log:
  1: Stagify.
  2: new syntax of LIB_DEPENDS.
  3: remove pkg-install.

Added:
  head/textproc/ocaml-expat/pkg-plist   (contents, props changed)
Deleted:
  head/textproc/ocaml-expat/pkg-install
Modified:
  head/textproc/ocaml-expat/Makefile

Modified: head/textproc/ocaml-expat/Makefile
==============================================================================
--- head/textproc/ocaml-expat/Makefile	Fri Jul 11 12:54:22 2014	(r361527)
+++ head/textproc/ocaml-expat/Makefile	Fri Jul 11 12:55:44 2014	(r361528)
@@ -1,45 +1,31 @@
 # Created by: Marwan Burelle <marwan.burelle@lri.fr
 # $FreeBSD$
 
-PORTNAME=	ocaml-expat
+PORTNAME=	expat
 PORTVERSION=	0.9.1
 PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://www.xs4all.nl/~mmzeeman/ocaml/
+PKGNAMEPREFIX=	ocaml-
+DISTNAME=	${PKGNAMEPREFIX}${PORTNAME}-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A stub for the expat parser in OCaml
 
-BUILD_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-RUN_DEPENDS=	ocamlc:${PORTSDIR}/lang/ocaml \
-		ocamlfind:${PORTSDIR}/devel/ocaml-findlib
-LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
+LIB_DEPENDS=	libexpat.so:${PORTSDIR}/textproc/expat2
 
 USES=		gmake
+USE_OCAML=	yes
+USE_OCAML_FINDLIB=	yes
+USE_OCAML_LDCONFIG=	yes
 MAKE_ARGS=	EXPAT_LIBDIR=${LOCALBASE}/lib \
 		EXPAT_INCDIR=${LOCALBASE}/include \
 		CAML_INCDIR=${LOCALBASE}/lib/ocaml
+ALL_TARGET=	all allopt doc
+OPTIONS_DEFINE=	DOCS
 
-ALL_TARGET=	all allopt
-
-.if !defined(NOPORTDOCS)
-ALL_TARGET+=	doc
-PORTDOCS=	*
-.endif
-
-PKGDEINSTALL=	${PKGINSTALL}
-
-NO_STAGE=	yes
 post-install:
-	@${FIND} ${PREFIX}/lib/ocaml/site-lib/expat -type f | \
-		${SED} "s,^${PREFIX}/,," >> ${TMPPLIST}
-	@${ECHO_CMD} "@dirrm lib/ocaml/site-lib/expat" >> ${TMPPLIST}
-	@${ECHO_CMD} "@unexec ocamlfind remove expat 2>/dev/null || true" >> ${TMPPLIST}
-	PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
-.if !defined(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/doc/* ${DOCSDIR}
-.endif
+	@${MKDIR} ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/doc/* ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>

Added: head/textproc/ocaml-expat/pkg-plist
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/textproc/ocaml-expat/pkg-plist	Fri Jul 11 12:55:44 2014	(r361528)
@@ -0,0 +1,24 @@
+%%OCAML_SITELIBDIR%%/expat/META
+%%OCAML_SITELIBDIR%%/expat/dllmlexpat.so
+%%OCAML_SITELIBDIR%%/expat/expat.a
+%%OCAML_SITELIBDIR%%/expat/expat.cma
+%%OCAML_SITELIBDIR%%/expat/expat.cmi
+%%OCAML_SITELIBDIR%%/expat/expat.cmxa
+%%OCAML_SITELIBDIR%%/expat/expat.mli
+%%OCAML_SITELIBDIR%%/expat/libmlexpat.a
+%%PORTDOCS%%%%DOCSDIR%%/Expat.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_Expat.html
+@dirrmtry %%OCAML_SITELIBDIR%%/expat
+%%PORTDOCS%%@dirrm %%DOCSDIR%%



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