details: https://anonhg.NetBSD.org/pkgsrc/rev/7ceab4d7ab73
branches: trunk
changeset: 349055:7ceab4d7ab73
user: jaapb <jaapb%pkgsrc.org@localhost>
date: Sat Jun 25 14:47:54 2016 +0000
description:
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`
diffstat:
devel/ocaml-ppx_optcomp/Makefile | 11 ++++++-----
devel/ocaml-ppx_optcomp/PLIST | 7 +++++--
devel/ocaml-ppx_optcomp/distinfo | 11 ++++++-----
devel/ocaml-ppx_optcomp/patches/patch-Makefile | 23 +++++++++++++++++++++++
4 files changed, 40 insertions(+), 12 deletions(-)
diffs (93 lines):
diff -r 8c8a729b6bd0 -r 7ceab4d7ab73 devel/ocaml-ppx_optcomp/Makefile
--- a/devel/ocaml-ppx_optcomp/Makefile Sat Jun 25 14:31:13 2016 +0000
+++ b/devel/ocaml-ppx_optcomp/Makefile Sat Jun 25 14:47:54 2016 +0000
@@ -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 @@
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"
diff -r 8c8a729b6bd0 -r 7ceab4d7ab73 devel/ocaml-ppx_optcomp/PLIST
--- a/devel/ocaml-ppx_optcomp/PLIST Sat Jun 25 14:31:13 2016 +0000
+++ b/devel/ocaml-ppx_optcomp/PLIST Sat Jun 25 14:47:54 2016 +0000
@@ -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
diff -r 8c8a729b6bd0 -r 7ceab4d7ab73 devel/ocaml-ppx_optcomp/distinfo
--- a/devel/ocaml-ppx_optcomp/distinfo Sat Jun 25 14:31:13 2016 +0000
+++ b/devel/ocaml-ppx_optcomp/distinfo Sat Jun 25 14:47:54 2016 +0000
@@ -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
diff -r 8c8a729b6bd0 -r 7ceab4d7ab73 devel/ocaml-ppx_optcomp/patches/patch-Makefile
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/devel/ocaml-ppx_optcomp/patches/patch-Makefile Sat Jun 25 14:47:54 2016 +0000
@@ -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