Fri Sep 8 17:04:06 2017 UTC ()
Stublibs directory must be added to ocaml ld.conf


(jaapb)
diff -r1.3 -r1.4 pkgsrc/devel/ocaml-jbuilder/Makefile
cvs diff -r1.3 -r1.4 pkgsrc/devel/ocaml-jbuilder/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-jbuilder/Attic/Makefile 2017/09/08 16:38:22 1.3
+++ pkgsrc/devel/ocaml-jbuilder/Attic/Makefile 2017/09/08 17:04:06 1.4
@@ -1,37 +1,38 @@ @@ -1,37 +1,38 @@
1# $NetBSD: Makefile,v 1.3 2017/09/08 16:38:22 jaapb Exp $ 1# $NetBSD: Makefile,v 1.4 2017/09/08 17:04:06 jaapb Exp $
2 2
3VERSION= 1.0_beta13 3VERSION= 1.0_beta13
4PKGREVISION= 1 4PKGREVISION= 1
5GITHUB_PROJECT= jbuilder 5GITHUB_PROJECT= jbuilder
6GITHUB_TAG= ${VERSION:S/_/+/} 6GITHUB_TAG= ${VERSION:S/_/+/}
7DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG} 7DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
8PKGNAME= ocaml-${GITHUB_PROJECT}-${VERSION} 8PKGNAME= ocaml-${GITHUB_PROJECT}-${VERSION}
9CATEGORIES= devel 9CATEGORIES= devel
10MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
11 11
12MAINTAINER= jaapb@NetBSD.org 12MAINTAINER= jaapb@NetBSD.org
13HOMEPAGE= https://github.com/janestreet/jbuilder/ 13HOMEPAGE= https://github.com/janestreet/jbuilder/
14COMMENT= Composable build system for OCaml 14COMMENT= Composable build system for OCaml
15LICENSE= apache-2.0 15LICENSE= apache-2.0
16 16
17WRKSRC= ${WRKDIR}/jbuilder-1.0-beta13 17WRKSRC= ${WRKDIR}/jbuilder-1.0-beta13
18USE_LANGUAGES= # none 18USE_LANGUAGES= # none
19 19
20BUILD_TARGET= default 20BUILD_TARGET= default
21MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS} 21MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS}
22INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/jbuilder 22INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/jbuilder
23 23
24OCAML_USE_FINDLIB= yes 24OCAML_USE_FINDLIB= yes
 25OCAML_FINDLIB_DIRS= jbuilder stublibs
25 26
26.include "../../mk/ocaml.mk" 27.include "../../mk/ocaml.mk"
27 28
28# Installation via OPAM does not work (OPAM needs to be set up) 29# Installation via OPAM does not work (OPAM needs to be set up)
29do-install: 30do-install:
30 for i in META; do \ 31 for i in META; do \
31 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/jbuilder/$$i \ 32 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/jbuilder/$$i \
32 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jbuilder; \ 33 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jbuilder; \
33 done; 34 done;
34 for i in jbuilder; do \ 35 for i in jbuilder; do \
35 ${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/$$i \ 36 ${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/$$i \
36 ${DESTDIR}${PREFIX}/bin; \ 37 ${DESTDIR}${PREFIX}/bin; \
37 done; 38 done;