svn commit: r349285 - head/devel/ocaml-react

[John Marino]

Author: marino
Date: Wed Mar 26 20:01:23 2014
New Revision: 349285
URL: http://svnweb.freebsd.org/changeset/ports/349285
QAT: https://qat.redports.org/buildarchive/r349285/

Log:
  devel/ocaml-react: Upgrade version 0.9.2 -> 0.9.4 and stage
  
  The maintainer patch worked out of the box, but it came from a time
  before staging.  Significant rework was necessary to provide stage
  support, but luckily Jaap already added this support for the pkgsrc
  version he maintains (also at devel/ocaml-react over there).
  
  PR:		ports/176057
  Submitted by:	maintainer (Jaap Boender)
  Stage support:	Taken from pkgsrc

Modified:
  head/devel/ocaml-react/Makefile
  head/devel/ocaml-react/distinfo
  head/devel/ocaml-react/pkg-plist

Modified: head/devel/ocaml-react/Makefile
==============================================================================
--- head/devel/ocaml-react/Makefile	Wed Mar 26 19:56:07 2014	(r349284)
+++ head/devel/ocaml-react/Makefile	Wed Mar 26 20:01:23 2014	(r349285)
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	react
-PORTVERSION=	0.9.2
-PORTREVISION=	1
+PORTVERSION=	0.9.4
 CATEGORIES=	devel
 MASTER_SITES=	http://erratique.ch/software/react/releases/
 PKGNAMEPREFIX=	ocaml-
@@ -12,6 +11,8 @@ EXTRACT_SUFX=	.tbz
 MAINTAINER=	jaapb at kerguelen.org
 COMMENT=	OCaml module for functional reactive programming
 
+LICENSE=	BSD3CLAUSE
+
 USE_OCAML=		yes
 .if defined (WITHOUT_X11)
 OCAMLC_DEPEND=		ocaml-notk>=3.11:${OCAMLC_PORT}
@@ -19,24 +20,23 @@ OCAMLC_DEPEND=		ocaml-notk>=3.11:${OCAML
 OCAMLC_DEPEND=		ocaml>=3.11:${OCAMLC_PORT}
 .endif
 
-USE_OCAML_LDCONFIG=	yes
+USE_OCAML_FINDLIB=	yes
+
+post-patch:
+	@${REINPLACE_CMD} -e 's,"install" :: findlib_name,"install" :: "-destdir ${STAGEDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,' \
+		${WRKSRC}/setup.ml
 
-NO_STAGE=	yes
-.include <bsd.port.pre.mk>
+do-configure:
+	@cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS}
 
 do-build:
-	@cd ${WRKSRC} && ${SH} ./build
+	(cd ${WRKSRC} && ocaml setup.ml -build)
+	(cd ${WRKSRC} && ocamlbuild src/react.cmxs)
 
 do-install:
-	@cd ${WRKSRC} && INSTALLDIR=${PREFIX}/lib/ocaml/site-lib/${PORTNAME} ${SH} ./build install-plugin
-
-pre-install:
-# For nonstandard prefixes
-.if !exists(${OCAMLFIND_DESTDIR})
-	${MKDIR} ${OCAMLFIND_DESTDIR}
-.endif
-.if !exists(${OCAMLFIND_LDCONF})
-	${TOUCH} ${OCAMLFIND_LDCONF}
-.endif
+	${MKDIR} ${STAGEDIR}${OCAMLFIND_DESTDIR}
+	(cd ${WRKSRC} && ocaml setup.ml -install)
+	${INSTALL_LIB} ${WRKSRC}/_build/src/react.cmxs \
+		${STAGEDIR}${OCAMLFIND_DESTDIR}/react
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>

Modified: head/devel/ocaml-react/distinfo
==============================================================================
--- head/devel/ocaml-react/distinfo	Wed Mar 26 19:56:07 2014	(r349284)
+++ head/devel/ocaml-react/distinfo	Wed Mar 26 20:01:23 2014	(r349285)
@@ -1,2 +1,2 @@
-SHA256 (react-0.9.2.tbz) = b953e50abbb5c4065eb17a50a02341d380eff32fe8cb309a40eca2ddddef2a3a
-SIZE (react-0.9.2.tbz) = 47337
+SHA256 (react-0.9.4.tbz) = 466ad4e2e7ff57c93c4e51511f53f2bdf32df46354458f4a158cd13bf3fbd4ab
+SIZE (react-0.9.4.tbz) = 82964

Modified: head/devel/ocaml-react/pkg-plist
==============================================================================
--- head/devel/ocaml-react/pkg-plist	Wed Mar 26 19:56:07 2014	(r349284)
+++ head/devel/ocaml-react/pkg-plist	Wed Mar 26 20:01:23 2014	(r349285)
@@ -1,11 +1,11 @@
 lib/ocaml/site-lib/react/META
+lib/ocaml/site-lib/react/react.a
+lib/ocaml/site-lib/react/react.cma
 lib/ocaml/site-lib/react/react.cmi
-lib/ocaml/site-lib/react/react.cmo
 lib/ocaml/site-lib/react/react.cmx
+lib/ocaml/site-lib/react/react.cmxa
 lib/ocaml/site-lib/react/react.cmxs
-lib/ocaml/site-lib/react/react.ml
 lib/ocaml/site-lib/react/react.mli
-lib/ocaml/site-lib/react/react.o
 @dirrm lib/ocaml/site-lib/react
 @dirrmtry lib/ocaml/site-lib
 @dirrmtry lib/ocaml