diff options
author | jaapb <jaapb@pkgsrc.org> | 2016-08-18 11:23:48 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2016-08-18 11:23:48 +0000 |
commit | 17d2d50aba21ffa1be8102ed5b362e4364cd4fc4 (patch) | |
tree | 95bc9962ea8f44630791d5151c8d7eacbf8e1822 /devel | |
parent | efb90d5c5823bf8b8ca6b71950804337043a13bf (diff) | |
download | pkgsrc-17d2d50aba21ffa1be8102ed5b362e4364cd4fc4.tar.gz |
Updated package to unreleased version, 114.01+04. This was necessary
because the version in pkgsrc currently does not compile, and the changes
needed are not yet in the release.
Changes include:
* Use the new context-free API
* Change a behavior in ppx_type_conv: attributes inside the type definition
such as @default are not removed. This is not really a big deal as we still
check that they are used. We could restore this bevavior with a full pass
at the end to remove used attributes.
Diffstat (limited to 'devel')
-rw-r--r-- | devel/ocaml-ppx_type_conv/Makefile | 17 | ||||
-rw-r--r-- | devel/ocaml-ppx_type_conv/PLIST | 6 | ||||
-rw-r--r-- | devel/ocaml-ppx_type_conv/distinfo | 12 | ||||
-rw-r--r-- | devel/ocaml-ppx_type_conv/patches/patch-Makefile | 23 |
4 files changed, 21 insertions, 37 deletions
diff --git a/devel/ocaml-ppx_type_conv/Makefile b/devel/ocaml-ppx_type_conv/Makefile index 0319ed9e78a..c8c2cd2399e 100644 --- a/devel/ocaml-ppx_type_conv/Makefile +++ b/devel/ocaml-ppx_type_conv/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.4 2016/06/20 19:06:29 jaapb Exp $ +# $NetBSD: Makefile,v 1.5 2016/08/18 11:23:48 jaapb Exp $ -VERSION= 113.33.01 +VERSION= 114.01+04 GITHUB_PROJECT= ppx_type_conv -GITHUB_TAG= ${VERSION}+4.03 +GITHUB_TAG= f481969 DISTNAME= ${GITHUB_PROJECT}-${VERSION} PKGNAME= ocaml-${DISTNAME} CATEGORIES= devel @@ -13,16 +13,19 @@ HOMEPAGE= https://github.com/janestreet/ppx_type_conv/ COMMENT= Support library for type-driven code generators LICENSE= apache-2.0 -WRKSRC= ${WRKDIR}/${DISTNAME}-4.03 +WRKSRC= ${WRKDIR}/${GITHUB_PROJECT}-f4819697dc28759dd9a5b71e876bb6c0cfce0944 HAS_CONFIGURE= yes USE_LANGUAGES= # none -OCAML_USE_FINDLIB= yes +OCAML_USE_OASIS_DYNRUN= yes + +post-extract: + ${MV} ${WRKSRC}/META.ab ${WRKSRC}/src .include "../../mk/ocaml.mk" -.include "../../devel/ocaml-oasis/buildlink3.mk" +#.include "../../devel/ocaml-oasis/buildlink3.mk" .include "../../devel/ocaml-ppx_deriving/buildlink3.mk" .include "../../devel/ocaml-ppx_driver/buildlink3.mk" .include "../../devel/ocaml-ppx_tools/buildlink3.mk" .include "../../devel/ocamlbuild/buildlink3.mk" -.include "../../misc/ocaml-opam/buildlink3.mk" +#.include "../../misc/ocaml-opam/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/ocaml-ppx_type_conv/PLIST b/devel/ocaml-ppx_type_conv/PLIST index f1c7338d406..c5f0f6abf7c 100644 --- a/devel/ocaml-ppx_type_conv/PLIST +++ b/devel/ocaml-ppx_type_conv/PLIST @@ -1,8 +1,9 @@ -@comment $NetBSD: PLIST,v 1.2 2016/06/20 19:06:29 jaapb Exp $ +@comment $NetBSD: PLIST,v 1.3 2016/08/18 11:23:48 jaapb Exp $ ${OCAML_SITELIB}/ppx_type_conv/META ${OCAML_SITELIB}/ppx_type_conv/ignore_unused_warning.annot ${OCAML_SITELIB}/ppx_type_conv/ignore_unused_warning.cmt ${OCAML_SITELIB}/ppx_type_conv/ignore_unused_warning.cmti +${OCAML_SITELIB}/ppx_type_conv/ignore_unused_warning.mli ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv.a ${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv.cma ${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv.cmi @@ -18,8 +19,11 @@ ${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv_deriving.cmt ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv_deriving.cmx ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv_deriving.cmxa ${PLIST.ocaml-opt}${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv_deriving.cmxs +${OCAML_SITELIB}/ppx_type_conv/ppx_type_conv_deriving.ml ${OCAML_SITELIB}/ppx_type_conv/std.annot ${OCAML_SITELIB}/ppx_type_conv/std.cmt +${OCAML_SITELIB}/ppx_type_conv/std.ml ${OCAML_SITELIB}/ppx_type_conv/type_conv.annot ${OCAML_SITELIB}/ppx_type_conv/type_conv.cmt ${OCAML_SITELIB}/ppx_type_conv/type_conv.cmti +${OCAML_SITELIB}/ppx_type_conv/type_conv.mli diff --git a/devel/ocaml-ppx_type_conv/distinfo b/devel/ocaml-ppx_type_conv/distinfo index f5760c665e5..b7bab033e56 100644 --- a/devel/ocaml-ppx_type_conv/distinfo +++ b/devel/ocaml-ppx_type_conv/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.2 2016/06/20 19:06:29 jaapb Exp $ +$NetBSD: distinfo,v 1.3 2016/08/18 11:23:48 jaapb Exp $ -SHA1 (ppx_type_conv-113.33.01.tar.gz) = 280dbfce2ce20c321c7ab3cad4fdaa39a994ac0f -RMD160 (ppx_type_conv-113.33.01.tar.gz) = 0e1eb5e739ce11c3eec2059e13f6b1771f724bc4 -SHA512 (ppx_type_conv-113.33.01.tar.gz) = dacc99666a97d9021a83df74b25a8d54f7ed324e9dc76dd8447298944ba9c31e6320598486a260b1461ecf98e32be38d3a26de7b797f4462277ad780f8864f6c -Size (ppx_type_conv-113.33.01.tar.gz) = 16693 bytes -SHA1 (patch-Makefile) = 24b01c95d5324652289e903d965db6a1ffc27f0e +SHA1 (ppx_type_conv-114.01+04-f481969.tar.gz) = 943449b02b8c2855793f60e1d460f5f18f0ef1b4 +RMD160 (ppx_type_conv-114.01+04-f481969.tar.gz) = 1209b0242414d990e6c733a0cb09f23963e3dcde +SHA512 (ppx_type_conv-114.01+04-f481969.tar.gz) = 9d05ce9dab91a49de9e65d2a9db59ee82606c9700ad9c7311f906228d19d22ba8bafc0e3cc06a98740a94ac101449b1fd094b98548e89729b1d7acb6d556543b +Size (ppx_type_conv-114.01+04-f481969.tar.gz) = 15502 bytes +SHA1 (patch-_oasis) = 7f45b4b5e4d0767b82ac86219c63526b5ca6b218 diff --git a/devel/ocaml-ppx_type_conv/patches/patch-Makefile b/devel/ocaml-ppx_type_conv/patches/patch-Makefile deleted file mode 100644 index 4a9965b9813..00000000000 --- a/devel/ocaml-ppx_type_conv/patches/patch-Makefile +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-Makefile,v 1.1 2016/06/20 19:06:29 jaapb Exp $ - -Install into correct location ---- Makefile.orig 2016-04-18 10:11:00.000000000 +0000 -+++ Makefile -@@ -2,7 +2,7 @@ - - SETUP := setup.exe - NAME := ppx_type_conv --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 |