Fri Aug 3 08:51:48 2018 UTC ()
Fixed www/ocsigenserver to build with ocaml 4.07.

This comes from upstream Github issue 152, which has not yet been
released. I expect to be able to remove this with a new upstream release.


(jaapb)
diff -r1.31 -r1.32 pkgsrc/www/ocsigen/Makefile
diff -r0 -r1.1 pkgsrc/www/ocsigen/files/ocsigen_getcommandline.mli
cvs diff -r1.31 -r1.32 pkgsrc/www/ocsigen/Makefile (expand / switch to unified diff)

--- pkgsrc/www/ocsigen/Makefile 2018/07/19 15:15:30 1.31
+++ pkgsrc/www/ocsigen/Makefile 2018/08/03 08:51:48 1.32
@@ -1,20 +1,20 @@ @@ -1,20 +1,20 @@
1# $NetBSD: Makefile,v 1.31 2018/07/19 15:15:30 jaapb Exp $ 1# $NetBSD: Makefile,v 1.32 2018/08/03 08:51:48 jaapb Exp $
2# 2#
3 3
4VERSION= 2.9 4VERSION= 2.9
5GITHUB_PROJECT= ocsigenserver 5GITHUB_PROJECT= ocsigenserver
6PKGNAME= ocsigen-${VERSION} 6PKGNAME= ocsigen-${VERSION}
7PKGREVISION= 1 7PKGREVISION= 2
8DISTNAME= ${GITHUB_PROJECT}-${VERSION} 8DISTNAME= ${GITHUB_PROJECT}-${VERSION}
9CATEGORIES= www 9CATEGORIES= www
10MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/} 10MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
11 11
12MAINTAINER= jaapb@NetBSD.org 12MAINTAINER= jaapb@NetBSD.org
13HOMEPAGE= http://www.ocsigen.org/ 13HOMEPAGE= http://www.ocsigen.org/
14COMMENT= Web programming framework for OCaml 14COMMENT= Web programming framework for OCaml
15LICENSE= gnu-lgpl-v2.1 15LICENSE= gnu-lgpl-v2.1
16 16
17# ln: ./ocsipersist.mli: File exists 17# ln: ./ocsipersist.mli: File exists
18# Makefile:42: recipe for target 'ocsipersist.mli' failed 18# Makefile:42: recipe for target 'ocsipersist.mli' failed
19MAKE_JOBS_SAFE= no 19MAKE_JOBS_SAFE= no
20 20
@@ -56,25 +56,29 @@ USE_TOOLS+= gmake @@ -56,25 +56,29 @@ USE_TOOLS+= gmake
56 56
57OCAML_USE_FINDLIB= yes 57OCAML_USE_FINDLIB= yes
58OCAML_FINDLIB_DIRS= ocsigenserver 58OCAML_FINDLIB_DIRS= ocsigenserver
59 59
60.include "../../mk/ocaml.mk" 60.include "../../mk/ocaml.mk"
61 61
62.if ${OCAML_USE_OPT_COMPILER} == "yes" 62.if ${OCAML_USE_OPT_COMPILER} == "yes"
63CONFIGURE_ARGS+= --enable-natdynlink 63CONFIGURE_ARGS+= --enable-natdynlink
64BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.0 64BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.0
65.else 65.else
66CONFIGURE_ARGS+= --disable-natdynlink 66CONFIGURE_ARGS+= --disable-natdynlink
67.endif 67.endif
68 68
 69post-extract:
 70 ${RUN} ${CP} ${FILESDIR}/ocsigen_getcommandline.mli ${WRKSRC}/src/baselib/commandline
 71 ${RUN} ${CP} ${FILESDIR}/ocsigen_getcommandline.mli ${WRKSRC}/src/baselib/nocommandline
 72
69.include "options.mk" 73.include "options.mk"
70.include "../../mk/pthread.buildlink3.mk" 74.include "../../mk/pthread.buildlink3.mk"
71.include "../../devel/ocaml-lwt_log/buildlink3.mk" 75.include "../../devel/ocaml-lwt_log/buildlink3.mk"
72.include "../../devel/ocaml-lwt_react/buildlink3.mk" 76.include "../../devel/ocaml-lwt_react/buildlink3.mk"
73.include "../../devel/ocaml-lwt_ssl/buildlink3.mk" 77.include "../../devel/ocaml-lwt_ssl/buildlink3.mk"
74.include "../../devel/pcre-ocaml/buildlink3.mk" 78.include "../../devel/pcre-ocaml/buildlink3.mk"
75.include "../../net/ocaml-ipaddr/buildlink3.mk" 79.include "../../net/ocaml-ipaddr/buildlink3.mk"
76.include "../../net/ocamlnet/buildlink3.mk" 80.include "../../net/ocamlnet/buildlink3.mk"
77.include "../../security/ocaml-cryptokit/buildlink3.mk" 81.include "../../security/ocaml-cryptokit/buildlink3.mk"
78.include "../../security/ocaml-ssl/buildlink3.mk" 82.include "../../security/ocaml-ssl/buildlink3.mk"
79.include "../../textproc/ocaml-tyxml/buildlink3.mk" 83.include "../../textproc/ocaml-tyxml/buildlink3.mk"
80.include "../../mk/bsd.pkg.mk" 84.include "../../mk/bsd.pkg.mk"
File Added: pkgsrc/www/ocsigen/files/ocsigen_getcommandline.mli
(** Contains the command line that will be parsed by the server
    when Ocsigen_commandline is linked *)
val commandline : string array