Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_155784934495930"
MIME-Version: 1.0
Date: Tue, 14 May 2019 15:55:44 +0000
From: "Jaap Boender" <jaapb@netbsd.org>
Subject: CVS commit: pkgsrc/devel/ocaml-findlib
To: pkgsrc-changes@NetBSD.org
Reply-To: jaapb@netbsd.org
Message-Id: <20190514155544.D7F9FFB16@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_155784934495930
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	jaapb
Date:		Tue May 14 15:55:44 UTC 2019

Modified Files:
	pkgsrc/devel/ocaml-findlib: Makefile PLIST buildlink3.mk distinfo
	pkgsrc/devel/ocaml-findlib/patches: patch-configure

Log Message:
Updated devel/ocaml-findlib for new x11/ocaml-graphics package.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/devel/ocaml-findlib/Makefile
cvs rdiff -u -r1.19 -r1.20 pkgsrc/devel/ocaml-findlib/PLIST
cvs rdiff -u -r1.14 -r1.15 pkgsrc/devel/ocaml-findlib/buildlink3.mk
cvs rdiff -u -r1.18 -r1.19 pkgsrc/devel/ocaml-findlib/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/ocaml-findlib/patches/patch-configure

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


--_----------=_155784934495930
Content-Disposition: inline
Content-Length: 4531
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/devel/ocaml-findlib/Makefile
diff -u pkgsrc/devel/ocaml-findlib/Makefile:1.42 pkgsrc/devel/ocaml-findlib/Makefile:1.43
--- pkgsrc/devel/ocaml-findlib/Makefile:1.42	Tue Nov 27 13:53:46 2018
+++ pkgsrc/devel/ocaml-findlib/Makefile	Tue May 14 15:55:44 2019
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2018/11/27 13:53:46 jaapb Exp $
+# $NetBSD: Makefile,v 1.43 2019/05/14 15:55:44 jaapb Exp $
 
 DISTNAME=		findlib-1.8.0
 PKGNAME=		ocaml-${DISTNAME}
-PKGREVISION=		4
+PKGREVISION=		5
 CATEGORIES=		devel
 MASTER_SITES=		http://download.camlcity.org/download/
 

Index: pkgsrc/devel/ocaml-findlib/PLIST
diff -u pkgsrc/devel/ocaml-findlib/PLIST:1.19 pkgsrc/devel/ocaml-findlib/PLIST:1.20
--- pkgsrc/devel/ocaml-findlib/PLIST:1.19	Tue Nov 27 13:53:46 2018
+++ pkgsrc/devel/ocaml-findlib/PLIST	Tue May 14 15:55:44 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2018/11/27 13:53:46 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.20 2019/05/14 15:55:44 jaapb Exp $
 bin/ocamlfind
 ${OCAML_SITELIB}/bigarray/META
 ${OCAML_SITELIB}/bytes/META
@@ -29,9 +29,8 @@ ${OCAML_SITELIB}/findlib/fl_package_base
 ${OCAML_SITELIB}/findlib/fl_package_base.mli
 ${OCAML_SITELIB}/findlib/topfind.cmi
 ${OCAML_SITELIB}/findlib/topfind.mli
-@optional ${OCAML_SITELIB}/graphics/META
 ${OCAML_SITELIB}/ocamldoc/META
