diff options
| author | gdt <gdt@pkgsrc.org> | 2022-11-24 12:44:09 +0000 |
|---|---|---|
| committer | gdt <gdt@pkgsrc.org> | 2022-11-24 12:44:09 +0000 |
| commit | b10e8c257aca80aee386e9a6b0596d2aa67983ac (patch) | |
| tree | f983432a1fda324e5dc82ede7a649157c58f5eee /graphics/camlimages | |
| parent | 3c2269afd35a346ed8bbe808d73865fb43f7bfbb (diff) | |
| download | pkgsrc-b10e8c257aca80aee386e9a6b0596d2aa67983ac.tar.gz | |
graphics/camlimages: Replace MESSAGE with an actual fix
MESSAGE exhorted the user to adjust ocaml's ld.conf. Remove that, and
use ocaml.mk harder so that the directory is automatically registered.
Ride the recent bump to PKGREVISION 100. This is a clue!
Diffstat (limited to 'graphics/camlimages')
| -rw-r--r-- | graphics/camlimages/MESSAGE | 11 | ||||
| -rw-r--r-- | graphics/camlimages/Makefile | 6 |
2 files changed, 4 insertions, 13 deletions
diff --git a/graphics/camlimages/MESSAGE b/graphics/camlimages/MESSAGE deleted file mode 100644 index 661996eb2c8..00000000000 --- a/graphics/camlimages/MESSAGE +++ /dev/null @@ -1,11 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2011/08/13 16:40:44 wiz Exp $ - -To make OCaml findlib more aware of the installation of camlimages, -add the following line to the ld.conf file of OCaml: - - ${PREFIX}lib/ocaml/site-lib/camlimages - -By default the ld.conf is located in ${PREFIX}lib/ocaml/ld.conf - -=========================================================================== diff --git a/graphics/camlimages/Makefile b/graphics/camlimages/Makefile index 9e223f87f93..5a91d7e9325 100644 --- a/graphics/camlimages/Makefile +++ b/graphics/camlimages/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.141 2022/11/23 16:20:13 adam Exp $ +# $NetBSD: Makefile,v 1.142 2022/11/24 12:44:09 gdt Exp $ VERSION= 4.0.1 PKGNAME= camlimages-${VERSION} @@ -39,8 +39,10 @@ do-install: cd ${WRKSRC} && OCAMLFIND_DESTDIR=${DESTDIR}${PREFIX}/lib/ocaml/site-lib \ OCAMLFIND_LDCONF=/dev/null ${PREFIX}/bin/omake install +OCAML_USE_FINDLIB= yes + BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.11.0 -.include "../../lang/ocaml/buildlink3.mk" +.include "../../lang/ocaml/ocaml.mk" .include "../../devel/nspr/buildlink3.mk" .include "../../x11/ocaml-graphics/buildlink3.mk" .include "../../mk/jpeg.buildlink3.mk" |