Thu Mar 18 21:16:59 2021 UTC ()
Add hack to camlp5 to make it build with ocaml 4.11.2 as well as 4.11.1.


(dholland)
diff -r1.38 -r1.39 pkgsrc/lang/camlp5/Makefile
cvs diff -r1.38 -r1.39 pkgsrc/lang/camlp5/Makefile (expand / switch to unified diff)

--- pkgsrc/lang/camlp5/Makefile 2021/03/08 08:13:02 1.38
+++ pkgsrc/lang/camlp5/Makefile 2021/03/18 21:16:59 1.39
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: Makefile,v 1.38 2021/03/08 08:13:02 jaapb Exp $ 1# $NetBSD: Makefile,v 1.39 2021/03/18 21:16:59 dholland Exp $
2# 2#
3 3
4GITHUB_PROJECT= camlp5 4GITHUB_PROJECT= camlp5
5DISTNAME= ${GITHUB_PROJECT}-7.13 5DISTNAME= ${GITHUB_PROJECT}-7.13
6PKGREVISION= 1 6PKGREVISION= 1
7CATEGORIES= lang 7CATEGORIES= lang
8MASTER_SITES= ${MASTER_SITE_GITHUB:=camlp5/} 8MASTER_SITES= ${MASTER_SITE_GITHUB:=camlp5/}
9GITHUB_TAG= rel${PKGVERSION_NOREV:S/.//} 9GITHUB_TAG= rel${PKGVERSION_NOREV:S/.//}
10 10
11MAINTAINER= tonio@NetBSD.org 11MAINTAINER= tonio@NetBSD.org
12HOMEPAGE= https://camlp5.github.io/ 12HOMEPAGE= https://camlp5.github.io/
13COMMENT= Preprocessor-pretty-printer for ocaml 13COMMENT= Preprocessor-pretty-printer for ocaml
14LICENSE= modified-bsd 14LICENSE= modified-bsd
@@ -24,18 +24,22 @@ CONFIGURE_ARGS+= --libdir ${PREFIX}/lib/ @@ -24,18 +24,22 @@ CONFIGURE_ARGS+= --libdir ${PREFIX}/lib/
24REPLACE_SH= tools/*.sh meta/*.sh ocaml_src/tools/*.sh compile/*.sh 24REPLACE_SH= tools/*.sh meta/*.sh ocaml_src/tools/*.sh compile/*.sh
25 25
26INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/camlp5 26INSTALLATION_DIRS+= ${OCAML_SITELIBDIR}/camlp5
27 27
28.include "../../mk/bsd.prefs.mk" 28.include "../../mk/bsd.prefs.mk"
29.include "../../mk/ocaml.mk" 29.include "../../mk/ocaml.mk"
30 30
31.if (${OCAML_USE_OPT_COMPILER} == "yes") 31.if (${OCAML_USE_OPT_COMPILER} == "yes")
32BUILD_TARGET= world.opt 32BUILD_TARGET= world.opt
33.else 33.else
34BUILD_TARGET= world 34BUILD_TARGET= world
35.endif 35.endif
36 36
 37post-extract:
 38 cd ${WRKSRC}/ocaml_stuff && ln -s 4.11.1 4.11.2
 39 cd ${WRKSRC}/ocaml_src/lib/versdep && ln -s 4.11.1.ml 4.11.2.ml
 40
37post-install: 41post-install:
38 cd ${WRKSRC}/etc && \ 42 cd ${WRKSRC}/etc && \
39 ${INSTALL_DATA} META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlp5 43 ${INSTALL_DATA} META ${DESTDIR}${PREFIX}/${OCAML_SITELIBDIR}/camlp5
40 44
41.include "../../mk/bsd.pkg.mk" 45.include "../../mk/bsd.pkg.mk"