From owner-svn-ports-all@FreeBSD.ORG Wed Mar 26 22:51:34 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id B048A301; Wed, 26 Mar 2014 22:51:34 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 9C4988FD; Wed, 26 Mar 2014 22:51:34 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2QMpYER032345; Wed, 26 Mar 2014 22:51:34 GMT (envelope-from marino@svn.freebsd.org) Received: (from marino@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2QMpYM6032343; Wed, 26 Mar 2014 22:51:34 GMT (envelope-from marino@svn.freebsd.org) Message-Id: <201403262251.s2QMpYM6032343@svn.freebsd.org> From: John Marino Date: Wed, 26 Mar 2014 22:51:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r349303 - head/devel/ocaml-lwt X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 26 Mar 2014 22:51:34 -0000 Author: marino Date: Wed Mar 26 22:51:33 2014 New Revision: 349303 URL: http://svnweb.freebsd.org/changeset/ports/349303 QAT: https://qat.redports.org/buildarchive/r349303/ Log: devel/ocaml-lwt: Upgrade from 1.1.0 -> 2.4.3 and support stage This is a major update. The PR was followed, but it came pre-stage era. The staging came from pkgsrc where the maintainer maintains the same DESTDIR-enabled package. PR: ports/176061 Submitted by: maintainer (Jaap Boender) Stage support: Taken from pkgsrc Modified: head/devel/ocaml-lwt/Makefile head/devel/ocaml-lwt/distinfo Modified: head/devel/ocaml-lwt/Makefile ============================================================================== --- head/devel/ocaml-lwt/Makefile Wed Mar 26 22:36:46 2014 (r349302) +++ head/devel/ocaml-lwt/Makefile Wed Mar 26 22:51:33 2014 (r349303) @@ -2,39 +2,77 @@ # $FreeBSD$ 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 COMMENT= Cooperative threading library for OCaml +LICENSE= LGPL21 + +BUILD_DEPENDS= ${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \ + ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl +RUN_DEPENDS= ${SA_DIR}/react/react.a:${PORTSDIR}/devel/ocaml-react \ + ${SA_DIR}/ssl/ssl.a:${PORTSDIR}/security/ocaml-ssl + MAKE_JOBS_UNSAFE= yes +USES= gmake 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 +HAS_CONFIGURE= yes +CONFIGURE_ARGS= --destdir "${STAGEDIR}" \ + --prefix "${PREFIX}" \ + --enable-ssl \ + --enable-react \ + --disable-libev \ + --disable-glib -USE_GMAKE= yes 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 - SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR} -NO_STAGE= yes -.include +OPTIONS_DEFINE= TOPLEVEL +OPTIONS_DEFAULT= TOPLEVEL +TOPLEVEL_DESC= Include enhanced OCaml toplevel + +.include + +.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 +PLIST_FILES= bin/lwt-toplevel +.else +CONFIGURE_ARGS+= --disable-toplevel --disable-text +.endif -post-install: -.if !defined(NOPORTDOCS) - ${MKDIR} ${DOCSDIR} - ${INSTALL_MAN} ${WRKSRC}/_build/lwt.docdir/* ${DOCSDIR} +.if ${PORT_OPTIONS:MDOCS} +CONFIGURE_ARGS+= --enable-docs --docdir ${STAGEDIR}${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 -.include +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 + +do-configure: + (cd ${WRKSRC}; ocaml setup.ml -configure ${CONFIGURE_ARGS}) + @${REINPLACE_CMD} -e 's%"-lev"%"-lev -L${PREFIX}/lib/ev -Wl,-R${PREFIX}/lib/ev"%' \ + ${WRKSRC}/setup.data + +do-build: + (cd ${WRKSRC}; ocaml setup.ml -build) + +do-install: + ${MKDIR} ${STAGEDIR}${SA_DIR} + (cd ${WRKSRC}; ocaml setup.ml -install) + +.include Modified: head/devel/ocaml-lwt/distinfo ============================================================================== --- head/devel/ocaml-lwt/distinfo Wed Mar 26 22:36:46 2014 (r349302) +++ head/devel/ocaml-lwt/distinfo Wed Mar 26 22:51:33 2014 (r349303) @@ -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