[pkgsrc/trunk]: pkgsrc/www/ocsigen PostgreSQL support is now optional. No ups...

[jaapb <jaapb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/cbbd352d2802
branches:  trunk
changeset: 356741:cbbd352d2802
user:      jaapb <jaapb%pkgsrc.org@localhost>
date:      Wed Jan 04 13:06:18 2017 +0000

description:
PostgreSQL support is now optional. No upstream changes.

diffstat:

 www/ocsigen/Makefile   |   3 ++-
 www/ocsigen/PLIST      |  10 +++++-----
 www/ocsigen/options.mk |  13 +++++++++++--
 3 files changed, 18 insertions(+), 8 deletions(-)

diffs (64 lines):

diff -r d672e57272bb -r cbbd352d2802 www/ocsigen/Makefile
--- a/www/ocsigen/Makefile      Wed Jan 04 13:01:57 2017 +0000
+++ b/www/ocsigen/Makefile      Wed Jan 04 13:06:18 2017 +0000
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2016/12/30 11:55:53 jaapb Exp $
+# $NetBSD: Makefile,v 1.25 2017/01/04 13:06:18 jaapb Exp $
 #
 
 VERSION=       2.8
 GITHUB_PROJECT=        ocsigenserver
+PKGREVISION=   1
 PKGNAME=       ocsigen-${VERSION}
 DISTNAME=      ${GITHUB_PROJECT}-${VERSION}
 CATEGORIES=    www
diff -r d672e57272bb -r cbbd352d2802 www/ocsigen/PLIST
--- a/www/ocsigen/PLIST Wed Jan 04 13:01:57 2017 +0000
+++ b/www/ocsigen/PLIST Wed Jan 04 13:06:18 2017 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/12/30 11:55:53 jaapb Exp $
+@comment $NetBSD: PLIST,v 1.9 2017/01/04 13:06:18 jaapb Exp $
 bin/ocsigenserver
 ${PLIST.ocaml-opt}bin/ocsigenserver.opt
 share/examples/ocsigen/ocsigenserver.conf
@@ -62,10 +62,10 @@
 ${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cma
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxa
 ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-dbm.cmxs
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.a
-${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cma
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxa
-${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxs
+${PLIST.pgsql}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.a
+${PLIST.pgsql}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cma
+${PLIST.pgsql}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxa
+${PLIST.pgsql}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-pgsql.cmxs
 ${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.a
 ${PLIST.sqlite}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cma
 ${PLIST.sqlite}${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsigenserver/extensions/ocsipersist-sqlite.cmxa
diff -r d672e57272bb -r cbbd352d2802 www/ocsigen/options.mk
--- a/www/ocsigen/options.mk    Wed Jan 04 13:01:57 2017 +0000
+++ b/www/ocsigen/options.mk    Wed Jan 04 13:06:18 2017 +0000
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2015/02/11 13:45:02 jaapb Exp $
+# $NetBSD: options.mk,v 1.5 2017/01/04 13:06:18 jaapb Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.ocsigen
-PKG_SUPPORTED_OPTIONS= camlzip
+PKG_SUPPORTED_OPTIONS= camlzip pgsql
 PKG_OPTIONS_NONEMPTY_SETS=     database
 PKG_OPTIONS_SET.database=      sqlite gdbm
 PKG_SUGGESTED_OPTIONS= gdbm camlzip
@@ -34,3 +34,12 @@
 .else
 CONFIGURE_ARGS+=       --without-camlzip
 .endif
+
+PLIST_VARS+=   pgsql
+.if !empty(PKG_OPTIONS:Mpgsql)
+.include       "../../databases/pgocaml/buildlink3.mk"
+CONFIGURE_ARGS+=       --with-pgsql
+PLIST.pgsql=           yes
+.else
+CONFIGURE_ARGS+=       --without-pgsql
+.endif