CVS commit: pkgsrc/devel/ocaml-react

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

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

Modified Files:
        pkgsrc/devel/ocaml-react: Makefile PLIST

Log Message:
Package uses ocamlbuild - also cleaned up Makefile a bit. No upstream
changes.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/devel/ocaml-react/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/devel/ocaml-react/PLIST

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

Modified files:

Index: pkgsrc/devel/ocaml-react/Makefile
diff -u pkgsrc/devel/ocaml-react/Makefile:1.11 pkgsrc/devel/ocaml-react/Makefile:1.12
--- pkgsrc/devel/ocaml-react/Makefile:1.11      Thu May  5 11:45:39 2016
+++ pkgsrc/devel/ocaml-react/Makefile   Sat Jun 25 14:29:01 2016
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2016/05/05 11:45:39 jaapb Exp $
+# $NetBSD: Makefile,v 1.12 2016/06/25 14:29:01 jaapb Exp $
 
 DISTNAME=      react-1.2.0
 PKGNAME=       ocaml-${DISTNAME}
-PKGREVISION=   3
+PKGREVISION=   4
 CATEGORIES=    devel
 MASTER_SITES=  http://erratique.ch/software/react/releases/
 EXTRACT_SUFX=  .tbz
@@ -15,11 +15,7 @@ LICENSE=     modified-bsd
 CONFIGURE_ARGS+=       --prefix "${PREFIX}" --destdir "${DESTDIR}"
 INSTALLATION_DIRS+=    ${OCAML_SITELIBDIR}/react
 
-#SUBST_CLASSES+=   destdir
-#SUBST_STAGE.destdir=  post-configure
-#SUBST_MESSAGE.destdir=  Changing install location to DESTDIR
-#SUBST_FILES.destdir=  setup.ml
-#SUBST_SED.destdir=      -e 's,"install" :: findlib_name,"install" :: "-destdir ${DESTDIR}${PREFIX}/lib/ocaml/site-lib" :: "-ldconf /dev/null" :: findlib_name,'
+OCAML_USE_FINDLIB=     yes
 
 .include "../../mk/ocaml.mk"
 
@@ -45,5 +41,5 @@ do-install:
        ${INSTALL_DATA} ${WRKSRC}/_build/pkg/META \
                ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/react
 
-.include "../../devel/ocaml-findlib/buildlink3.mk"
+.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/ocaml-react/PLIST
diff -u pkgsrc/devel/ocaml-react/PLIST:1.3 pkgsrc/devel/ocaml-react/PLIST:1.4
--- pkgsrc/devel/ocaml-react/PLIST:1.3  Thu Oct  9 21:38:49 2014
+++ pkgsrc/devel/ocaml-react/PLIST      Sat Jun 25 14:29:01 2016
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2014/10/09 21:38:49 jaapb Exp $
-@unexec %D/libexec/ocaml-findlib-register del %D/${OCAML_SITELIB}/react
+@comment $NetBSD: PLIST,v 1.4 2016/06/25 14:29:01 jaapb Exp $
 ${OCAML_SITELIB}/react/META
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react.a
 ${OCAML_SITELIB}/react/react.cmi
@@ -12,4 +11,3 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/react
 ${OCAML_SITELIB}/react/react_top.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/react/react_top.cmxs
-@exec %D/libexec/ocaml-findlib-register add %D/${OCAML_SITELIB}/react