Fri Sep 8 16:38:22 2017 UTC ()
Removed dependency on opam for this package


(jaapb)
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-jbuilder/Makefile
diff -r1.2 -r1.3 pkgsrc/devel/ocaml-jbuilder/buildlink3.mk
diff -r1.1 -r1.2 pkgsrc/devel/ocaml-jbuilder/PLIST
cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-jbuilder/Attic/Makefile (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-jbuilder/Attic/Makefile 2017/09/08 11:51:36 1.2
+++ pkgsrc/devel/ocaml-jbuilder/Attic/Makefile 2017/09/08 16:38:22 1.3
@@ -1,45 +1,46 @@ @@ -1,45 +1,46 @@
1# $NetBSD: Makefile,v 1.2 2017/09/08 11:51:36 jaapb Exp $ 1# $NetBSD: Makefile,v 1.3 2017/09/08 16:38:22 jaapb Exp $
2 2
3VERSION= 1.0_beta13 3VERSION= 1.0_beta13
 4PKGREVISION= 1
4GITHUB_PROJECT= jbuilder 5GITHUB_PROJECT= jbuilder
5GITHUB_TAG= ${VERSION:S/_/+/} 6GITHUB_TAG= ${VERSION:S/_/+/}
6DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG} 7DISTNAME= ${GITHUB_PROJECT}-${GITHUB_TAG}
7PKGNAME= ocaml-${GITHUB_PROJECT}-${VERSION} 8PKGNAME= ocaml-${GITHUB_PROJECT}-${VERSION}
8CATEGORIES= devel 9CATEGORIES= devel
9MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=janestreet/}
10 11
11MAINTAINER= jaapb@NetBSD.org 12MAINTAINER= jaapb@NetBSD.org
12HOMEPAGE= https://github.com/janestreet/jbuilder/ 13HOMEPAGE= https://github.com/janestreet/jbuilder/
13COMMENT= Composable build system for OCaml 14COMMENT= Composable build system for OCaml
14LICENSE= apache-2.0 15LICENSE= apache-2.0
15 16
16WRKSRC= ${WRKDIR}/jbuilder-1.0-beta13 17WRKSRC= ${WRKDIR}/jbuilder-1.0-beta13
17USE_LANGUAGES= # none 18USE_LANGUAGES= # none
18 19
19BUILD_TARGET= default 20BUILD_TARGET= default
20MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS} 21MAKE_ENV+= MAKE_JOBS=${MAKE_JOBS}
21INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/jbuilder 22INSTALLATION_DIRS+= bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/jbuilder
22 23
23OCAML_USE_FINDLIB= yes 24OCAML_USE_FINDLIB= yes
24OCAML_USE_OPAM= yes 
25 25
26.include "../../mk/ocaml.mk" 26.include "../../mk/ocaml.mk"
27 27
28# Installation via OPAM does not work (OPAM needs to be set up) 28# Installation via OPAM does not work (OPAM needs to be set up)
29#do-install: 29do-install:
30# for i in META; do \ 30 for i in META; do \
31# ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/jbuilder/$$i \ 31 ${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/jbuilder/$$i \
32# ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jbuilder; \ 32 ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jbuilder; \
33# done; 33 done;
34# for i in jbuilder; do \ 34 for i in jbuilder; do \
35# ${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/$$i \ 35 ${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/$$i \
36# ${DESTDIR}${PREFIX}/bin; \ 36 ${DESTDIR}${PREFIX}/bin; \
37# done; 37 done;
38# for i in jbuilder.1 jbuilder-build.1 jbuilder-external-lib-deps.1 \ 38 for i in jbuilder.1 jbuilder-build.1 jbuilder-clean.1 \
39# jbuilder-install.1 jbuilder-installed-libraries.1 jbuilder-runtest.1 \ 39 jbuilder-exec.1 jbuilder-external-lib-deps.1 \
40# jbuilder-uninstall.1; do \ 40 jbuilder-install.1 jbuilder-installed-libraries.1 jbuilder-rules.1 \
41# ${INSTALL_MAN} ${WRKSRC}/_build/install/default/man/man1/$$i \ 41 jbuilder-runtest.1 jbuilder-subst.1 jbuilder-uninstall.1; do \
42# ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \ 42 ${INSTALL_MAN} ${WRKSRC}/_build/install/default/man/man1/$$i \
43# done; 43 ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
 44 done;
