pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/graphics/camlimages graphics/camlimages: Replace MESSA...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/96fa17e75832
branches:  trunk
changeset: 388656:96fa17e75832
user:      gdt <gdt%pkgsrc.org@localhost>
date:      Thu Nov 24 12:44:09 2022 +0000

description:
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:

 graphics/camlimages/MESSAGE  |  11 -----------
 graphics/camlimages/Makefile |   6 ++++--
 2 files changed, 4 insertions(+), 13 deletions(-)

diffs (36 lines):

diff -r 4f1e30abf4c4 -r 96fa17e75832 graphics/camlimages/MESSAGE
--- a/graphics/camlimages/MESSAGE       Thu Nov 24 12:16:12 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r 4f1e30abf4c4 -r 96fa17e75832 graphics/camlimages/Makefile
--- a/graphics/camlimages/Makefile      Thu Nov 24 12:16:12 2022 +0000
+++ b/graphics/camlimages/Makefile      Thu Nov 24 12:44:09 2022 +0000
@@ -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 @@
        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"



Home | Main Index | Thread Index | Old Index