Removed dependency on opam for this package

3 files changed, 21 insertions, 24 deletions

diff --git a/devel/ocaml-jbuilder/Makefile b/devel/ocaml-jbuilder/Makefile
index 484dc2dfb19..ec283b2491b 100644
--- a/devel/ocaml-jbuilder/Makefile
+++ b/devel/ocaml-jbuilder/Makefile
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2017/09/08 11:51:36 jaapb Exp $
+# $NetBSD: Makefile,v 1.3 2017/09/08 16:38:22 jaapb Exp $
 
 VERSION=	1.0_beta13
+PKGREVISION=	1
 GITHUB_PROJECT=	jbuilder
 GITHUB_TAG=	${VERSION:S/_/+/}
 DISTNAME=	${GITHUB_PROJECT}-${GITHUB_TAG}
@@ -21,25 +22,25 @@ MAKE_ENV+=	MAKE_JOBS=${MAKE_JOBS}
 INSTALLATION_DIRS+=	bin ${PKGMANDIR}/man1 ${OCAML_SITELIBDIR}/jbuilder
 
 OCAML_USE_FINDLIB=	yes
-OCAML_USE_OPAM=	yes
 
 .include "../../mk/ocaml.mk"
 
 # Installation via OPAM does not work (OPAM needs to be set up)
-#do-install:
-#	for i in META; do \
-#		${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/jbuilder/$$i \
-#		${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jbuilder; \
-#	done;
-#	for i in jbuilder; do \
-#		${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/$$i \
-#		${DESTDIR}${PREFIX}/bin; \
-#	done;
-#	for i in jbuilder.1 jbuilder-build.1 jbuilder-external-lib-deps.1 \
-#		jbuilder-install.1 jbuilder-installed-libraries.1 jbuilder-runtest.1 \
-#		jbuilder-uninstall.1; do \
-#		${INSTALL_MAN} ${WRKSRC}/_build/install/default/man/man1/$$i \
-#		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
-#	done;
+do-install:
+	for i in META; do \
+		${INSTALL_DATA} ${WRKSRC}/_build/install/default/lib/jbuilder/$$i \
+		${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/jbuilder; \
+	done;
+	for i in jbuilder; do \
+		${INSTALL_PROGRAM} ${WRKSRC}/_build/install/default/bin/$$i \
+		${DESTDIR}${PREFIX}/bin; \
+	done;
+	for i in jbuilder.1 jbuilder-build.1 jbuilder-clean.1 \
+		jbuilder-exec.1 jbuilder-external-lib-deps.1 \
+		jbuilder-install.1 jbuilder-installed-libraries.1 jbuilder-rules.1 \
+		jbuilder-runtest.1 jbuilder-subst.1 jbuilder-uninstall.1; do \
+		${INSTALL_MAN} ${WRKSRC}/_build/install/default/man/man1/$$i \
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man1; \
+	done;
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/ocaml-jbuilder/PLIST b/devel/ocaml-jbuilder/PLIST
index 6f1affbf323..afbd0da8fa8 100644
--- a/devel/ocaml-jbuilder/PLIST
+++ b/devel/ocaml-jbuilder/PLIST
@@ -1,7 +1,6 @@
-@comment $NetBSD: PLIST,v 1.1 2017/07/11 11:14:58 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/09/08 16:38:22 jaapb Exp $
 bin/jbuilder
 ${OCAML_SITELIB}/jbuilder/META
-${OCAML_SITELIB}/jbuilder/opam
 man/man1/jbuilder-build.1
 man/man1/jbuilder-clean.1
 man/man1/jbuilder-exec.1
@@ -13,6 +12,3 @@ man/man1/jbuilder-runtest.1
 man/man1/jbuilder-subst.1
 man/man1/jbuilder-uninstall.1
 man/man1/jbuilder.1
-share/doc/jbuilder/CHANGES.md
-share/doc/jbuilder/LICENSE.md
-share/doc/jbuilder/README.md
diff --git a/devel/ocaml-jbuilder/buildlink3.mk b/devel/ocaml-jbuilder/buildlink3.mk
index ba5c893f15b..c08c2b57142 100644
--- a/devel/ocaml-jbuilder/buildlink3.mk
+++ b/devel/ocaml-jbuilder/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.2 2017/09/08 11:51:36 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.3 2017/09/08 16:38:22 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-jbuilder
 
 .if !defined(OCAML_JBUILDER_BUILDLINK3_MK)
 OCAML_JBUILDER_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.ocaml-jbuilder+=	ocaml-jbuilder>=1.0_beta12
+BUILDLINK_API_DEPENDS.ocaml-jbuilder+=	ocaml-jbuilder>=1.0_beta13nb1
 BUILDLINK_PKGSRCDIR.ocaml-jbuilder?=	../../devel/ocaml-jbuilder
 .endif	# OCAML_JBUILDER_BUILDLINK3_MK