44 45
45.include "../../mk/bsd.pkg.mk" 46.include "../../mk/bsd.pkg.mk"
cvs diff -r1.2 -r1.3 pkgsrc/devel/ocaml-jbuilder/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-jbuilder/Attic/buildlink3.mk 2017/09/08 11:51:36 1.2
+++ pkgsrc/devel/ocaml-jbuilder/Attic/buildlink3.mk 2017/09/08 16:38:22 1.3
@@ -1,12 +1,12 @@ @@ -1,12 +1,12 @@
1# $NetBSD: buildlink3.mk,v 1.2 2017/09/08 11:51:36 jaapb Exp $ 1# $NetBSD: buildlink3.mk,v 1.3 2017/09/08 16:38:22 jaapb Exp $
2 2
3BUILDLINK_TREE+= ocaml-jbuilder 3BUILDLINK_TREE+= ocaml-jbuilder
4 4
5.if !defined(OCAML_JBUILDER_BUILDLINK3_MK) 5.if !defined(OCAML_JBUILDER_BUILDLINK3_MK)
6OCAML_JBUILDER_BUILDLINK3_MK:= 6OCAML_JBUILDER_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.ocaml-jbuilder+= ocaml-jbuilder>=1.0_beta12 8BUILDLINK_API_DEPENDS.ocaml-jbuilder+= ocaml-jbuilder>=1.0_beta13nb1
9BUILDLINK_PKGSRCDIR.ocaml-jbuilder?= ../../devel/ocaml-jbuilder 9BUILDLINK_PKGSRCDIR.ocaml-jbuilder?= ../../devel/ocaml-jbuilder
10.endif # OCAML_JBUILDER_BUILDLINK3_MK 10.endif # OCAML_JBUILDER_BUILDLINK3_MK
11 11
12BUILDLINK_TREE+= -ocaml-jbuilder 12BUILDLINK_TREE+= -ocaml-jbuilder
cvs diff -r1.1 -r1.2 pkgsrc/devel/ocaml-jbuilder/Attic/PLIST (expand / switch to unified diff)

--- pkgsrc/devel/ocaml-jbuilder/Attic/PLIST 2017/07/11 11:14:58 1.1
+++ pkgsrc/devel/ocaml-jbuilder/Attic/PLIST 2017/09/08 16:38:22 1.2
@@ -1,18 +1,14 @@ @@ -1,18 +1,14 @@
1@comment $NetBSD: PLIST,v 1.1 2017/07/11 11:14:58 jaapb Exp $ 1@comment $NetBSD: PLIST,v 1.2 2017/09/08 16:38:22 jaapb Exp $
2bin/jbuilder 2bin/jbuilder
3${OCAML_SITELIB}/jbuilder/META 3${OCAML_SITELIB}/jbuilder/META
4${OCAML_SITELIB}/jbuilder/opam 
5man/man1/jbuilder-build.1 4man/man1/jbuilder-build.1
6man/man1/jbuilder-clean.1 5man/man1/jbuilder-clean.1
7man/man1/jbuilder-exec.1 6man/man1/jbuilder-exec.1
8man/man1/jbuilder-external-lib-deps.1 7man/man1/jbuilder-external-lib-deps.1
9man/man1/jbuilder-install.1 8man/man1/jbuilder-install.1
10man/man1/jbuilder-installed-libraries.1 9man/man1/jbuilder-installed-libraries.1
11man/man1/jbuilder-rules.1 10man/man1/jbuilder-rules.1
12man/man1/jbuilder-runtest.1 11man/man1/jbuilder-runtest.1
13man/man1/jbuilder-subst.1 12man/man1/jbuilder-subst.1
14man/man1/jbuilder-uninstall.1 13man/man1/jbuilder-uninstall.1
15man/man1/jbuilder.1 14man/man1/jbuilder.1
16share/doc/jbuilder/CHANGES.md 
17share/doc/jbuilder/LICENSE.md 
18share/doc/jbuilder/README.md