1: Stagify.

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

3 files changed, 35 insertions, 34 deletions

diff --git a/textproc/ocaml-expat/Makefile b/textproc/ocaml-expat/Makefile
index f853e1e66820..70b6098d9f2f 100644
--- a/textproc/ocaml-expat/Makefile
+++ b/textproc/ocaml-expat/Makefile
@@ -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>
diff --git a/textproc/ocaml-expat/pkg-install b/textproc/ocaml-expat/pkg-install
deleted file mode 100644
index 7fb2bdcc5f86..000000000000
--- a/textproc/ocaml-expat/pkg-install
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if [ "$2" = "POST-INSTALL" ]; then
-  echo "${PKG_PREFIX}/lib/ocaml/site-lib/expat" >> ${PKG_PREFIX}/lib/ocaml/ld.conf
-elif [ "$2" = "DEINSTALL" ]; then
-  mv ${PKG_PREFIX}/lib/ocaml/ld.conf ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-  grep -v expat ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp > ${PKG_PREFIX}/lib/ocaml/ld.conf
-  rm -f ${PKG_PREFIX}/lib/ocaml/ld.conf.tmp
-fi
diff --git a/textproc/ocaml-expat/pkg-plist b/textproc/ocaml-expat/pkg-plist
new file mode 100644
index 000000000000..22983ba622f9
--- /dev/null
+++ b/textproc/ocaml-expat/pkg-plist
@@ -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%%