[pkgsrc/trunk]: pkgsrc Updated package to use ocaml.mk framework. No upstream...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/769968a740c4
branches:  trunk
changeset: 349047:769968a740c4
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Sat Jun 25 14:15:05 2016 +0000

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

diffstat:

 archivers/ocaml-bz2/Makefile     |  15 ++++-----------
 archivers/ocaml-bz2/PLIST        |   4 +---
 databases/ocaml-sqlite3/Makefile |   5 ++---
 databases/ocaml-sqlite3/PLIST    |   4 +---
 4 files changed, 8 insertions(+), 20 deletions(-)

diffs (87 lines):

diff -r 2f3aa6ea92d3 -r 769968a740c4 archivers/ocaml-bz2/Makefile
--- a/archivers/ocaml-bz2/Makefile      Sat Jun 25 14:05:20 2016 +0000
+++ b/archivers/ocaml-bz2/Makefile      Sat Jun 25 14:15:05 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.10 2016/05/05 11:45:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.11 2016/06/25 14:15:05 jaapb Exp $
 
 PKGNAME=       ocaml-bz2-${VERSION}
 DISTNAME=      camlbz2-${VERSION}
 VERSION=       0.6.0
-PKGREVISION=   7
+PKGREVISION=   8
 CATEGORIES=    archivers
 MASTER_SITES=  http://forge.ocamlcore.org/frs/download.php/72/
 
@@ -15,17 +15,10 @@
 GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake
 MAKE_JOBS_SAFE=        no
+OCAML_USE_FINDLIB=     yes
 
+.include "../../mk/ocaml.mk"
 .include "../../mk/bsd.prefs.mk"
 
-PLIST_VARS+=   opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "arm")
-PLIST.opt=     yes
-.endif
-
 .include "../../archivers/bzip2/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2f3aa6ea92d3 -r 769968a740c4 archivers/ocaml-bz2/PLIST
--- a/archivers/ocaml-bz2/PLIST Sat Jun 25 14:05:20 2016 +0000
+++ b/archivers/ocaml-bz2/PLIST Sat Jun 25 14:15:05 2016 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2012/09/16 12:30:46 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/bz2
+@comment $NetBSD: PLIST,v 1.2 2016/06/25 14:15:05 jaapb Exp $
 lib/ocaml/site-lib/bz2/META
 ${PLIST.opt}lib/ocaml/site-lib/bz2/bz2.a
 lib/ocaml/site-lib/bz2/bz2.cma
@@ -9,4 +8,3 @@
 lib/ocaml/site-lib/bz2/bz2.mli
 lib/ocaml/site-lib/bz2/dllcamlbz2.so
 lib/ocaml/site-lib/bz2/libcamlbz2.a
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/bz2
diff -r 2f3aa6ea92d3 -r 769968a740c4 databases/ocaml-sqlite3/Makefile
--- a/databases/ocaml-sqlite3/Makefile  Sat Jun 25 14:05:20 2016 +0000
+++ b/databases/ocaml-sqlite3/Makefile  Sat Jun 25 14:15:05 2016 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.22 2016/05/05 11:45:37 jaapb Exp $
+# $NetBSD: Makefile,v 1.23 2016/06/25 14:16:17 jaapb Exp $
 
 PKGNAME=       ocaml-sqlite3-${VERSION}
 DISTNAME=      v${VERSION}
 VERSION=       2.0.6
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    databases
 MASTER_SITES=  http://github.com/mmottl/sqlite3-ocaml/archive/
 
@@ -20,6 +20,5 @@
 OCAML_USE_OASIS=       yes
 
 .include "../../mk/ocaml.mk"
-.include "../../devel/ocaml-findlib/buildlink3.mk"
 .include "../../databases/sqlite3/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 2f3aa6ea92d3 -r 769968a740c4 databases/ocaml-sqlite3/PLIST
--- a/databases/ocaml-sqlite3/PLIST     Sat Jun 25 14:05:20 2016 +0000
+++ b/databases/ocaml-sqlite3/PLIST     Sat Jun 25 14:15:05 2016 +0000
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/09 19:48:40 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/sqlite3
+@comment $NetBSD: PLIST,v 1.4 2016/06/25 14:16:17 jaapb Exp $
 lib/ocaml/site-lib/sqlite3/META
 lib/ocaml/site-lib/sqlite3/dllsqlite3_stubs.so
 lib/ocaml/site-lib/sqlite3/libsqlite3_stubs.a
@@ -10,4 +9,3 @@
 ${PLIST.ocaml-opt}lib/ocaml/site-lib/sqlite3/sqlite3.cmxa
 ${PLIST.ocaml-opt}lib/ocaml/site-lib/sqlite3/sqlite3.cmxs
 lib/ocaml/site-lib/sqlite3/sqlite3.mli
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/sqlite3