CVS commit: pkgsrc/textproc/ocaml-expat

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

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

Modified Files:
        pkgsrc/textproc/ocaml-expat: 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.9 -r1.10 pkgsrc/textproc/ocaml-expat/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/ocaml-expat/PLIST

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

Modified files:

Index: pkgsrc/textproc/ocaml-expat/Makefile
diff -u pkgsrc/textproc/ocaml-expat/Makefile:1.9 pkgsrc/textproc/ocaml-expat/Makefile:1.10
--- pkgsrc/textproc/ocaml-expat/Makefile:1.9    Thu May  5 11:45:41 2016
+++ pkgsrc/textproc/ocaml-expat/Makefile        Sat Jun 25 14:32:00 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2016/05/05 11:45:41 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2016/06/25 14:32:00 jaapb Exp $
 #
 
 DISTNAME=      ocaml-expat-0.9.1
-PKGREVISION=   6
+PKGREVISION=   7
 CATEGORIES=    textproc
 MASTER_SITES=  http://mmzeeman.home.xs4all.nl/ocaml/
 
@@ -15,15 +15,13 @@ USE_TOOLS+= gmake
 USE_LANGUAGES= c
 BUILD_TARGET=  all
 
-PLIST_VARS+=   opt
-.if (${MACHINE_ARCH} == "i386") || (${MACHINE_ARCH} == "powerpc") || \
-    (${MACHINE_ARCH} == "sparc") || (${MACHINE_ARCH} == "x86_64") || \
-    (${MACHINE_ARCH} == "arm")
-PLIST.opt=     yes
+OCAML_USE_FINDLIB=     yes
+
+.include "../../mk/ocaml.mk"
+
+.if (${OCAML_USE_OPT_COMPILER} == "yes")
 BUILD_TARGET+= allopt expat.cmxs
 .endif
 
-.include "../../devel/ocaml-findlib/buildlink3.mk"
-.include "../../lang/ocaml/buildlink3.mk"
 .include "../../textproc/expat/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/ocaml-expat/PLIST
diff -u pkgsrc/textproc/ocaml-expat/PLIST:1.2 pkgsrc/textproc/ocaml-expat/PLIST:1.3
--- pkgsrc/textproc/ocaml-expat/PLIST:1.2       Sun Jun 16 09:45:19 2013
+++ pkgsrc/textproc/ocaml-expat/PLIST   Sat Jun 25 14:32:00 2016
@@ -1,12 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2013/06/16 09:45:19 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/lib/ocaml/site-lib/expat
-lib/ocaml/site-lib/expat/META
-lib/ocaml/site-lib/expat/dllmlexpat.so
-${PLIST.opt}lib/ocaml/site-lib/expat/expat.a
-lib/ocaml/site-lib/expat/expat.cma
-${PLIST.opt}lib/ocaml/site-lib/expat/expat.cmxa
-${PLIST.opt}lib/ocaml/site-lib/expat/expat.cmxs
-lib/ocaml/site-lib/expat/expat.cmi
-lib/ocaml/site-lib/expat/expat.mli
-lib/ocaml/site-lib/expat/libmlexpat.a
-@exec %D/libexec/ocaml-findlib-register add %D/lib/ocaml/site-lib/expat
+@comment $NetBSD: PLIST,v 1.3 2016/06/25 14:32:00 jaapb Exp $
+${OCAML_SITELIB}/expat/META
+${OCAML_SITELIB}/expat/dllmlexpat.so
+${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.a
+${OCAML_SITELIB}/expat/expat.cma
+${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/expat/expat.cmxs
+${OCAML_SITELIB}/expat/expat.cmi
+${OCAML_SITELIB}/expat/expat.mli
+${OCAML_SITELIB}/expat/libmlexpat.a