Date: Tue, 12 Feb 2013 10:20:33 GMT From: Jaap Boender <jaapb@kerguelen.org> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/176061: [maintainer update] devel/ocaml-lwt to 2.4.3 Message-ID: <201302121020.r1CAKX3h055557@red.freebsd.org> Resent-Message-ID: <201302121030.r1CAU05g051598@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 176061
>Category: ports
>Synopsis: [maintainer update] devel/ocaml-lwt to 2.4.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 12 10:30:00 UTC 2013
>Closed-Date:
>Last-Modified:
>Originator: Jaap Boender
>Release: 9.1-RELEASE
>Organization:
>Environment:
FreeBSD purcell.mdx.ac.uk 9.1-RELEASE FreeBSD 9.1-RELEASE #0 r243825: Tue Dec 4 09:23:10 UTC 2012 root@farrell.cse.buffalo.edu:/usr/obj/usr/src/sys/GENERIC amd64
>Description:
This is an update of devel/ocaml-lwt to its latest version, 2.4.3. As can be expected with such a big version change, the list of changes is huge (see ${WRKSRC}/lwt-2.4.3/CHANGES for more details).
It might be necessary to incorporate ports/176060 first, otherwise the dependency textproc/ocaml-text might not build (this was the case on my system).
>How-To-Repeat:
n/a
>Fix:
result of svn diff included.
Patch attached with submission follows:
Index: Makefile
===================================================================
--- Makefile (revision 311755)
+++ Makefile (working copy)
@@ -6,10 +6,9 @@
#
PORTNAME= lwt
-PORTVERSION= 1.1.0
-PORTREVISION= 1
+PORTVERSION= 2.4.3
CATEGORIES= devel
-MASTER_SITES= http://www.ocsigen.org/download/
+MASTER_SITES= http://ocsigen.org/download/
PKGNAMEPREFIX= ocaml-
MAINTAINER= jaapb@kerguelen.org
@@ -18,26 +17,52 @@
MAKE_JOBS_UNSAFE= yes
USE_OCAML= yes
-OCAMLC_DEPEND= ocaml>=3.10:${OCAMLC_PORT}
+OCAMLC_DEPEND= ocaml>=3.11:${OCAMLC_PORT}
USE_OCAML_FINDLIB= yes
USE_OCAMLFIND_PLIST= yes
USE_OCAML_LDCONFIG= yes
USE_GMAKE= yes
+
+HAS_CONFIGURE= yes
+CONFIGURE_ARGS= --enable-ssl --enable-react --disable-libev \
+ --disable-glib
+
DOCSDIR= ${PREFIX}/share/doc/ocaml/${PORTNAME}
-PORTDOCS= *
-BUILD_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
-RUN_DEPENDS+= ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
+.if !defined(NOPORTDOCS)
+CONFIGURE_ARGS+= --enable-docs --docdir ${DOCSDIR}
+# For some reason, ocaml-text is needed when building documentation
+BUILD_DEPENDS+ ${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
+RUN_DEPENDS+ ${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
+.else
+CONFIGURE_ARGS+= --disable-docs
+.endif
+BUILD_DEPENDS= ${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \
+ ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl
+RUN_DEPENDS= ${BUILD_DEPENDS}
+
SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR}
-.include <bsd.port.pre.mk>
+OPTIONS_DEFINE= TOPLEVEL
+TOPLEVEL_DESC= Include enhanced OCaml toplevel
-post-install:
-.if !defined(NOPORTDOCS)
- ${MKDIR} ${DOCSDIR}
- ${INSTALL_MAN} ${WRKSRC}/_build/lwt.docdir/* ${DOCSDIR}
+OPTIONS_DEFAULT= TOPLEVEL
+
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MTOPLEVEL}
+CONFIGURE_ARGS+= --enable-toplevel --enable-text
+BUILD_DEPENDS+ ${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
+RUN_DEPENDS+ ${SA_DIR}/text/text.a:${PORTSDIR}/textproc/ocaml-text
+.else
+CONFIGURE_ARGS+= --disable-toplevel --disable-text
.endif
+.include <bsd.port.pre.mk>
+
+do-configure:
+ @cd ${WRKSRC} && ocaml setup.ml -configure ${CONFIGURE_ARGS}
+
.include <bsd.port.post.mk>
Index: distinfo
===================================================================
--- distinfo (revision 311755)
+++ distinfo (working copy)
@@ -1,2 +1,2 @@
-SHA256 (lwt-1.1.0.tar.gz) = 6c9087e1185de933091fcd147f1c125157b01921d32ca0e2304319c2d72ee9d6
-SIZE (lwt-1.1.0.tar.gz) = 32844
+SHA256 (lwt-2.4.3.tar.gz) = efee23937750290d6dee96eed6c0bbdb19817d5be6eefcba61ac5031fac10107
+SIZE (lwt-2.4.3.tar.gz) = 504000
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201302121020.r1CAKX3h055557>