svn commit: r373110 - in head: lang/io mail/dspam net-im/imspector security/maia textproc/redland www/dpsearch

[Chris Rees]

Author: crees
Date: Sat Nov 22 22:32:45 2014
New Revision: 373110
URL: https://svnweb.freebsd.org/changeset/ports/373110
QAT: https://qat.redports.org/buildarchive/r373110/

Log:
  Fix some USE_PGSQL that were missed before
  
  Submitted by:	antoine

Modified:
  head/lang/io/Makefile.addons
  head/mail/dspam/Makefile
  head/net-im/imspector/Makefile
  head/security/maia/Makefile
  head/textproc/redland/Makefile
  head/www/dpsearch/Makefile

Modified: head/lang/io/Makefile.addons
==============================================================================
--- head/lang/io/Makefile.addons	Sat Nov 22 22:31:09 2014	(r373109)
+++ head/lang/io/Makefile.addons	Sat Nov 22 22:32:45 2014	(r373110)
@@ -194,7 +194,7 @@ USE_XORG+=	xmu
 # PostgreSQL
 #
 .if ${PORT_OPTIONS:MPostgreSQL}
-USE_PGSQL=	yes
+USES+=		pgsql
 .endif
 
 #

Modified: head/mail/dspam/Makefile
==============================================================================
--- head/mail/dspam/Makefile	Sat Nov 22 22:31:09 2014	(r373109)
+++ head/mail/dspam/Makefile	Sat Nov 22 22:32:45 2014	(r373110)
@@ -202,7 +202,7 @@ PLIST_SUB+=	PGSQL=""
 #PKGNAMESUFFIX=	-pgsql
 _DBDRV_COUNT:=	${_DBDRV_COUNT}o
 .	if ${PORT_OPTIONS:MPGSQL_LOCAL}
-USE_PGSQL=	server
+WANT_PGSQL=	server
 SUB_LIST+=	PGSQL=postgresql
 .	else
 SUB_LIST+=	PGSQL=

Modified: head/net-im/imspector/Makefile
==============================================================================
--- head/net-im/imspector/Makefile	Sat Nov 22 22:31:09 2014	(r373109)
+++ head/net-im/imspector/Makefile	Sat Nov 22 22:32:45 2014	(r373110)
@@ -31,7 +31,8 @@ IPFW_DESC=	Add IPFW support
 PLUGINS_DESC=	Build plugins
 
 IPFW_CFLAGS=	-DIPFW_TRANSPARENT=1
-PLUGINS_USE=	MYSQL=yes SQLITE=yes PGSQL=yes
+PLUGINS_USE=	MYSQL=yes SQLITE=yes
+PLUGINS_USES=	pgsql
 
 .include <bsd.port.options.mk>
 

Modified: head/security/maia/Makefile
==============================================================================
--- head/security/maia/Makefile	Sat Nov 22 22:31:09 2014	(r373109)
+++ head/security/maia/Makefile	Sat Nov 22 22:32:45 2014	(r373110)
@@ -154,7 +154,8 @@ RUN_DEPENDS+=	p5-DBD-Pg>=0:${PORTSDIR}/d
 .endif
 
 .if ${PORT_OPTIONS:MPGSQLSERVER}
-USE_PGSQL=	server
+USES:=		${USES:Npgsql} pgsql
+WANT_PGSQL=	server
 .endif
 
 .if ${PORT_OPTIONS:MDOVECOT}

Modified: head/textproc/redland/Makefile
==============================================================================
--- head/textproc/redland/Makefile	Sat Nov 22 22:31:09 2014	(r373109)
+++ head/textproc/redland/Makefile	Sat Nov 22 22:32:45 2014	(r373110)
@@ -51,7 +51,7 @@ PLIST_SUB+=	MYSQL="@comment "
 #.endif
 
 #.if defined(WITH_PGSQL)
-#USE_PGSQL=	yes
+#USES+=		pgsql
 #CONFIGURE_ARGS+=--with-postgresql=yes
 #PLIST_SUB+=	PGSQL=""
 #.else

Modified: head/www/dpsearch/Makefile
==============================================================================
--- head/www/dpsearch/Makefile	Sat Nov 22 22:31:09 2014	(r373109)
+++ head/www/dpsearch/Makefile	Sat Nov 22 22:32:45 2014	(r373110)
@@ -71,7 +71,7 @@ OPTIONS_SUB=	yes
 APACHE_USE=	APACHE=22+
 APACHE_CONFIGURE_ENABLE=	apache-module
 
-PGSQL_USE=	PGSQL=yes
+PGSQL_USES=	pgsql
 PGSQL_CONFIGURE_WITH=	pgsql=${LOCALBASE}
 
 MYSQL_USE=	MYSQL=yes