CVS commit: pkgsrc/devel/ocaml-git

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Mon Jul  1 16:08:52 UTC 2019

Modified Files:
        pkgsrc/devel/ocaml-git: Makefile PLIST
Added Files:
        pkgsrc/devel/ocaml-git: options.mk

Log Message:
Added options.mk to devel/ocaml-git, revbump.


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/devel/ocaml-git/Makefile \
    pkgsrc/devel/ocaml-git/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/ocaml-git/options.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/ocaml-git/Makefile
diff -u pkgsrc/devel/ocaml-git/Makefile:1.1 pkgsrc/devel/ocaml-git/Makefile:1.2
--- pkgsrc/devel/ocaml-git/Makefile:1.1 Tue Mar 19 14:28:52 2019
+++ pkgsrc/devel/ocaml-git/Makefile     Mon Jul  1 16:08:51 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2019/03/19 14:28:52 jaapb Exp $
+# $NetBSD: Makefile,v 1.2 2019/07/01 16:08:51 jaapb Exp $
 
 GITHUB_PROJECT=        ocaml-git
 DISTNAME=      ${GITHUB_PROJECT}-2.0.0
+PKGREVISION=   1
 CATEGORIES=    devel
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=mirage/}
 
@@ -14,7 +15,9 @@ USE_LANGUAGES=        # none
 
 OCAML_USE_DUNE=        yes
 DUNE_BUILD_PACKAGES=   git
+OPAM_INSTALL_FILES=    git
 
+.include "options.mk"
 .include "../../archivers/ocaml-decompress/buildlink3.mk"
 .include "../../devel/ocaml-astring/buildlink3.mk"
 .include "../../devel/ocaml-angstrom/buildlink3.mk"
Index: pkgsrc/devel/ocaml-git/PLIST
diff -u pkgsrc/devel/ocaml-git/PLIST:1.1 pkgsrc/devel/ocaml-git/PLIST:1.2
--- pkgsrc/devel/ocaml-git/PLIST:1.1    Tue Mar 19 14:28:52 2019
+++ pkgsrc/devel/ocaml-git/PLIST        Mon Jul  1 16:08:51 2019
@@ -1,4 +1,93 @@
-@comment $NetBSD: PLIST,v 1.1 2019/03/19 14:28:52 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.2 2019/07/01 16:08:51 jaapb Exp $
+${PLIST.unix}bin/ogit-cat-file
+${PLIST.unix}bin/ogit-dot
+${PLIST.http}bin/ogit-http-clone
+${PLIST.http}bin/ogit-http-fetch
+${PLIST.http}bin/ogit-http-fetch-all
+${PLIST.http}bin/ogit-http-ls
+${PLIST.unix}bin/ogit-write-tree
+${PLIST.http}${OCAML_SITELIB}/git-http/META
+${PLIST.http}${OCAML_SITELIB}/git-http/dune-package
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http.a
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http.cma
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http.cmi
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http.cmt
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http.cmti
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http.cmx
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http.cmxa
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http.cmxs
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http.ml
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http.mli
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__.cmi
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__.cmt
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http__.cmx
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__.ml
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Sync.cmi
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Sync.cmt
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Sync.cmti
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http__Sync.cmx
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Web.cmi
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Web.cmt
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http__Web.cmx
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Web_cohttp_lwt.cmi
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Web_cohttp_lwt.cmt
+${PLIST.http}${OCAML_SITELIB}/git-http/git_http__Web_cohttp_lwt.cmti
+${PLIST.http}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-http/git_http__Web_cohttp_lwt.cmx
+${PLIST.http}${OCAML_SITELIB}/git-http/opam
+${PLIST.http}${OCAML_SITELIB}/git-http/sync.ml
+${PLIST.http}${OCAML_SITELIB}/git-http/sync.mli
+${PLIST.http}${OCAML_SITELIB}/git-http/web.ml
+${PLIST.http}${OCAML_SITELIB}/git-http/web_cohttp_lwt.ml
+${PLIST.http}${OCAML_SITELIB}/git-http/web_cohttp_lwt.mli
+${PLIST.unix}${OCAML_SITELIB}/git-unix/META
+${PLIST.unix}${OCAML_SITELIB}/git-unix/dune-package
+${PLIST.unix}${OCAML_SITELIB}/git-unix/fs.ml
+${PLIST.unix}${OCAML_SITELIB}/git-unix/fs.mli
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix.a
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix.cma
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix.cmt
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix.cmti
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix.cmx
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix.cmxa
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix.cmxs
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix.ml
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix.mli
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__.cmt
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix__.cmx
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__.ml
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Fs.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Fs.cmt
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Fs.cmti
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix__Fs.cmx
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Http.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Http.cmt
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Http.cmti
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix__Http.cmx
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Index.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Index.cmt
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Index.cmti
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix__Index.cmx
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Net.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Net.cmt
+${PLIST.unix}${OCAML_SITELIB}/git-unix/git_unix__Net.cmti
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/git_unix__Net.cmx
+${PLIST.unix}${OCAML_SITELIB}/git-unix/http.ml
+${PLIST.unix}${OCAML_SITELIB}/git-unix/http.mli
+${PLIST.unix}${OCAML_SITELIB}/git-unix/index.ml
+${PLIST.unix}${OCAML_SITELIB}/git-unix/index.mli
+${PLIST.unix}${OCAML_SITELIB}/git-unix/net.ml
+${PLIST.unix}${OCAML_SITELIB}/git-unix/net.mli
+${PLIST.unix}${OCAML_SITELIB}/git-unix/opam
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/top/git_top.a
+${PLIST.unix}${OCAML_SITELIB}/git-unix/top/git_top.cma
+${PLIST.unix}${OCAML_SITELIB}/git-unix/top/git_top.cmi
+${PLIST.unix}${OCAML_SITELIB}/git-unix/top/git_top.cmt
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/top/git_top.cmx
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/top/git_top.cmxa
+${PLIST.unix}${PLIST.ocaml-opt}${OCAML_SITELIB}/git-unix/top/git_top.cmxs
+${PLIST.unix}${OCAML_SITELIB}/git-unix/top/git_top.ml
 ${OCAML_SITELIB}/git/META
 ${OCAML_SITELIB}/git/blob.ml
 ${OCAML_SITELIB}/git/blob.mli
