summaryrefslogtreecommitdiff
path: root/www
diff options
context:
space:
mode:
authorjaapb <jaapb@pkgsrc.org>2018-08-03 08:51:48 +0000
committerjaapb <jaapb@pkgsrc.org>2018-08-03 08:51:48 +0000
commit9cc0b811161a58f55003c750a5a66138193b0934 (patch)
tree3ac9eddc7f1d60d134959647bc0fec1c1c046e7c /www
parent32cfa405af9e505cc6ad3c405c17d27deb610ce1 (diff)
downloadpkgsrc-9cc0b811161a58f55003c750a5a66138193b0934.tar.gz
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.
Diffstat (limited to 'www')
-rw-r--r--www/ocsigen/Makefile8
-rw-r--r--www/ocsigen/files/ocsigen_getcommandline.mli3
2 files changed, 9 insertions, 2 deletions
diff --git a/www/ocsigen/Makefile b/www/ocsigen/Makefile
index 4852b9efb63..b4dcedee3db 100644
--- a/www/ocsigen/Makefile
+++ b/www/ocsigen/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.31 2018/07/19 15:15:30 jaapb Exp $
+# $NetBSD: Makefile,v 1.32 2018/08/03 08:51:48 jaapb Exp $
#
VERSION= 2.9
GITHUB_PROJECT= ocsigenserver
PKGNAME= ocsigen-${VERSION}
-PKGREVISION= 1
+PKGREVISION= 2
DISTNAME= ${GITHUB_PROJECT}-${VERSION}
CATEGORIES= www
MASTER_SITES= ${MASTER_SITE_GITHUB:=ocsigen/}
@@ -66,6 +66,10 @@ BUILDLINK_API_DEPENDS.ocaml+= ocaml>=3.12.0
CONFIGURE_ARGS+= --disable-natdynlink
.endif
+post-extract:
+ ${RUN} ${CP} ${FILESDIR}/ocsigen_getcommandline.mli ${WRKSRC}/src/baselib/commandline
+ ${RUN} ${CP} ${FILESDIR}/ocsigen_getcommandline.mli ${WRKSRC}/src/baselib/nocommandline
+
.include "options.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../devel/ocaml-lwt_log/buildlink3.mk"
diff --git a/www/ocsigen/files/ocsigen_getcommandline.mli b/www/ocsigen/files/ocsigen_getcommandline.mli
new file mode 100644
index 00000000000..d853ae3e7eb
--- /dev/null
+++ b/www/ocsigen/files/ocsigen_getcommandline.mli
@@ -0,0 +1,3 @@
+(** Contains the command line that will be parsed by the server
+ when Ocsigen_commandline is linked *)
+val commandline : string array