diff options
| author | jaapb <jaapb@pkgsrc.org> | 2019-08-27 06:23:50 +0000 |
|---|---|---|
| committer | jaapb <jaapb@pkgsrc.org> | 2019-08-27 06:23:50 +0000 |
| commit | ffa885c39e1e07f5efa5da46f9aa75f11fc37e49 (patch) | |
| tree | 6355f23c1e6345942376ffefc79ac7d6f8b934fd /lang/ocaml | |
| parent | fbd003d86953700c2d63adb6737dcceaf5abdcbd (diff) | |
| download | pkgsrc-ffa885c39e1e07f5efa5da46f9aa75f11fc37e49.tar.gz | |
Removed more superfluous patches (oops!) from lang/ocaml
Diffstat (limited to 'lang/ocaml')
| -rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-byterun_Makefile | 14 | ||||
| -rw-r--r-- | lang/ocaml/patches/patch-otherlibs_Makefile | 14 |
3 files changed, 1 insertions, 31 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 0163ecae883..73ad2d9ee56 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.128 2019/08/27 05:37:38 jaapb Exp $ +$NetBSD: distinfo,v 1.129 2019/08/27 06:23:50 jaapb Exp $ SHA1 (ocaml-4.08.1.tar.gz) = f89ae7513ee4f064c7db92066f9dd4ac085634e2 RMD160 (ocaml-4.08.1.tar.gz) = a8c0b80d9b6ff52c9a5725eec3ce64adffd81ca6 @@ -9,7 +9,6 @@ SHA1 (patch-Makefile.common.in) = bc44846bfa941520b43538189dbc5637c342ef0a SHA1 (patch-asmcomp_amd64_emit.mlp) = 1bc44434fbe1821d3aa2eed1a6b0938258586851 SHA1 (patch-asmcomp_asmlink.ml) = db2b387ea17f41a62c2bce53b91f945d5e29a82f SHA1 (patch-asmrun_amd64.S) = 68d8f3ba1c1ad951e688539b4659aee71a527222 -SHA1 (patch-byterun_Makefile) = 28f8a9fff06ae99c52213ba2202d5b99b67f6735 SHA1 (patch-configure) = 6e204c6feea752c182043ecde52e421f60173e11 SHA1 (patch-driver_compenv.ml) = 27c68072bd73c9c00d2b3093d8c6498f192ca3d3 SHA1 (patch-driver_main.ml) = 69a6f761ded38e0721a7aed1416a9f19a288d991 @@ -20,7 +19,6 @@ SHA1 (patch-lex_Makefile) = 9c3de0a77dbea117b5587cfd77bbdcb3e2db26b6 SHA1 (patch-man_Makefile) = b780c026aef5f7e6b22b142fce3ec87ef9d2ab22 SHA1 (patch-ocamldoc_Makefile) = 7f0a90ca7849447b93ae4b3fcbc58901de1e996f SHA1 (patch-ocamldoc_odoc__messages.ml) = 77f650a5f34f40b9648a8d5091e9aa31efb5734b -SHA1 (patch-otherlibs_Makefile) = 9f8b8ab3fcd72d77b750040d6484b0ad4fca7a61 SHA1 (patch-otherlibs_Makefile.otherlibs.common) = 2eb71de7bd659c763fb7efdf10af1812e135c904 SHA1 (patch-otherlibs_systhreads_Makefile) = d6f7818487c156b101b6a78f0dc2824d57453e50 SHA1 (patch-otherlibs_threads_Makefile) = 3ccc89021d808967bc958d295515ceca1c39c81d diff --git a/lang/ocaml/patches/patch-byterun_Makefile b/lang/ocaml/patches/patch-byterun_Makefile deleted file mode 100644 index 067c9b95141..00000000000 --- a/lang/ocaml/patches/patch-byterun_Makefile +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-byterun_Makefile,v 1.8 2018/07/19 12:16:38 jaapb Exp $ - -Use BSD_INSTALL_* instead of mkdir and cp ---- byterun/Makefile.orig 2018-04-11 13:22:42.000000000 +0000 -+++ byterun/Makefile -@@ -121,7 +121,7 @@ install: - if test -n "$(DYNLIBRARIES)"; then \ - $(INSTALL_PROG) $(DYNLIBRARIES) "$(INSTALL_LIBDIR)"; \ - fi -- mkdir -p "$(INSTALL_INCDIR)" -+ $(BSD_INSTALL_DATA_DIR) -p "$(INSTALL_INCDIR)" - $(INSTALL_DATA) caml/*.h "$(INSTALL_INCDIR)" - - # If primitives contain duplicated lines (e.g. because the code is defined diff --git a/lang/ocaml/patches/patch-otherlibs_Makefile b/lang/ocaml/patches/patch-otherlibs_Makefile deleted file mode 100644 index 1bfc9961aee..00000000000 --- a/lang/ocaml/patches/patch-otherlibs_Makefile +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-otherlibs_Makefile,v 1.7 2018/01/10 14:30:35 jaapb Exp $ - -Honor LDFLAGS. - ---- otherlibs/Makefile.orig 2017-10-03 08:35:24.000000000 +0000 -+++ otherlibs/Makefile -@@ -53,6 +53,7 @@ MKLIB=$(CAMLRUN) $(ROOTDIR)/tools/ocamlm - #LINKOPTS= - #LDOPTS= - #HEADERS= -+LDOPTS=-ldopt "$(LDFLAGS)" - - CMIFILES ?= $(CAMLOBJS:.cmo=.cmi) - CAMLOBJS_NAT ?= $(CAMLOBJS:.cmo=.cmx) |