summaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
authorjaapb <jaapb>2016-06-25 14:29:01 +0000
committerjaapb <jaapb>2016-06-25 14:29:01 +0000
commit23f78d4544651fa66c154a7fcfcaa1cb65c54f02 (patch)
tree2b81b05e14865463d0313b29431d89b655e9ab5a /devel
parentaadf4d6e90fcf7ce3db522f9c8d333b7e3859ad5 (diff)
downloadpkgsrc-23f78d4544651fa66c154a7fcfcaa1cb65c54f02.tar.gz
Package uses ocamlbuild - also cleaned up Makefile a bit. No upstream
changes.
Diffstat (limited to 'devel')
-rw-r--r--devel/ocaml-react/Makefile12
-rw-r--r--devel/ocaml-react/PLIST4
2 files changed, 5 insertions, 11 deletions
diff --git a/devel/ocaml-react/Makefile b/devel/ocaml-react/Makefile
index 27b85117b2d..fe923fd6665 100644
--- a/devel/ocaml-react/Makefile
+++ b/devel/ocaml-react/Makefile
@@ -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"
diff --git a/devel/ocaml-react/PLIST b/devel/ocaml-react/PLIST
index 9a50d4dfa6d..82c771381b7 100644
--- a/devel/ocaml-react/PLIST
+++ b/devel/ocaml-react/PLIST
@@ -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/react_top.a
${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