CVS commit: pkgsrc/math/ocaml-zarith

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Sat Jun 25 14:31:14 UTC 2016

Modified Files:
        pkgsrc/math/ocaml-zarith: Makefile PLIST

Log Message:
Updated package to use ocaml.mk framework. No upstream changes.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/ocaml-zarith/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/math/ocaml-zarith/PLIST

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

Modified files:

Index: pkgsrc/math/ocaml-zarith/Makefile
diff -u pkgsrc/math/ocaml-zarith/Makefile:1.3 pkgsrc/math/ocaml-zarith/Makefile:1.4
--- pkgsrc/math/ocaml-zarith/Makefile:1.3       Thu May  5 11:45:40 2016
+++ pkgsrc/math/ocaml-zarith/Makefile   Sat Jun 25 14:31:13 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2016/05/05 11:45:40 jaapb Exp $
+# $NetBSD: Makefile,v 1.4 2016/06/25 14:31:13 jaapb Exp $
 #
 
 DISTNAME=      ocaml-zarith-1.4.1
-PKGREVISION=   2
+PKGREVISION=   3
 CATEGORIES=    math
 MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/1574/
 
@@ -11,8 +11,6 @@ HOMEPAGE=     http://forge.ocamlcore.org/pro
 COMMENT=       OCaml arithmetic library for arbitrary precision integers
 LICENSE=       gnu-lgpl-v2
 
-DEPENDS+=      ocaml-findlib-[0-9]*:../../devel/ocaml-findlib
-
 # zarith library creation is racy
 MAKE_JOBS_SAFE=        no
 
@@ -20,12 +18,12 @@ HAS_CONFIGURE=      yes
 CONFIGURE_ENV+=        DESTDIR=${DESTDIR}
 USE_TOOLS+=    gmake perl
 
-INSTALLATION_DIRS=     lib/ocaml/site-lib
+OCAML_USE_FINDLIB=     yes
 
 WRKSRC=                ${WRKDIR}/${DISTNAME:S/ocaml-//}
 
 REPLACE_PERL+= z_pp.pl
 
 .include "../../devel/gmp/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/math/ocaml-zarith/PLIST
diff -u pkgsrc/math/ocaml-zarith/PLIST:1.2 pkgsrc/math/ocaml-zarith/PLIST:1.3
--- pkgsrc/math/ocaml-zarith/PLIST:1.2  Thu Mar 31 10:27:26 2016
+++ pkgsrc/math/ocaml-zarith/PLIST      Sat Jun 25 14:31:13 2016
@@ -1,17 +1,15 @@
-@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
-lib/ocaml/site-lib/zarith/libzarith.a
-lib/ocaml/site-lib/zarith/META
-lib/ocaml/site-lib/zarith/q.cmi
-lib/ocaml/site-lib/zarith/q.mli
-lib/ocaml/site-lib/zarith/zarith.a
-lib/ocaml/site-lib/zarith/zarith.cma
-lib/ocaml/site-lib/zarith/zarith.cmxa
-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
+@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:31:13 jaapb Exp $
+${OCAML_SITELIB}/zarith/big_int_Z.cmi
+${OCAML_SITELIB}/zarith/big_int_Z.mli
+${OCAML_SITELIB}/zarith/dllzarith.so
+${OCAML_SITELIB}/zarith/libzarith.a
+${OCAML_SITELIB}/zarith/META
+${OCAML_SITELIB}/zarith/q.cmi
+${OCAML_SITELIB}/zarith/q.mli
+${OCAML_SITELIB}/zarith/zarith.a
+${OCAML_SITELIB}/zarith/zarith.cma
+${OCAML_SITELIB}/zarith/zarith.cmxa
+${OCAML_SITELIB}/zarith/zarith.cmxs
+${OCAML_SITELIB}/zarith/zarith.h
+${OCAML_SITELIB}/zarith/z.cmi
+${OCAML_SITELIB}/zarith/z.mli