From owner-svn-ports-head@FreeBSD.ORG Sun May 17 13:04:28 2015 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 27C47C6; Sun, 17 May 2015 13:04:28 +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 159891DB4; Sun, 17 May 2015 13:04:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t4HD4Rsm073534; Sun, 17 May 2015 13:04:27 GMT (envelope-from johans@FreeBSD.org) Received: (from johans@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t4HD4RE9073530; Sun, 17 May 2015 13:04:27 GMT (envelope-from johans@FreeBSD.org) Message-Id: <201505171304.t4HD4RE9073530@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: johans set sender to johans@FreeBSD.org using -f From: Johan van Selst Date: Sun, 17 May 2015 13:04:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r386609 - in head/lang/js_of_ocaml: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 17 May 2015 13:04:28 -0000 Author: johans Date: Sun May 17 13:04:26 2015 New Revision: 386609 URL: https://svnweb.freebsd.org/changeset/ports/386609 Log: Update js_of_ocaml to version 2.5 All the hard work for this update was done by John Marnino, but any bugs will be mine Submitted by: marino Deleted: head/lang/js_of_ocaml/files/patch-Makefile.conf Modified: head/lang/js_of_ocaml/Makefile head/lang/js_of_ocaml/distinfo head/lang/js_of_ocaml/files/patch-Makefile Modified: head/lang/js_of_ocaml/Makefile ============================================================================== --- head/lang/js_of_ocaml/Makefile Sun May 17 13:01:19 2015 (r386608) +++ head/lang/js_of_ocaml/Makefile Sun May 17 13:04:26 2015 (r386609) @@ -2,17 +2,19 @@ # $FreeBSD$ PORTNAME= js_of_ocaml -PORTVERSION= 1.3.2 +PORTVERSION= 2.5 CATEGORIES= lang -MASTER_SITES= http://ocsigen.org/download/ MAINTAINER= ports@FreeBSD.org COMMENT= OCaml to JavaScript compiler BUILD_DEPENDS= ocaml-lwt>=2.3.0:${PORTSDIR}/devel/ocaml-lwt \ - ${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen + menhir:${PORTSDIR}/devel/menhir \ + ${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen \ + ${SA_DIR}/cmdliner/cmdliner.a:${PORTSDIR}/devel/cmdliner/cmdliner RUN_DEPENDS= ocaml-lwt>=2.3.0:${PORTSDIR}/devel/ocaml-lwt \ - ${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen + ${SA_DIR}/deriving-ocsigen/deriving.a:${PORTSDIR}/devel/ocaml-deriving-ocsigen \ + ${SA_DIR}/cmdliner/cmdliner.a:${PORTSDIR}/devel/cmdliner/cmdliner SA_DIR= ${PREFIX}/${OCAML_SITELIBDIR} @@ -20,12 +22,21 @@ USES= gmake USE_OCAML= yes USE_OCAML_FINDLIB= yes USE_OCAML_LDCONFIG= yes +USE_OCAML_CAMLP4= yes USE_OCAMLFIND_PLIST= yes -PLIST_FILES+= bin/js_of_ocaml +USE_GITHUB= yes +GH_ACCOUNT= ocsigen +PLIST_FILES+= bin/js_of_ocaml bin/jsoo_minify bin/jsoo_mkcmis \ + bin/jsoo_mktop + +MAKE_JOBS_UNSAFE= yes MAKE_ENV+= BINDIR=${STAGEDIR}${PREFIX}/bin \ DESTDIR=${STAGEDIR} \ OCAML_SITELIBDIR=${PREFIX}/lib/ocaml/site-lib +post-patch: + @${REINPLACE_CMD} -e '/^BINDIR/d' ${WRKSRC}/Makefile.conf + .include Modified: head/lang/js_of_ocaml/distinfo ============================================================================== --- head/lang/js_of_ocaml/distinfo Sun May 17 13:01:19 2015 (r386608) +++ head/lang/js_of_ocaml/distinfo Sun May 17 13:04:26 2015 (r386609) @@ -1,2 +1,2 @@ -SHA256 (js_of_ocaml-1.3.2.tar.gz) = 5996d2a9bc32121186e1964af557bb411eb5a27aa155d2c6a8a144ee5f3d0c36 -SIZE (js_of_ocaml-1.3.2.tar.gz) = 1901593 +SHA256 (ocsigen-js_of_ocaml-2.5_GH0.tar.gz) = 5bea34f47210791b8bb89adb158ec9d47816ba074bfb11ee68f56be42c0235df +SIZE (ocsigen-js_of_ocaml-2.5_GH0.tar.gz) = 1249680 Modified: head/lang/js_of_ocaml/files/patch-Makefile ============================================================================== --- head/lang/js_of_ocaml/files/patch-Makefile Sun May 17 13:01:19 2015 (r386608) +++ head/lang/js_of_ocaml/files/patch-Makefile Sun May 17 13:04:26 2015 (r386609) @@ -1,14 +1,11 @@ -$NetBSD: patch-Makefile,v 1.2 2012/12/14 14:40:24 jaapb Exp $ - -Install to DESTDIR ---- Makefile.orig 2012-12-07 19:39:02.000000000 +0000 +--- Makefile.orig 2014-09-30 14:40:37 UTC +++ Makefile -@@ -31,7 +31,7 @@ include Makefile.filelist +@@ -47,7 +47,7 @@ VERSION := $(shell head -n 1 VERSION) + install: install-lib install-bin - VERSION := $(shell head -n 1 VERSION) - install: -- ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) -+ ocamlfind install -ldconf ignore -destdir ${DESTDIR}${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) - install -d -m 755 $(BINDIR) - install $(BIN) $(BINDIR) + install-lib: +- ocamlfind install -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) ++ ocamlfind install -ldconf ignore -destdir ${DESTDIR}${OCAML_SITELIBDIR} -patch-version ${VERSION} $(LIBRARY) lib/META $(INTF) $(IMPL) $(OTHERS) $(DOC) $(COMP_INTF) $(COMP_IMPL) + install-bin: + install -d -m 755 $(BINDIR)