Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id B9DBD7A218 for ; Sat, 25 Jun 2016 14:47:55 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 6090485F47; Sat, 25 Jun 2016 14:47:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id E403285F18 for ; Sat, 25 Jun 2016 14:47:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id N0cteaQlEZkV for ; Sat, 25 Jun 2016 14:47:54 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 49CAA85EF8 for ; Sat, 25 Jun 2016 14:47:54 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 4183BFBB5; Sat, 25 Jun 2016 14:47:54 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1466866074270540" MIME-Version: 1.0 Date: Sat, 25 Jun 2016 14:47:54 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/devel/ocaml-ppx_optcomp To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20160625144754.4183BFBB5@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1466866074270540 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Sat Jun 25 14:47:54 UTC 2016 Modified Files: pkgsrc/devel/ocaml-ppx_optcomp: Makefile PLIST distinfo Added Files: pkgsrc/devel/ocaml-ppx_optcomp/patches: patch-Makefile Log Message: Updated package to latest version, 113.33.00 and made it compatible with ocaml 4.03 and the latest framework version. Discussed on packages@ and OK'd by jperkin. Changes include: ## 113.33.00+4.03 Various updates to work with OCaml 4.03.0 ## 113.33.00 - Install standalone ppx-optcomp program that can be run through `-pp` To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_optcomp/Makefile cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_optcomp/PLIST \ pkgsrc/devel/ocaml-ppx_optcomp/distinfo cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1466866074270540 Content-Disposition: inline Content-Length: 4509 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ocaml-ppx_optcomp/Makefile diff -u pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.3 pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.4 --- pkgsrc/devel/ocaml-ppx_optcomp/Makefile:1.3 Thu Jun 9 06:23:38 2016 +++ pkgsrc/devel/ocaml-ppx_optcomp/Makefile Sat Jun 25 14:47:54 2016 @@ -1,10 +1,9 @@ -# $NetBSD: Makefile,v 1.3 2016/06/09 06:23:38 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2016/06/25 14:47:54 jaapb Exp $ -VERSION= 113.24.00 +VERSION= 113.33.00 GITHUB_PROJECT= ppx_optcomp +GITHUB_TAG= ${VERSION}+4.03 DISTNAME= ${GITHUB_PROJECT}-${VERSION} -PKGNAME= ${GITHUB_PROJECT}-${DISTNAME} -PKGREVISION= 1 PKGNAME= ocaml-${DISTNAME} CATEGORIES= devel MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} @@ -14,11 +13,13 @@ HOMEPAGE= https://github.com/janestreet/ COMMENT= Optional compilation for OCaml LICENSE= apache-2.0 +WRKSRC= ${WRKDIR}/${DISTNAME}-4.03 HAS_CONFIGURE= yes USE_LANGUAGES= # none -OCAML_USE_OASIS_DYNRUN= yes +OCAML_USE_FINDLIB= yes .include "../../mk/ocaml.mk" .include "../../devel/ocaml-ppx_core/buildlink3.mk" .include "../../devel/ocaml-ppx_tools/buildlink3.mk" +.include "../../devel/ocamlbuild/buildlink3.mk" .include "../../mk/bsd.pkg.mk" Index: pkgsrc/devel/ocaml-ppx_optcomp/PLIST diff -u pkgsrc/devel/ocaml-ppx_optcomp/PLIST:1.1 pkgsrc/devel/ocaml-ppx_optcomp/PLIST:1.2 --- pkgsrc/devel/ocaml-ppx_optcomp/PLIST:1.1 Fri Mar 4 15:29:40 2016 +++ pkgsrc/devel/ocaml-ppx_optcomp/PLIST Sat Jun 25 14:47:54 2016 @@ -1,9 +1,12 @@ -@comment $NetBSD: PLIST,v 1.1 2016/03/04 15:29:40 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:47:54 jaapb Exp $ +bin/ppx-optcomp ${OCAML_SITELIB}/ppx_optcomp/META ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.a +${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.annot ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cma ${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmi +${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmt +${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmti ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmx ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.cmxs -${OCAML_SITELIB}/ppx_optcomp/ppx_optcomp.mli Index: pkgsrc/devel/ocaml-ppx_optcomp/distinfo diff -u pkgsrc/devel/ocaml-ppx_optcomp/distinfo:1.1 pkgsrc/devel/ocaml-ppx_optcomp/distinfo:1.2 --- pkgsrc/devel/ocaml-ppx_optcomp/distinfo:1.1 Fri Mar 4 15:29:40 2016 +++ pkgsrc/devel/ocaml-ppx_optcomp/distinfo Sat Jun 25 14:47:54 2016 @@ -1,6 +1,7 @@ -$NetBSD: distinfo,v 1.1 2016/03/04 15:29:40 jaapb Exp $ +$NetBSD: distinfo,v 1.2 2016/06/25 14:47:54 jaapb Exp $ -SHA1 (ppx_optcomp-113.24.00.tar.gz) = 227eb2511fe83e399a8bf0bf9f2f60b0d0cbbd4b -RMD160 (ppx_optcomp-113.24.00.tar.gz) = 07d28ce202437b0c455c9ed86c3f85c8f7abe86f -SHA512 (ppx_optcomp-113.24.00.tar.gz) = b8a59d3d7bbd4a8a1bb48cf5e74583fd979b7c4ea0b790adced4e5c36f48ee1928844da11c7400a9df0ff62508d83a1aa625beeb95a0313b5917a2b4308bb874 -Size (ppx_optcomp-113.24.00.tar.gz) = 14615 bytes +SHA1 (ppx_optcomp-113.33.00.tar.gz) = 0232ac0352073bc05e401be2c7011fd55c538a08 +RMD160 (ppx_optcomp-113.33.00.tar.gz) = 818664cad171138dd739df8b897939dedcf9a0e6 +SHA512 (ppx_optcomp-113.33.00.tar.gz) = b20042d5a25ef4204fd26ba844c1a696577e3f68ace73f122487a64e8ce4138b71792b2bf094068e29a379179d88d2656931ae94bae9c5fcd8307fbdc97aa5c2 +Size (ppx_optcomp-113.33.00.tar.gz) = 16814 bytes +SHA1 (patch-Makefile) = f55b9c7fe4d6d0cb68e3a66d934a9c8f0fe863a4 Added files: Index: pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-Makefile diff -u /dev/null pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-Makefile:1.1 --- /dev/null Sat Jun 25 14:47:54 2016 +++ pkgsrc/devel/ocaml-ppx_optcomp/patches/patch-Makefile Sat Jun 25 14:47:54 2016 @@ -0,0 +1,23 @@ +$NetBSD: patch-Makefile,v 1.1 2016/06/25 14:47:54 jaapb Exp $ + +Install in correct location +--- Makefile.orig 2016-03-22 14:13:51.000000000 +0000 ++++ Makefile +@@ -2,7 +2,7 @@ + + SETUP := setup.exe + NAME := ppx_optcomp +-PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2) ++#PREFIX = $(shell grep ^prefix= setup.data | cut -d\" -f 2) + + # Default rule + default: build +@@ -30,7 +30,7 @@ $(NAME).install: js-utils/gen_install.ml + ocaml -I js-utils js-utils/gen_install.ml + + install: $(NAME).install +- opam-installer -i --prefix $(PREFIX) $(NAME).install ++ opam-installer -i --prefix ${DESTDIR}$(PREFIX) --libdir ${OCAML_SITELIBDIR} $(NAME).install + + uninstall: $(NAME).install + opam-installer -u --prefix $(PREFIX) $(NAME).install --_----------=_1466866074270540--