Update www/ocsigen-i18n to version 4.0.0.

Fixes are minor, but the package has switched to dune for building.

5 files changed, 28 insertions, 53 deletions

diff --git a/www/ocsigen-i18n/Makefile b/www/ocsigen-i18n/Makefile
index a039b917519..93e3d311ef0 100644
--- a/www/ocsigen-i18n/Makefile
+++ b/www/ocsigen-i18n/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2022/05/24 18:51:56 jaapb Exp $
+# $NetBSD: Makefile,v 1.10 2022/06/03 12:46:25 jaapb Exp $
 
 GITHUB_PROJECT=	ocsigen-i18n
-DISTNAME=	${GITHUB_PROJECT}-3.7.0
-PKGREVISION=	2
+DISTNAME=	${GITHUB_PROJECT}-4.0.0
 CATEGORIES=	www
 MASTER_SITES=	${MASTER_SITE_GITHUB:=besport/}
 
@@ -12,21 +11,8 @@ COMMENT=	I18n package for Ocsigen
 LICENSE=	gnu-lgpl-v2.1
 
 USE_LANGUAGES=		# none
-USE_TOOLS=		gmake
-BUILD_TARGET=		build
-MAKE_ENV=		bindir=${DESTDIR}${PREFIX}/bin
-INSTALLATION_DIRS+=	bin
-
-OCAML_USE_FINDLIB=	yes
-OCAML_FINDLIB_DIRS=	# empty
+OCAML_USE_DUNE=		yes
 
 .include "../../lang/ocaml/ocaml.mk"
-
-.if ${OCAML_USE_OPT_COMPILER} == "yes"
-MAKE_ENV+=	OPTNESS=native
-.else
-MAKE_ENV+=	OPTNESS=byte
-.endif
-
 .include "../../devel/ocaml-ppx_tools/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/www/ocsigen-i18n/PLIST b/www/ocsigen-i18n/PLIST
index 8a001cb064d..a1de4c14f3b 100644
--- a/www/ocsigen-i18n/PLIST
+++ b/www/ocsigen-i18n/PLIST
@@ -1,4 +1,22 @@
-@comment $NetBSD: PLIST,v 1.2 2018/07/19 14:24:10 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/06/03 12:46:25 jaapb Exp $
 bin/ocsigen-i18n-checker
 bin/ocsigen-i18n-generator
 bin/ocsigen-i18n-rewriter
+${OCAML_SITELIB}/ocsigen-i18n/META
+${OCAML_SITELIB}/ocsigen-i18n/dune-package
+${OCAML_SITELIB}/ocsigen-i18n/i18n_ppx_rewriter.ml
+${OCAML_SITELIB}/ocsigen-i18n/opam
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-i18n/ppx.a
+${OCAML_SITELIB}/ocsigen-i18n/ppx.cma
+${OCAML_SITELIB}/ocsigen-i18n/ppx.cmi
+${OCAML_SITELIB}/ocsigen-i18n/ppx.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-i18n/ppx.cmx
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-i18n/ppx.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-i18n/ppx.cmxs
+${OCAML_SITELIB}/ocsigen-i18n/ppx.exe
+${OCAML_SITELIB}/ocsigen-i18n/ppx.ml
+${OCAML_SITELIB}/ocsigen-i18n/ppx__I18n_ppx_rewriter.cmi
+${OCAML_SITELIB}/ocsigen-i18n/ppx__I18n_ppx_rewriter.cmt
+${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigen-i18n/ppx__I18n_ppx_rewriter.cmx
+share/doc/ocsigen-i18n/LICENSE
+share/doc/ocsigen-i18n/README.MD
diff --git a/www/ocsigen-i18n/buildlink3.mk b/www/ocsigen-i18n/buildlink3.mk
index d4b4a14bd68..7c2095e386c 100644
--- a/www/ocsigen-i18n/buildlink3.mk
+++ b/www/ocsigen-i18n/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2020/12/11 10:58:20 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2022/06/03 12:46:25 jaapb Exp $
 
 BUILDLINK_TREE+=	ocsigen-i18n
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocsigen-i18n
 OCSIGEN_I18N_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocsigen-i18n+=	ocsigen-i18n>=3.7.0
-BUILDLINK_ABI_DEPENDS.ocsigen-i18n+=	ocsigen-i18n>=3.7.0
+BUILDLINK_ABI_DEPENDS.ocsigen-i18n+=	ocsigen-i18n>=4.0.0
 BUILDLINK_PKGSRCDIR.ocsigen-i18n?=	../../www/ocsigen-i18n
 .endif	# OCSIGEN_I18N_BUILDLINK3_MK
 
diff --git a/www/ocsigen-i18n/distinfo b/www/ocsigen-i18n/distinfo
index 9eea6685850..01d7f9cfa2f 100644
--- a/www/ocsigen-i18n/distinfo
+++ b/www/ocsigen-i18n/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 11:29:42 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/06/03 12:46:25 jaapb Exp $
 
-BLAKE2s (ocsigen-i18n-3.7.0.tar.gz) = 6d8e8203e2398d537fdd707ee7eb35e4a7fd56cf24bbc811b8de371e51273fb6
-SHA512 (ocsigen-i18n-3.7.0.tar.gz) = e16743070f1a15bb8850132f710aceda61102dea692da8b611c7d249602007400036c4944d7a2ff14ffdd7dfcc42504377fd8762a7fe40540051ee09b0d563c1
-Size (ocsigen-i18n-3.7.0.tar.gz) = 7851 bytes
-SHA1 (patch-Makefile) = 8bce216858ae0d8a6c43c7b958b63db6aea30038
+BLAKE2s (ocsigen-i18n-4.0.0.tar.gz) = 9b473961ff507478750d463e18f318987578e140a0e3196aee94d35896df1f16
+SHA512 (ocsigen-i18n-4.0.0.tar.gz) = f39fdcd4f1b4457b3398384743ab60edbd018b4f727c8d293e57d9a8d3ee7a925f009c7ccfe7be66833f3bb658d1b3275087e771472884505a4395d1fec96673
+Size (ocsigen-i18n-4.0.0.tar.gz) = 17055 bytes
diff --git a/www/ocsigen-i18n/patches/patch-Makefile b/www/ocsigen-i18n/patches/patch-Makefile
deleted file mode 100644
index dbcc1def30b..00000000000
--- a/www/ocsigen-i18n/patches/patch-Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-$NetBSD: patch-Makefile,v 1.2 2020/04/21 13:02:02 jaapb Exp $
-
-Allow for bytecode or native compilation
-
---- Makefile.orig	2019-11-15 16:18:31.000000000 +0000
-+++ Makefile
-@@ -1,4 +1,8 @@
-+ifeq (${OPTNESS},native)
- OCAMLOPT=ocamlfind ocamlopt
-+else
-+OCAMLOPT=ocamlfind ocamlc
-+endif
- CHECKER=ocsigen-i18n-checker
- REWRITER=ocsigen-i18n-rewriter
- GENERATOR=ocsigen-i18n-generator
-@@ -26,7 +30,11 @@ install: ${PROGS}
- ifndef bindir
- 	${error bindir is not set}
- else
--	cp ${PROGS} ${bindir}
-+ifeq ($(OPTNESS),native)
-+	${BSD_INSTALL_PROGRAM} ${PROGS} ${bindir}
-+else
-+	${BSD_INSTALL_SCRIPT} ${PROGS} ${bindir}
-+endif
- endif
- 
- uninstall: