Received: by mail.netbsd.org (Postfix, from userid 605) id C3A7884DBC; Fri, 8 Sep 2017 16:38:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 56A7984DAE for ; Fri, 8 Sep 2017 16:38:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id PKumt_TJePaL for ; Fri, 8 Sep 2017 16:38:22 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 9942A84CE1 for ; Fri, 8 Sep 2017 16:38:22 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 8B3ACFA97; Fri, 8 Sep 2017 16:38:22 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1504888702100430" MIME-Version: 1.0 Date: Fri, 8 Sep 2017 16:38:22 +0000 From: "Jaap Boender" Subject: CVS commit: pkgsrc/devel/ocaml-jbuilder To: pkgsrc-changes@NetBSD.org Reply-To: jaapb@netbsd.org X-Mailer: log_accum Message-Id: <20170908163822.8B3ACFA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1504888702100430 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jaapb Date: Fri Sep 8 16:38:22 UTC 2017 Modified Files: pkgsrc/devel/ocaml-jbuilder: Makefile PLIST buildlink3.mk Log Message: Removed dependency on opam for this package To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/devel/ocaml-jbuilder/Makefile \ pkgsrc/devel/ocaml-jbuilder/buildlink3.mk cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-jbuilder/PLIST Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1504888702100430 Content-Disposition: inline Content-Length: 3706 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/ocaml-jbuilder/Makefile diff -u pkgsrc/devel/ocaml-jbuilder/Makefile:1.2 pkgsrc/devel/ocaml-jbuilder/Makefile:1.3 --- pkgsrc/devel/ocaml-jbuilder/Makefile:1.2 Fri Sep 8 11:51:36 2017 +++ pkgsrc/devel/ocaml-jbuilder/Makefile Fri Sep 8 16:38:22 2017 @@ -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" Index: pkgsrc/devel/ocaml-jbuilder/buildlink3.mk diff -u pkgsrc/devel/ocaml-jbuilder/buildlink3.mk:1.2 pkgsrc/devel/ocaml-jbuilder/buildlink3.mk:1.3 --- pkgsrc/devel/ocaml-jbuilder/buildlink3.mk:1.2 Fri Sep 8 11:51:36 2017 +++ pkgsrc/devel/ocaml-jbuilder/buildlink3.mk Fri Sep 8 16:38:22 2017 @@ -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 Index: pkgsrc/devel/ocaml-jbuilder/PLIST diff -u pkgsrc/devel/ocaml-jbuilder/PLIST:1.1 pkgsrc/devel/ocaml-jbuilder/PLIST:1.2 --- pkgsrc/devel/ocaml-jbuilder/PLIST:1.1 Tue Jul 11 11:14:58 2017 +++ pkgsrc/devel/ocaml-jbuilder/PLIST Fri Sep 8 16:38:22 2017 @@ -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 --_----------=_1504888702100430--