diff options
| author | jaapb <jaapb@pkgsrc.org> | 2019-08-27 05:37:38 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2019-08-27 05:37:38 +0000 |
| commit | 5f1b96f0910a05193f4e642813b4e3693579d1e9 (patch) | |
| tree | 6225757ebb5b7828813373504b4e9bf0fd503593 /lang/ocaml | |
| parent | c281a07f86f038ae99428b9fbc726c757dd2742e (diff) | |
| download | pkgsrc-5f1b96f0910a05193f4e642813b4e3693579d1e9.tar.gz | |
Removed superfluous patch from lang/ocaml; revbump.
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/Makefile | 6 | ||||
| -rw-r--r-- | lang/ocaml/buildlink3.mk | 4 | ||||
| -rw-r--r-- | lang/ocaml/distinfo | 3 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-Makefile.common | 18 |
4 files changed, 5 insertions, 26 deletions
diff --git a/lang/ocaml/Makefile b/lang/ocaml/Makefile index 78ce5eef499..6e033a4e19b 100644 --- a/lang/ocaml/Makefile +++ b/lang/ocaml/Makefile @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.127 2019/08/24 10:54:23 jaapb Exp $ +# $NetBSD: Makefile,v 1.128 2019/08/27 05:37:38 jaapb Exp $ .include "Makefile.common" -#CONFIGURE_ENV+= disable_x11=yes +PKGREVISION= 1 BUILD_TARGET= world MAKE_JOBS_SAFE= no @@ -13,8 +13,6 @@ USE_LANGUAGES+= c USE_LIBTOOL= yes USE_GNU_CONFIGURE_HOST= no -#USE_GCC_RUNTIME= yes - PLIST_VARS+= ocaml-stub ocaml-prof ocaml-opt ocaml-nat ocaml-spacetime \ instrumented_runtime diff --git a/lang/ocaml/buildlink3.mk b/lang/ocaml/buildlink3.mk index 743278484ec..d15de304c26 100644 --- a/lang/ocaml/buildlink3.mk +++ b/lang/ocaml/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.52 2019/08/24 10:54:23 jaapb Exp $ +# $NetBSD: buildlink3.mk,v 1.53 2019/08/27 05:37:38 jaapb Exp $ BUILDLINK_TREE+= ocaml @@ -6,7 +6,7 @@ BUILDLINK_TREE+= ocaml OCAML_BUILDLINK3_MK:= BUILDLINK_API_DEPENDS.ocaml+= ocaml>=4.08.0 -BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.08.1 +BUILDLINK_ABI_DEPENDS.ocaml+= ocaml>=4.08.1nb1 BUILDLINK_PKGSRCDIR.ocaml?= ../../lang/ocaml #BUILDLINK_DEPMETHOD.ocaml?= build diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 38c68aafaf8..0163ecae883 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.127 2019/08/24 10:54:23 jaapb Exp $ +$NetBSD: distinfo,v 1.128 2019/08/27 05:37:38 jaapb Exp $ SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2 RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6 SHA512 (ocaml-4.08.1.tar.gz) = 8239c1879926e59c3d9611ad0d97618ce21b0528f1bd59db3df9c24287ad180ffa74f34e52e1fab39e71cbf8113a9a4ee5037cc33ae64ca6a9a109fe4ada0256 Size (ocaml-4.08.1.tar.gz) = 4897908 bytes SHA1 (patch-Makefile) = 3c1410ba28d7d25ffd8fd4b1ffeef7f0206ec58d -SHA1 (patch-Makefile.common) = f7e1d1dbebf91679338c192ffc62c83cd0f2d17e SHA1 (patch-Makefile.common.in) = bc44846bfa941520b43538189dbc5637c342ef0a SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f diff --git a/lang/ocaml/patches/patch-Makefile.common b/lang/ocaml/patches/patch-Makefile.common deleted file mode 100644 index cab848de725..00000000000 --- a/lang/ocaml/patches/patch-Makefile.common +++ /dev/null @@ -1,18 +0,0 @@ -$NetBSD: patch-Makefile.common,v 1.1 2018/07/19 12:16:38 jaapb Exp $ - -Use BSD_INSTALL_* ---- Makefile.common.orig 2018-07-10 14:09:26.000000000 +0000 -+++ Makefile.common -@@ -16,9 +16,9 @@ - # This makefile contains common definitions shared by other Makefiles - # We assume that config/Makefile has already been included - --INSTALL ?= install --INSTALL_DATA ?= $(INSTALL) -m u=rw,g=rw,o=r --INSTALL_PROG ?= $(INSTALL) -m u=rwx,g=rwx,o=rx -+INSTALL ?= ${BSD_INSTALL} -+INSTALL_DATA ?= ${BSD_INSTALL_DATA} -+INSTALL_PROG ?= ${BSD_INSTALL_SCRIPT} - - # note: these are defined by lazy expansions - # as some parts of the makefiles change BINDIR, etc. |