From efd63f763a36723724121aa6ac4835ead440465e Mon Sep 17 00:00:00 2001 From: markd Date: Thu, 31 Mar 2016 10:27:26 +0000 Subject: Properly handle registering in ocaml/ld.conf --- math/ocaml-zarith/PLIST | 4 +++- math/ocaml-zarith/distinfo | 3 ++- math/ocaml-zarith/patches/patch-project.mak | 14 ++++++++++++++ 3 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 math/ocaml-zarith/patches/patch-project.mak (limited to 'math/ocaml-zarith') diff --git a/math/ocaml-zarith/PLIST b/math/ocaml-zarith/PLIST index acb817ec372..c394aba69a2 100644 --- a/math/ocaml-zarith/PLIST +++ b/math/ocaml-zarith/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.1 2016/02/07 21:43:03 markd Exp $ +@comment $NetBSD: PLIST,v 1.2 2016/03/31 10:27:26 markd Exp $ lib/ocaml/site-lib/zarith/big_int_Z.cmi lib/ocaml/site-lib/zarith/big_int_Z.mli lib/ocaml/site-lib/zarith/dllzarith.so @@ -13,3 +13,5 @@ lib/ocaml/site-lib/zarith/zarith.cmxs lib/ocaml/site-lib/zarith/zarith.h lib/ocaml/site-lib/zarith/z.cmi lib/ocaml/site-lib/zarith/z.mli +@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/zarith +@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/zarith diff --git a/math/ocaml-zarith/distinfo b/math/ocaml-zarith/distinfo index 555926abeca..6299864a0df 100644 --- a/math/ocaml-zarith/distinfo +++ b/math/ocaml-zarith/distinfo @@ -1,7 +1,8 @@ -$NetBSD: distinfo,v 1.1 2016/02/08 03:40:20 markd Exp $ +$NetBSD: distinfo,v 1.2 2016/03/31 10:27:26 markd Exp $ SHA1 (ocaml-zarith-1.4.1.tar.gz) = 684d686a5e5234876dc41d247b6cecf47bd81d89 RMD160 (ocaml-zarith-1.4.1.tar.gz) = b0c858cb3757ce9bbd8f191b90ffeb76e81c5aa1 SHA512 (ocaml-zarith-1.4.1.tar.gz) = ef6717e3b6c19ef94fb0e02eb33b1d9f2b2103a9fe0334cb89b01b344ee953fbeeaed8a75b17daa32760faaf93d582e6778ae50e59e9cf878663f2ecba1d5659 Size (ocaml-zarith-1.4.1.tar.gz) = 88831 bytes SHA1 (patch-configure) = aa021e0a35d671b804a489b60f5cfba1b4c4034f +SHA1 (patch-project.mak) = ae9cd0e0efb2b93b62cfbecd81122578ec007505 diff --git a/math/ocaml-zarith/patches/patch-project.mak b/math/ocaml-zarith/patches/patch-project.mak new file mode 100644 index 00000000000..a57143e2e7a --- /dev/null +++ b/math/ocaml-zarith/patches/patch-project.mak @@ -0,0 +1,14 @@ +$NetBSD: patch-project.mak,v 1.1 2016/03/31 10:27:26 markd Exp $ + +Do not create an ld.conf, this is done afterwards through the PLIST +--- project.mak.orig 2015-11-09 21:23:00.000000000 +0000 ++++ project.mak +@@ -96,7 +96,7 @@ endif + + ifeq ($(INSTMETH),findlib) + install: +- $(OCAMLFIND) install -destdir "$(INSTALLDIR)" zarith META $(TOINSTALL) dllzarith.$(DLLSUFFIX) ++ $(OCAMLFIND) install -destdir "$(INSTALLDIR)" -ldconf ignore zarith META $(TOINSTALL) dllzarith.$(DLLSUFFIX) + + uninstall: + $(OCAMLFIND) remove -destdir "$(INSTALLDIR)" zarith -- cgit v1.2.3