Updated databases/pgocaml to version 3.2.

This includes a general modernisation of the package, PPX support and
a lot of minor changes.

4 files changed, 21 insertions, 14 deletions

diff --git a/databases/pgocaml/Makefile b/databases/pgocaml/Makefile
index b142a44803b..d2bd75be72b 100644
--- a/databases/pgocaml/Makefile
+++ b/databases/pgocaml/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.12 2018/11/12 16:10:18 jaapb Exp $
+# $NetBSD: Makefile,v 1.13 2019/05/13 12:12:33 jaapb Exp $
 
-DISTNAME=	pgocaml-2.3
-PKGREVISION=	8
+GITHUB_PROJECT=	pgocaml
+GITHUB_TAG=	v${PKGVERSION_NOREV}
+DISTNAME=	${GITHUB_PROJECT}-3.2
 CATEGORIES=	databases
-MASTER_SITES=	http://forge.ocamlcore.org/frs/download.php/1597/
-EXTRACT_SUFX=	.tgz
+MASTER_SITES=	${MASTER_SITE_GITHUB:=darioteixeira/}
 
 MAINTAINER=	jaapb@NetBSD.org
 HOMEPAGE=	http://pgocaml.forge.ocamlcore.org/
@@ -13,13 +13,16 @@ LICENSE=	gnu-lgpl-v2
 
 HAS_CONFIGURE=	yes
 USE_LANGUAGES=	c
+USE_TOOLS+=	gmake
 CONFIGURE_ARGS+=	--enable-p4
 
 OCAML_USE_OASIS= yes
 
 .include "../../mk/ocaml.mk"
 
+.include "../../devel/ocaml-hex/buildlink3.mk"
 .include "../../devel/ocaml-re/buildlink3.mk"
+.include "../../devel/ocaml-rresult/buildlink3.mk"
 .include "../../lang/camlp4/buildlink3.mk"
 .include "../../textproc/ocaml-csv/buildlink3.mk"
 .include "../../time/ocaml-calendar/buildlink3.mk"
diff --git a/databases/pgocaml/PLIST b/databases/pgocaml/PLIST
index 30641f79356..21769895b67 100644
--- a/databases/pgocaml/PLIST
+++ b/databases/pgocaml/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/12/30 11:19:40 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.4 2019/05/13 12:12:33 jaapb Exp $
 ${OCAML_SITELIB}/pgocaml/META
 ${OCAML_SITELIB}/pgocaml/PGOCaml.annot
 ${OCAML_SITELIB}/pgocaml/PGOCaml.cmi
@@ -32,3 +32,7 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/pgocaml.a
 ${OCAML_SITELIB}/pgocaml/pgocaml.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/pgocaml.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/pgocaml.cmxs
+${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/ppx_pgsql.a
+${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/ppx_pgsql.cma
+${OCAML_SITELIB}/pgocaml/ppx_pgsql.cmxa
+${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/ppx_pgsql.cmxs
diff --git a/databases/pgocaml/buildlink3.mk b/databases/pgocaml/buildlink3.mk
index 1bd3882885f..9c503c1aa3d 100644
--- a/databases/pgocaml/buildlink3.mk
+++ b/databases/pgocaml/buildlink3.mk
@@ -1,12 +1,12 @@
-# $NetBSD: buildlink3.mk,v 1.4 2018/07/19 13:47:36 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2019/05/13 12:12:33 jaapb Exp $
 
 BUILDLINK_TREE+=	pgocaml
 
 .if !defined(PGOCAML_BUILDLINK3_MK)
 PGOCAML_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.pgocaml+=	pgocaml>=2.3
-BUILDLINK_ABI_DEPENDS.pgocaml+=	pgocaml>=2.3nb7
+BUILDLINK_API_DEPENDS.pgocaml+=	pgocaml>=3.0
+BUILDLINK_ABI_DEPENDS.pgocaml+=	pgocaml>=3.2
 BUILDLINK_PKGSRCDIR.pgocaml?=	../../databases/pgocaml
 
 .include "../../devel/ocaml-re/buildlink3.mk"
diff --git a/databases/pgocaml/distinfo b/databases/pgocaml/distinfo
index 38d385a773d..d104d77febc 100644
--- a/databases/pgocaml/distinfo
+++ b/databases/pgocaml/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2016/08/18 15:31:46 jaapb Exp $
+$NetBSD: distinfo,v 1.3 2019/05/13 12:12:33 jaapb Exp $
 
-SHA1 (pgocaml-2.3.tgz) = 31caf734f295d9a4a0686cab71d8183ad0c42517
-RMD160 (pgocaml-2.3.tgz) = 0a796b3495a96de6994bad603a7f9a0e2e43a373
-SHA512 (pgocaml-2.3.tgz) = f42ca8ccf31f9e03cfa9f81a9cd19c2a6010c33f5a578e76924683fd10ab4acf2727b09b71c5a8f200bc39765a5d876a289976fea367b49ae54335c007fd3ff7
-Size (pgocaml-2.3.tgz) = 90383 bytes
+SHA1 (pgocaml-3.2.tar.gz) = 140aa320f63742069a33aed68763a0ad6151eab1
+RMD160 (pgocaml-3.2.tar.gz) = d9a06ca5b81ed0180e90407af55e4543ba61ef32
+SHA512 (pgocaml-3.2.tar.gz) = 7f9c35844839df4b35083f8de18e0e55f82db80886d1f1251fa4a6bc894137da2f058c5a2e8bf3b308ed09b96120824248e8570aa1904d5247613a42ca9a8b77
+Size (pgocaml-3.2.tar.gz) = 108957 bytes