-${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
+${PLIST.ocaml-opt}${PLIST.64bit}${OCAML_SITELIB}/raw_spacetime/META
 ${OCAML_SITELIB}/stdlib/META
 ${OCAML_SITELIB}/str/META
 ${OCAML_SITELIB}/threads/META

Index: pkgsrc/devel/ocaml-findlib/buildlink3.mk
diff -u pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.14 pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.15
--- pkgsrc/devel/ocaml-findlib/buildlink3.mk:1.14	Tue Nov 27 13:53:46 2018
+++ pkgsrc/devel/ocaml-findlib/buildlink3.mk	Tue May 14 15:55:44 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.14 2018/11/27 13:53:46 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.15 2019/05/14 15:55:44 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-findlib
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-findlib
 OCAML_FINDLIB_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-findlib+=	ocaml-findlib>=1.2
-BUILDLINK_ABI_DEPENDS.ocaml-findlib+=	ocaml-findlib>=1.8.0nb4
+BUILDLINK_ABI_DEPENDS.ocaml-findlib+=	ocaml-findlib>=1.8.0nb5
 BUILDLINK_PKGSRCDIR.ocaml-findlib?=	../../devel/ocaml-findlib
 
 BUILDLINK_TARGETS+=	ocaml-findlib-wrappers ocaml-findlib-ldconf

Index: pkgsrc/devel/ocaml-findlib/distinfo
diff -u pkgsrc/devel/ocaml-findlib/distinfo:1.18 pkgsrc/devel/ocaml-findlib/distinfo:1.19
--- pkgsrc/devel/ocaml-findlib/distinfo:1.18	Tue May  8 19:06:15 2018
+++ pkgsrc/devel/ocaml-findlib/distinfo	Tue May 14 15:55:44 2019
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2018/05/08 19:06:15 jaapb Exp $
+$NetBSD: distinfo,v 1.19 2019/05/14 15:55:44 jaapb Exp $
 
 SHA1 (findlib-1.8.0.tar.gz) = 91fa957208a10c53420c30eb55d0a0c324070026
 RMD160 (findlib-1.8.0.tar.gz) = ad543ea9c62bfe4ca20389a7764ba0b03a0b3a3a
 SHA512 (findlib-1.8.0.tar.gz) = a6dbfd172bff20ebf05db8a0a952a9f0dc67f9420b89771dbfc6193a7a2e5fe448c9d3bdcc113591175906644299529ef937652cfb2c17f67ec2c4dbb1d71e48
 Size (findlib-1.8.0.tar.gz) = 260719 bytes
 SHA1 (patch-Makefile) = 72afa3c32f78183f745a63d2817fcf05154d27d3
-SHA1 (patch-configure) = 400ad416a22519e6c882df8ef2d5df8645d0d60d
+SHA1 (patch-configure) = ca920a5fa1596070d6e1ab26c69cbffa5678906a
 SHA1 (patch-src_findlib_Makefile) = cf58beba4a7fe9076171fc7892c24df7691a4af0

Index: pkgsrc/devel/ocaml-findlib/patches/patch-configure
diff -u pkgsrc/devel/ocaml-findlib/patches/patch-configure:1.5 pkgsrc/devel/ocaml-findlib/patches/patch-configure:1.6
--- pkgsrc/devel/ocaml-findlib/patches/patch-configure:1.5	Tue May  8 19:06:15 2018
+++ pkgsrc/devel/ocaml-findlib/patches/patch-configure	Tue May 14 15:55:44 2019
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure,v 1.5 2018/05/08 19:06:15 jaapb Exp $
+$NetBSD: patch-configure,v 1.6 2019/05/14 15:55:44 jaapb Exp $
 
 Do not install META files for libraries that were split off
 --- configure.orig	2018-04-16 08:13:23.000000000 +0000
@@ -57,3 +57,23 @@ Do not install META files for libraries 
  
  # bytes?
  
+@@ -570,13 +570,13 @@ fi
+ 
+ # graphics?
+ 
+-if [ -f "${ocaml_core_stdlib}/graphics.cmi" ]; then
+-    echo "graphics: found"
+-    lgraphics="graphics"
+-else
+-    echo "graphics: not found"
++#if [ -f "${ocaml_core_stdlib}/graphics.cmi" ]; then
++#    echo "graphics: found"
++#    lgraphics="graphics"
++#else
++#    echo "graphics: not found"
+     lgraphics=""
+-fi
++#fi
+ 
+ 
+ # Generate the META files now.


--_----------=_155784934495930--