@@ -248,6 +337,12 @@ ${OCAML_SITELIB}/git/user.ml
 ${OCAML_SITELIB}/git/user.mli
 ${OCAML_SITELIB}/git/value.ml
 ${OCAML_SITELIB}/git/value.mli
+${PLIST.http}share/doc/git-http/CHANGES.md
+${PLIST.http}share/doc/git-http/LICENSE.md
+${PLIST.http}share/doc/git-http/README.md
+${PLIST.unix}share/doc/git-unix/CHANGES.md
+${PLIST.unix}share/doc/git-unix/LICENSE.md
+${PLIST.unix}share/doc/git-unix/README.md
 share/doc/git/CHANGES.md
 share/doc/git/LICENSE.md
 share/doc/git/README.md

Added files:

Index: pkgsrc/devel/ocaml-git/options.mk
diff -u /dev/null pkgsrc/devel/ocaml-git/options.mk:1.1
--- /dev/null   Mon Jul  1 16:08:52 2019
+++ pkgsrc/devel/ocaml-git/options.mk   Mon Jul  1 16:08:51 2019
@@ -0,0 +1,36 @@
+# $NetBSD: options.mk,v 1.1 2019/07/01 16:08:51 jaapb Exp $
+
+PKG_OPTIONS_VAR=       PKG_OPTIONS.ocaml-git
+PKG_SUPPORTED_OPTIONS= unix http
+PKG_SUGGESTED_OPTIONS= unix http
+
+.include "../../mk/bsd.prefs.mk"
+
+.include "../../mk/bsd.options.mk"
+
+PLIST_VARS+=   unix http
+
+###
+### http support
+###
+.if !empty(PKG_OPTIONS:Mhttp)
+.include "../../www/ocaml-cohttp/buildlink3.mk"
+PLIST.http=    yes
+DUNE_BUILD_PACKAGES+=  git-http
+OPAM_INSTALL_FILES+=   git-http
+.endif
+
+###
+### unix support
+###
+.if !empty(PKG_OPTIONS:Munix)
+.if !empty(PKG_OPTIONS:Mhttp) # unix needs http
+.include "../../www/ocaml-cohttp/buildlink3.mk"
+.include "../../time/ocaml-mtime/buildlink3.mk"
+PLIST.unix=    yes
+DUNE_BUILD_PACKAGES+=  git-unix
+OPAM_INSTALL_FILES+=   git-unix
+.else
+PKG_FAIL_REASON+= "unix option needs http"
+.endif
+.endif