diff options
author | jaapb <jaapb@pkgsrc.org> | 2015-07-04 09:29:47 +0000 |
---|---|---|
committer | jaapb <jaapb@pkgsrc.org> | 2015-07-04 09:29:47 +0000 |
commit | 1dc86b40b46da2c61b99da9745663437e7120f22 (patch) | |
tree | c25c15d4865d03329f290437655951055d32b531 /lang | |
parent | 40bfdfac6d23060987a06f3569ac3623b6f5601b (diff) | |
download | pkgsrc-1dc86b40b46da2c61b99da9745663437e7120f22.tar.gz |
Removed a superfluous (and breakage-causing) -p from a patch. Thanks to
BulkTracker for pointing me to this bug.
Diffstat (limited to 'lang')
-rw-r--r-- | lang/ocaml/distinfo | 4 | ||||
-rw-r--r-- | lang/ocaml/patches/patch-otherlibs_threads_Makefile | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo index 1ad30576096..56b6ea8ebfe 100644 --- a/lang/ocaml/distinfo +++ b/lang/ocaml/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.85 2015/06/30 11:08:47 jaapb Exp $ +$NetBSD: distinfo,v 1.86 2015/07/04 09:29:47 jaapb Exp $ SHA1 (ocaml-4.02.2.tar.gz) = 7fb6571972635b00dfda204ca38a4b9dce79a354 RMD160 (ocaml-4.02.2.tar.gz) = efb044b9c0a76ed20e7960176f26398dea2ba0aa @@ -26,7 +26,7 @@ SHA1 (patch-ocamldoc_odoc__messages.ml) = 95aed385cfff480051d4a7dfc60da50a572293 SHA1 (patch-otherlibs_Makefile.shared) = c5de4dd0f2be9cd35ba61b480b222ffa7baa891d SHA1 (patch-otherlibs_dynlink_Makefile) = 41cecb61230880a40c55f2f8f25d2b250864eb24 SHA1 (patch-otherlibs_systhreads_Makefile) = f3cdf000f58927dff44b4ce61153c1df8e9eceea -SHA1 (patch-otherlibs_threads_Makefile) = bcaaeb85724e50ce058b79ab4224c9f1aaadd47b +SHA1 (patch-otherlibs_threads_Makefile) = e976e94bddae1ce8462f22c2eaa6509b9cafb12d SHA1 (patch-stdlib_Makefile) = 501b45018245950c78d663bbd6eea1c38a6d04d2 SHA1 (patch-stdlib_Makefile.shared) = 58d2d0036a5fe57e130d477438d0441d1956c328 SHA1 (patch-tools_Makefile.shared) = ff10364c68df2ac548468c9e5d1ab66458d3413e diff --git a/lang/ocaml/patches/patch-otherlibs_threads_Makefile b/lang/ocaml/patches/patch-otherlibs_threads_Makefile index 4c371c5e1d9..75bfaadbdc4 100644 --- a/lang/ocaml/patches/patch-otherlibs_threads_Makefile +++ b/lang/ocaml/patches/patch-otherlibs_threads_Makefile @@ -1,15 +1,15 @@ -$NetBSD: patch-otherlibs_threads_Makefile,v 1.4 2014/10/09 19:08:28 jaapb Exp $ +$NetBSD: patch-otherlibs_threads_Makefile,v 1.5 2015/07/04 09:29:48 jaapb Exp $ Use BSD_INSTALL_* instead of mkdir and cp ---- otherlibs/threads/Makefile.orig 2014-04-29 11:56:17.000000000 +0000 +--- otherlibs/threads/Makefile.orig 2015-05-12 14:46:37.000000000 +0000 +++ otherlibs/threads/Makefile -@@ -102,12 +102,12 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI +@@ -106,12 +106,12 @@ INSTALL_STUBLIBDIR=$(DESTDIR)$(STUBLIBDI install: if test -f dllvmthreads.so; then cp dllvmthreads.so $(INSTALL_STUBLIBDIR)/.; fi - mkdir -p $(INSTALL_LIBDIR)/vmthreads - cp libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a -+ $(BSD_INSTALL_DATA_DIR) -p $(INSTALL_LIBDIR)/vmthreads ++ $(BSD_INSTALL_DATA_DIR) $(INSTALL_LIBDIR)/vmthreads + $(BSD_INSTALL_DATA) libvmthreads.a $(INSTALL_LIBDIR)/vmthreads/libvmthreads.a cd $(INSTALL_LIBDIR)/vmthreads; $(RANLIB) libvmthreads.a - cp thread.cmi mutex.cmi condition.cmi event.cmi threadUnix.cmi \ |