CVS commit: pkgsrc/devel/ocaml-ppx_driver

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/devel/ocaml-ppx_driver
From: "Jaap Boender" <jaapb%netbsd.org@localhost>
Date: Mon, 20 Jun 2016 18:52:41 +0000

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Mon Jun 20 18:52:41 UTC 2016

Modified Files:
        pkgsrc/devel/ocaml-ppx_driver: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/ocaml-ppx_driver/patches: patch-Makefile

Log Message:
Updated package to latest version, 113.33.01. Changes include:

## 113.33.01+4.03

Remove hack which prevented empty value bindings to leak. We fixed the
generators so they don't create them in the first place.

## 113.33.00+4.03

Various updates to work with OCaml 4.03.0


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-ppx_driver/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-ppx_driver/PLIST \
    pkgsrc/devel/ocaml-ppx_driver/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-ppx_driver/patches/patch-Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-ppx_driver/Makefile
diff -u pkgsrc/devel/ocaml-ppx_driver/Makefile:1.3 pkgsrc/devel/ocaml-ppx_driver/Makefile:1.4
--- pkgsrc/devel/ocaml-ppx_driver/Makefile:1.3  Thu Jun  9 06:23:38 2016
+++ pkgsrc/devel/ocaml-ppx_driver/Makefile      Mon Jun 20 18:52:40 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/20 18:52:40 jaapb Exp $
 
-VERSION=       113.24.00
+VERSION=       113.33.01
 GITHUB_PROJECT=        ppx_driver
+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,10 +13,14 @@ HOMEPAGE=   https://github.com/janestreet/
 COMMENT=       Feature-full driver for OCaml AST transformers
 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-oasis/buildlink3.mk"
 .include "../../devel/ocaml-ppx_optcomp/buildlink3.mk"
+.include "../../devel/ocamlbuild/buildlink3.mk"
+.include "../../misc/ocaml-opam/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-ppx_driver/PLIST
diff -u pkgsrc/devel/ocaml-ppx_driver/PLIST:1.1 pkgsrc/devel/ocaml-ppx_driver/PLIST:1.2
--- pkgsrc/devel/ocaml-ppx_driver/PLIST:1.1     Fri Mar  4 15:33:50 2016
+++ pkgsrc/devel/ocaml-ppx_driver/PLIST Mon Jun 20 18:52:40 2016
@@ -1,33 +1,36 @@
-@comment $NetBSD: PLIST,v 1.1 2016/03/04 15:33:50 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2016/06/20 18:52:40 jaapb Exp $
 ${OCAML_SITELIB}/ppx_driver/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.a
+${OCAML_SITELIB}/ppx_driver/ppx_driver.annot
 ${OCAML_SITELIB}/ppx_driver/ppx_driver.cma
 ${OCAML_SITELIB}/ppx_driver/ppx_driver.cmi
+${OCAML_SITELIB}/ppx_driver/ppx_driver.cmt
+${OCAML_SITELIB}/ppx_driver/ppx_driver.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.cmx
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver.cmxs
-${OCAML_SITELIB}/ppx_driver/ppx_driver.mli
-${OCAML_SITELIB}/ppx_driver_ocamlbuild/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.a
-${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.cma
-${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.cmxs
-${OCAML_SITELIB}/ppx_driver_ocamlbuild/ppx_driver_ocamlbuild.mli
-${OCAML_SITELIB}/ppx_driver_runner/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.a
-${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.cma
-${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.cmxs
-${OCAML_SITELIB}/ppx_driver_runner/ppx_driver_runner.ml
-${OCAML_SITELIB}/ppx_driver_runner_as_ppx/META
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.a
-${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.cma
-${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.cmi
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.cmx
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.cmxs
-${OCAML_SITELIB}/ppx_driver_runner_as_ppx/ppx_driver_runner_as_ppx.ml
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.a
+${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.annot
+${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cma
+${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmi
+${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmt
+${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmti
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_ocamlbuild.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.a
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.annot
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cma
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmi
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.a
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.annot
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cma
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmi
+${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_driver/ppx_driver_runner_as_ppx.cmxs
Index: pkgsrc/devel/ocaml-ppx_driver/distinfo
diff -u pkgsrc/devel/ocaml-ppx_driver/distinfo:1.1 pkgsrc/devel/ocaml-ppx_driver/distinfo:1.2
--- pkgsrc/devel/ocaml-ppx_driver/distinfo:1.1  Fri Mar  4 15:33:50 2016
+++ pkgsrc/devel/ocaml-ppx_driver/distinfo      Mon Jun 20 18:52:40 2016
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2016/03/04 15:33:50 jaapb Exp $
+$NetBSD: distinfo,v 1.2 2016/06/20 18:52:40 jaapb Exp $
 
-SHA1 (ppx_driver-113.24.00.tar.gz) = dd1d51d7f503d736b7b2a663d2306127b1e2336a
-RMD160 (ppx_driver-113.24.00.tar.gz) = de0c549d9a148f7a4d9793c5ba62f4d250a7039c
-SHA512 (ppx_driver-113.24.00.tar.gz) = 9006ae89bfa3c63f179d4a15ee3ef117eb92b8b4d6301f620b11cd3e6395b2440088f292450873c217caf6b033f5bf5c057700c0223c587458d1286304cbe877
-Size (ppx_driver-113.24.00.tar.gz) = 15463 bytes
+SHA1 (ppx_driver-113.33.01.tar.gz) = 5542d2bae51847a751e1e874b89f512a65d708cc
+RMD160 (ppx_driver-113.33.01.tar.gz) = 846c7a04c6788667e8b76188af58e4ae8885e9bc
+SHA512 (ppx_driver-113.33.01.tar.gz) = 6c7bd5f5e03ac455dd505f7956e8102055c5647d00afeda388eb68b79690f1b776ecf9aaa1accde11855e85f8aac0cc7545c4340c7fe53d25d39f2e499e43203
+Size (ppx_driver-113.33.01.tar.gz) = 16096 bytes
+SHA1 (patch-Makefile) = 0ca746d76725a5250b4eff099a24b26d66fc3e8d

Added files:

Index: pkgsrc/devel/ocaml-ppx_driver/patches/patch-Makefile
diff -u /dev/null pkgsrc/devel/ocaml-ppx_driver/patches/patch-Makefile:1.1
--- /dev/null   Mon Jun 20 18:52:41 2016
+++ pkgsrc/devel/ocaml-ppx_driver/patches/patch-Makefile        Mon Jun 20 18:52:40 2016
@@ -0,0 +1,23 @@
+$NetBSD: patch-Makefile,v 1.1 2016/06/20 18:52:40 jaapb Exp $
+
+Install into the correct location
+--- Makefile.orig      2016-04-18 10:12:27.000000000 +0000
++++ Makefile
+@@ -2,7 +2,7 @@
+ 
+ SETUP := setup.exe
+ NAME := ppx_driver
+-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

Prev by Date: Re: CVS commit: pkgsrc/mk
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/devel/ocaml-ppx_core
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index