CVS commit: pkgsrc/archivers/ocaml-bz2

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

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

Modified Files:
        pkgsrc/archivers/ocaml-bz2: 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.10 -r1.11 pkgsrc/archivers/ocaml-bz2/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/archivers/ocaml-bz2/PLIST

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

Modified files:

Index: pkgsrc/archivers/ocaml-bz2/Makefile
diff -u pkgsrc/archivers/ocaml-bz2/Makefile:1.10 pkgsrc/archivers/ocaml-bz2/Makefile:1.11
--- pkgsrc/archivers/ocaml-bz2/Makefile:1.10    Thu May  5 11:45:37 2016
+++ pkgsrc/archivers/ocaml-bz2/Makefile Sat Jun 25 14:15:05 2016
@@ -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 @@ LICENSE=    gnu-lgpl-v2.1
 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"

Index: pkgsrc/archivers/ocaml-bz2/PLIST
diff -u pkgsrc/archivers/ocaml-bz2/PLIST:1.1 pkgsrc/archivers/ocaml-bz2/PLIST:1.2
--- pkgsrc/archivers/ocaml-bz2/PLIST:1.1        Sun Sep 16 12:30:46 2012
+++ pkgsrc/archivers/ocaml-bz2/PLIST    Sat Jun 25 14:15:05 2016
@@ -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.cmi
 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