CVS commit: pkgsrc/www/ocsigen

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

Module Name:    pkgsrc
Committed By:   jaapb
Date:           Wed Jan  4 13:06:18 UTC 2017

Modified Files:
        pkgsrc/www/ocsigen: Makefile PLIST options.mk

Log Message:
PostgreSQL support is now optional. No upstream changes.


To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 pkgsrc/www/ocsigen/Makefile
cvs rdiff -u -r1.8 -r1.9 pkgsrc/www/ocsigen/PLIST
cvs rdiff -u -r1.4 -r1.5 pkgsrc/www/ocsigen/options.mk

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

Modified files:

Index: pkgsrc/www/ocsigen/Makefile
diff -u pkgsrc/www/ocsigen/Makefile:1.24 pkgsrc/www/ocsigen/Makefile:1.25
--- pkgsrc/www/ocsigen/Makefile:1.24    Fri Dec 30 11:55:53 2016
+++ pkgsrc/www/ocsigen/Makefile Wed Jan  4 13:06:18 2017
@@ -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

Index: pkgsrc/www/ocsigen/PLIST
diff -u pkgsrc/www/ocsigen/PLIST:1.8 pkgsrc/www/ocsigen/PLIST:1.9
--- pkgsrc/www/ocsigen/PLIST:1.8        Fri Dec 30 11:55:53 2016
+++ pkgsrc/www/ocsigen/PLIST    Wed Jan  4 13:06:18 2017
@@ -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 @@ ${PLIST.ocaml-opt}${OCAML_SITELIB}/ocsig
 ${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

Index: pkgsrc/www/ocsigen/options.mk
diff -u pkgsrc/www/ocsigen/options.mk:1.4 pkgsrc/www/ocsigen/options.mk:1.5
--- pkgsrc/www/ocsigen/options.mk:1.4   Wed Feb 11 13:45:02 2015
+++ pkgsrc/www/ocsigen/options.mk       Wed Jan  4 13:06:18 2017
@@ -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 @@ PLIST.camlzip=               yes
 .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