CVS commit: pkgsrc/databases/pgocaml

["Jaap Boender" <jaapb%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Thu Jul  4 09:18:37 UTC 2019

Modified Files:
        pkgsrc/databases/pgocaml: Makefile PLIST buildlink3.mk

Log Message:
Removed camlp4 dependency from databases/pgocaml and revbump


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 pkgsrc/databases/pgocaml/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/databases/pgocaml/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/databases/pgocaml/buildlink3.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/databases/pgocaml/Makefile
diff -u pkgsrc/databases/pgocaml/Makefile:1.13 pkgsrc/databases/pgocaml/Makefile:1.14
--- pkgsrc/databases/pgocaml/Makefile:1.13      Mon May 13 12:12:33 2019
+++ pkgsrc/databases/pgocaml/Makefile   Thu Jul  4 09:18:37 2019
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.13 2019/05/13 12:12:33 jaapb Exp $
+# $NetBSD: Makefile,v 1.14 2019/07/04 09:18:37 jaapb Exp $
 
 GITHUB_PROJECT=        pgocaml
 GITHUB_TAG=    v${PKGVERSION_NOREV}
 DISTNAME=      ${GITHUB_PROJECT}-3.2
+PKGREVISION=   1
 CATEGORIES=    databases
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=darioteixeira/}
 
@@ -14,16 +15,20 @@ LICENSE=    gnu-lgpl-v2
 HAS_CONFIGURE= yes
 USE_LANGUAGES= c
 USE_TOOLS+=    gmake
-CONFIGURE_ARGS+=       --enable-p4
+CONFIGURE_ARGS+=       --disable-p4
 
 OCAML_USE_OASIS= yes
 
 .include "../../mk/ocaml.mk"
-
+.include "../../devel/ocamlbuild/buildlink3.mk"
 .include "../../devel/ocaml-hex/buildlink3.mk"
+.include "../../devel/ocaml-migrate-parsetree/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-ppx_tools=   build
+.include "../../devel/ocaml-ppx_tools/buildlink3.mk"
+.include "../../devel/ocaml-ppx_tools_versioned/buildlink3.mk"
 .include "../../devel/ocaml-re/buildlink3.mk"
+BUILDLINK_DEPMETHOD.ocaml-rresult=     build
 .include "../../devel/ocaml-rresult/buildlink3.mk"
-.include "../../lang/camlp4/buildlink3.mk"
 .include "../../textproc/ocaml-csv/buildlink3.mk"
 .include "../../time/ocaml-calendar/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/databases/pgocaml/PLIST
diff -u pkgsrc/databases/pgocaml/PLIST:1.4 pkgsrc/databases/pgocaml/PLIST:1.5
--- pkgsrc/databases/pgocaml/PLIST:1.4  Mon May 13 12:12:33 2019
+++ pkgsrc/databases/pgocaml/PLIST      Thu Jul  4 09:18:37 2019
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2019/05/13 12:12:33 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.5 2019/07/04 09:18:37 jaapb Exp $
 ${OCAML_SITELIB}/pgocaml/META
 ${OCAML_SITELIB}/pgocaml/PGOCaml.annot
 ${OCAML_SITELIB}/pgocaml/PGOCaml.cmi
@@ -23,11 +23,6 @@ ${OCAML_SITELIB}/pgocaml/PGOCaml_generic
 ${OCAML_SITELIB}/pgocaml/PGOCaml_generic.cmti
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/PGOCaml_generic.cmx
 ${OCAML_SITELIB}/pgocaml/PGOCaml_generic.mli
-${OCAML_SITELIB}/pgocaml/pa_pgsql.annot
-${OCAML_SITELIB}/pgocaml/pa_pgsql.cma
-${OCAML_SITELIB}/pgocaml/pa_pgsql.cmi
-${OCAML_SITELIB}/pgocaml/pa_pgsql.cmt
-${OCAML_SITELIB}/pgocaml/pa_pgsql.ml
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/pgocaml.a
 ${OCAML_SITELIB}/pgocaml/pgocaml.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/pgocaml/pgocaml.cmxa

Index: pkgsrc/databases/pgocaml/buildlink3.mk
diff -u pkgsrc/databases/pgocaml/buildlink3.mk:1.5 pkgsrc/databases/pgocaml/buildlink3.mk:1.6
--- pkgsrc/databases/pgocaml/buildlink3.mk:1.5  Mon May 13 12:12:33 2019
+++ pkgsrc/databases/pgocaml/buildlink3.mk      Thu Jul  4 09:18:37 2019
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.5 2019/05/13 12:12:33 jaapb Exp $
+# $NetBSD: buildlink3.mk,v 1.6 2019/07/04 09:18:37 jaapb Exp $
 
 BUILDLINK_TREE+=       pgocaml
 
@@ -6,11 +6,10 @@ BUILDLINK_TREE+=      pgocaml
 PGOCAML_BUILDLINK3_MK:=
 
 BUILDLINK_API_DEPENDS.pgocaml+=        pgocaml>=3.0
-BUILDLINK_ABI_DEPENDS.pgocaml+=        pgocaml>=3.2
+BUILDLINK_ABI_DEPENDS.pgocaml+=        pgocaml>=3.2nb1
 BUILDLINK_PKGSRCDIR.pgocaml?=  ../../databases/pgocaml
 
 .include "../../devel/ocaml-re/buildlink3.mk"
-.include "../../lang/camlp4/buildlink3.mk"
 .include "../../textproc/ocaml-csv/buildlink3.mk"
 .include "../../time/ocaml-calendar/buildlink3.mk"
 .endif # PGOCAML_BUILDLINK3_MK