Update databases/ocaml-dbm to version 1.3.

This migrates the distribution to github and makes other minor changes.

4 files changed, 33 insertions, 27 deletions

diff --git a/databases/ocaml-dbm/Makefile b/databases/ocaml-dbm/Makefile
index 37a3fa8cfe3..21eaec88188 100644
--- a/databases/ocaml-dbm/Makefile
+++ b/databases/ocaml-dbm/Makefile
@@ -1,16 +1,16 @@
-# $NetBSD: Makefile,v 1.21 2021/03/08 08:12:46 jaapb Exp $
+# $NetBSD: Makefile,v 1.22 2022/05/04 08:56:02 jaapb Exp $
 #
 
-PKGNAME=	ocaml-dbm-${VERSION}
-DISTNAME=	camldbm-${VERSION}
-VERSION=	1.0
-PKGREVISION=	18
+DISTNAME=	caml${GITHUB_PROJECT}-1.3
+PKGNAME=	ocaml-${DISTNAME}
 CATEGORIES=	databases
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/728/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=ocaml/}
+GITHUB_PROJECT=	dbm
+GITHUB_TAG=	camldbm-${PKGVERSION_NOREV}
+DIST_SUBDIR=	ocaml-
 
 MAINTAINER=	jaapb@NetBSD.org
-HOMEPAGE=	http://camldbm.forge.ocamlcore.org/
+HOMEPAGE=	https://github.com/ocaml/dbm/
 COMMENT=	OCaml binding to the NDBM and GDBM database library
 LICENSE=	gnu-lgpl-v2
 
@@ -18,8 +18,9 @@ CONFLICTS=	ocaml-findlib<1.4nb1
 
 HAS_CONFIGURE=		yes
 USE_TOOLS+=		gmake
-MAKE_ENV+=		HAS_OCAMLOPT="${OCAML_USE_OPT_COMPILER}"
-OCAML_USE_FINDLIB=	yes
+MAKE_ENV+=		HAS_OCAMLOPT="${OCAML_USE_OPT_COMPILER}" \
+			STUBLIBDIR="${DESTDIR}${PREFIX}/lib/ocaml/site-lib/dbm" \
+			LIBDIR="${DESTDIR}${PREFIX}/lib/ocaml/site-lib/dbm"
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/META ${DESTDIR}${PREFIX}/lib/ocaml/site-lib/dbm
diff --git a/databases/ocaml-dbm/buildlink3.mk b/databases/ocaml-dbm/buildlink3.mk
index b3e1bd25b77..cb507b056b0 100644
--- a/databases/ocaml-dbm/buildlink3.mk
+++ b/databases/ocaml-dbm/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.17 2021/03/08 08:12:46 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.18 2022/05/04 08:56:02 jaapb Exp $
 
 BUILDLINK_TREE+=	ocaml-dbm
 
@@ -6,7 +6,7 @@ BUILDLINK_TREE+=	ocaml-dbm
 OCAML_DBM_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.ocaml-dbm+=	ocaml-dbm>=1.0
-BUILDLINK_ABI_DEPENDS.ocaml-dbm?=	ocaml-dbm>=1.0nb18
+BUILDLINK_ABI_DEPENDS.ocaml-dbm?=	ocaml-dbm>=1.0nb21
 BUILDLINK_PKGSRCDIR.ocaml-dbm?=		../../databases/ocaml-dbm
 
 .include "../../databases/gdbm/buildlink3.mk"
diff --git a/databases/ocaml-dbm/distinfo b/databases/ocaml-dbm/distinfo
index cdfce897d0c..a3cd8c2054a 100644
--- a/databases/ocaml-dbm/distinfo
+++ b/databases/ocaml-dbm/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.6 2021/10/26 10:09:25 nia Exp $
+$NetBSD: distinfo,v 1.7 2022/05/04 08:56:02 jaapb Exp $
 
-BLAKE2s (camldbm-1.0.tgz) = 9af16f4d81bb42a34d22cb8d943c917ed8d059ba0984702bca56a35b500b54c7
-SHA512 (camldbm-1.0.tgz) = d0b752754650efb400f13f957e83fddccf1fc9ac9e1d11f453af94e9aa599546a316eb110685b3728b593c99cbf859cdc7bcf924c878cf8b6dead3dc413ccfbf
-Size (camldbm-1.0.tgz) = 14397 bytes
-SHA1 (patch-Makefile) = 20c4d5b50fea2829c69bb8c5bb69085dafca64b4
+BLAKE2s (ocaml-/camldbm-1.3.tar.gz) = daac40d2b8b3a948b9e962ac14f35abbec6285e9a65867d0ad4d84c3e5b463fd
+SHA512 (ocaml-/camldbm-1.3.tar.gz) = cf2d24e7e169a71cc117541dbf6b89e048f62e92f00af229c512ad13a226a7f7dba1ee7db0370393d08b5a342a1c296d70ecddfec13f300369513421ef4da0ce
+Size (ocaml-/camldbm-1.3.tar.gz) = 14831 bytes
+SHA1 (patch-Makefile) = 6e156ab18f514dfbcb884d2d52bd60252be2ee78
diff --git a/databases/ocaml-dbm/patches/patch-Makefile b/databases/ocaml-dbm/patches/patch-Makefile
index 48031331793..750e1f77632 100644
--- a/databases/ocaml-dbm/patches/patch-Makefile
+++ b/databases/ocaml-dbm/patches/patch-Makefile
@@ -1,7 +1,8 @@
-$NetBSD: patch-Makefile,v 1.2 2016/07/03 10:44:49 jaapb Exp $
+$NetBSD: patch-Makefile,v 1.3 2022/05/04 08:56:02 jaapb Exp $
 
-Make native code compilation optional and integrate with findlib
---- Makefile.orig	2011-11-22 15:56:49.000000000 +0000
+Make native code compilation optional and use INSTALL_* macros
+
+--- Makefile.orig	2021-10-09 14:48:02.000000000 +0000
 +++ Makefile
 @@ -11,7 +11,7 @@
  #                                                                       #
@@ -34,22 +35,26 @@ Make native code compilation optional and integrate with findlib
  
  dbm.cma: dbm.cmo
  	$(OCAMLMKLIB) -o dbm -oc camldbm -linkall dbm.cmo $(DBM_LINK)
-@@ -57,13 +64,7 @@ depend:
+@@ -57,13 +64,13 @@ depend:
  	$(OCAMLDEP) *.ml *.mli > .depend
  
  install::
--	if test -f dllcamldbm.$(SO); then cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi 
+-	if test -f dllcamldbm.$(SO); then mkdir $(STUBLIBDIR) || echo Ok; cp dllcamldbm.$(SO) $(STUBLIBDIR)/; fi 
 -	cp libcamldbm.$(A) $(LIBDIR)/
--	cd $(LIBDIR) && ranlib libcamldbm.$(A)
--	cp dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/
++	if test -f dllcamldbm.$(SO); then $(BSD_INSTALL_LIB_DIR) $(STUBLIBDIR) || echo Ok; $(BSD_INSTALL_LIB) dllcamldbm.$(SO) $(STUBLIBDIR)/; fi 
++	$(BSD_INSTALL_LIB) libcamldbm.$(A) $(LIBDIR)/
+ 	cd $(LIBDIR) && ranlib libcamldbm.$(A)
+-	cp dbm.cmx dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/
 -	cp dbm.$(A) $(LIBDIR)/
--	cd $(LIBDIR) && ranlib dbm.$(A)
++	$(BSD_INSTALL_DATA) dbm.cmx dbm.cma dbm.cmxa dbm.cmi dbm.mli $(LIBDIR)/
++	$(BSD_INSTALL_DATA) dbm.$(A) $(LIBDIR)/
+ 	cd $(LIBDIR) && ranlib dbm.$(A)
 -	if test -f dbm.cmxs; then cp dbm.cmxs $(LIBDIR)/; fi
-+	ocamlfind install dbm $(FILES)
++	if test -f dbm.cmxs; then $(BSD_INSTALL_DATA) dbm.cmxs $(LIBDIR)/; fi
  
  clean::
  	rm -f *.cm* *.$(O) *.$(A) *.$(SO)
-@@ -77,12 +78,16 @@ testdbm.opt: dbm.cmxa testdbm.ml
+@@ -77,12 +84,16 @@ testdbm.opt: dbm.cmxa testdbm.ml
  clean::
  	rm -f testdbm.byte testdbm.opt testdatabase.*