svn commit: r373100 - in head: . Mk databases/glom databases/libzdb databases/opendbx databases/pglesslog databases/qt4-pgsql-plugin databases/qt5-sqldrivers-pgsql databases/rubygem-do_postgres dat...
Chris Rees
crees at FreeBSD.org
Sat Nov 22 20:40:29 UTC 2014
Author: crees
Date: Sat Nov 22 20:40:08 2014
New Revision: 373100
URL: https://svnweb.freebsd.org/changeset/ports/373100
QAT: https://qat.redports.org/buildarchive/r373100/
Log:
Finally retire USE_PGSQL
Modified:
head/CHANGES
head/Mk/bsd.database.mk
head/databases/glom/Makefile
head/databases/libzdb/Makefile
head/databases/opendbx/Makefile
head/databases/pglesslog/Makefile
head/databases/qt4-pgsql-plugin/Makefile
head/databases/qt5-sqldrivers-pgsql/Makefile
head/databases/rubygem-do_postgres/Makefile
head/databases/rubygem-pg/Makefile
head/databases/skytools/Makefile
head/databases/slony1v2/Makefile
head/databases/sqlclient/Makefile
head/databases/sqlrelay/Makefile
head/databases/tablelog/Makefile
head/databases/tarantool/Makefile
head/databases/vfront/Makefile
head/deskutils/moregroupware/Makefile
head/deskutils/phpcollab/Makefile
head/devel/cdash/Makefile
head/devel/gearmand-devel/Makefile
head/devel/preps-gui/Makefile
head/devel/prepstools/Makefile
head/dns/mydns/Makefile
head/graphics/mapnik/Makefile
head/irc/inspircd/Makefile
head/irc/ratbox-services/Makefile
head/lang/harbour/Makefile
head/lang/mit-scheme/Makefile
head/lang/newlisp-devel/Makefile
head/lang/newlisp/Makefile
head/lang/php5/Makefile.ext
head/lang/php53/Makefile.ext
head/lang/php55/Makefile.ext
head/lang/php56/Makefile.ext
head/lang/pike78/Makefile
head/lang/urweb/Makefile
head/mail/archiveopteryx-devel/Makefile
head/mail/archiveopteryx/Makefile
head/mail/exim/Makefile
head/mail/ezmlm-idx/Makefile
head/mail/gld/Makefile
head/mail/perdition/Makefile
head/mail/postfix-current/Makefile
head/mail/postfix/Makefile
head/mail/postfix210/Makefile
head/mail/spmfilter/Makefile
head/mail/tpop3d/Makefile
head/math/octave-forge-database/Makefile
head/multimedia/motion/Makefile
head/net-im/jabber/Makefile
head/net-mgmt/collectd/Makefile
head/net-mgmt/collectd5/Makefile
head/net-mgmt/flow-tools/Makefile
head/net-mgmt/nagios-check_postgres/Makefile
head/net-mgmt/netmagis-common/Makefile
head/net-mgmt/pmacct/Makefile
head/net-mgmt/rackmonkey/Makefile
head/net-p2p/gnunet/Makefile
head/net/echoping/Makefile
head/net/freeradius2/Makefile
head/net/freeradius3/Makefile
head/net/gnu-radius/Makefile
head/net/prosearch/Makefile
head/net/traff/Makefile
head/net/yate/Makefile
head/ports-mgmt/portscout/Makefile
head/ports-mgmt/tinderbox-devel/Makefile
head/ports-mgmt/tinderbox/Makefile
head/security/base/Makefile
head/security/courier-authlib/Makefile
head/security/maia/Makefile
head/security/medusa/Makefile
head/security/ossec-hids-server/Makefile
head/security/pam-pgsql/Makefile
head/sysutils/cfengine33/Makefile
head/sysutils/cfengine34/Makefile
head/sysutils/cfengine35/Makefile
head/sysutils/condor/Makefile
head/sysutils/rsyslog7-devel/Makefile
head/sysutils/rsyslog7/Makefile
head/sysutils/rsyslog8-devel/Makefile
head/sysutils/rsyslog8/Makefile
head/sysutils/slurm-hpc/Makefile
head/sysutils/watchmen/Makefile
head/textproc/openfts/Makefile
head/textproc/sphinxsearch-devel/Makefile
head/www/udmsearch/Makefile
Modified: head/CHANGES
==============================================================================
--- head/CHANGES Sat Nov 22 20:04:49 2014 (r373099)
+++ head/CHANGES Sat Nov 22 20:40:08 2014 (r373100)
@@ -10,6 +10,16 @@ in the release notes and/or placed into
All ports committers are allowed to commit to this file.
+20141122:
+AUTHOR: crees at FreeBSD.org
+
+ Dependencies on the PostgreSQL ports have been migrated
+ to USES. Instead of USE_PGSQL, please use USES=pgsql instead.
+
+ USE_PGSQL=yes becomes USES=pgsql
+ WANT_PGSQL_VER=91+ becomes USES=pgsql:9.1+
+ USE_PGSQL=server becomes USES=pgsql and WANT_PGSQL=server
+
20141118:
AUTHOR: mat at FreeBSD.org
Modified: head/Mk/bsd.database.mk
==============================================================================
--- head/Mk/bsd.database.mk Sat Nov 22 20:04:49 2014 (r373099)
+++ head/Mk/bsd.database.mk Sat Nov 22 20:40:08 2014 (r373100)
@@ -32,23 +32,7 @@ Database_Include_MAINTAINER= ports at FreeB
# MYSQL_VER
# - Detected MySQL version.
##
-# USE_PGSQL - Add PostgreSQL client dependency. Components can be depended
-# on using USE_PGSQL= component[:target]. For the full list
-# use make -V _USE_PGSQL_DEP
-# If no version is given (by the maintainer via the port or
-# by the user via defined variable), try to find the
-# currently installed version. Fall back to default if
-# necessary (PostgreSQL-9.0 = 90).
-# DEFAULT_PGSQL_VER
-# - PostgreSQL default version, currently 90.
-# WANT_PGSQL_VER
-# - Maintainer can set an arbitrary version of PostgreSQL to
-# always build this port with (overrides WITH_PGSQL_VER).
-# Minimum and maximum versions can be set (e.g. 90+)
-# WITH_PGSQL_VER
-# - User defined variable to set PostgreSQL version.
-# PGSQL_VER
-# - Detected PostgreSQL version.
+# USE_PGSQL - Do not use this-- instead use USES=pgsql
##
# USE_BDB - Add Berkeley DB library dependency.
# If no version is given (by the maintainer via the port or
@@ -209,109 +193,6 @@ IGNORE= cannot install: unknown MySQL v
.endif # Check for correct libs
.endif # USE_MYSQL
-.if defined(USE_PGSQL)
-VALID_PGSQL_VER= 84 90 91 92 93 94
-DEFAULT_PGSQL_VER?= ${PGSQL_DEFAULT:S/.//}
-PGSQL83_LIBVER= 5
-PGSQL84_LIBVER= 5
-PGSQL90_LIBVER= 5
-PGSQL91_LIBVER= 5
-PGSQL92_LIBVER= 5
-PGSQL93_LIBVER= 5
-PGSQL94_LIBVER= 5
-
-# Setting/finding PostgreSQL version we want.
-. if exists(${LOCALBASE}/bin/pg_config)
-_PGSQL_VER!= ${LOCALBASE}/bin/pg_config --version | ${SED} -n 's/PostgreSQL[^0-9]*\([0-9][0-9]*\)\.\([0-9][0-9]*\)[^0-9].*/\1\2/p'
-WITH_PGSQL_VER?= ${_PGSQL_VER}
-. if ${WITH_PGSQL_VER} != ${_PGSQL_VER}
-IGNORE?= cannot install: you have set WITH_PGSQL_VER=${WITH_PGSQL_VER} in make.conf, but you have postgresql${_PGSQL_VER}-client installed
-. endif
-. endif
-
-. if defined(WANT_PGSQL_VER)
-. if ${WANT_PGSQL_VER:M*+}
-. for version in ${VALID_PGSQL_VER}
-. if ${WANT_PGSQL_VER:S/+//} <= ${version}
-_WANT_PGSQL_VER+=${version}
-. endif
-. endfor
-. elif ${WANT_PGSQL_VER:M*-}
-. for version in ${VALID_PGSQL_VER}
-. if ${WANT_PGSQL_VER:S/-//} >= ${version}
-_WANT_PGSQL_VER+=${version}
-. endif
-. endfor
-. endif
-_WANT_PGSQL_VER?= ${WANT_PGSQL_VER}
-DEV_WARNING+= "Do not use USE_PGSQL. This port should use USES+= pgsql:${WANT_PGSQL_VER:C,^[0-9],&.,}"
-. else
-DEV_WARNING+= "Do not use USE_PGSQL. This port should use USES+= pgsql"
-. endif
-
-. if !empty(_WANT_PGSQL_VER)
-. for version in ${_WANT_PGSQL_VER}
-. if defined(WITH_PGSQL_VER)
-. if ${WITH_PGSQL_VER} == ${version}
-PGSQL_VER= ${WITH_PGSQL_VER}
-. endif
-. elif ${DEFAULT_PGSQL_VER} == ${version}
-PGSQL_VER= ${version}
-. endif
-PGSQL_VER?= ${version}
-. endfor
-. if defined(WITH_PGSQL_VER) && ${WITH_PGSQL_VER} != ${PGSQL_VER}
-IGNORE?= cannot install: the port wants postgresql-client version ${WANT_PGSQL_VER} and you have version ${WITH_PGSQL_VER} installed or set in make.conf
-. endif
-. endif
-
-.if !empty(WITH_PGSQL_VER)
-PGSQL_VER?= ${WITH_PGSQL_VER}
-.else
-PGSQL_VER?= ${DEFAULT_PGSQL_VER}
-.endif
-
-# And now we are checking if we can use it
-.if defined(PGSQL${PGSQL_VER}_LIBVER)
-.if defined(IGNORE_WITH_PGSQL)
-. for ver in ${IGNORE_WITH_PGSQL}
-. if (${PGSQL_VER} == ${ver})
-IGNORE?= cannot install: does not work with postgresql${PGSQL_VER}-client (PostgresSQL ${IGNORE_WITH_PGSQL} not supported)
-. endif
-. endfor
-.endif # IGNORE_WITH_PGSQL
-
-LIB_DEPENDS+= libpq.so.${PGSQL${PGSQL_VER}_LIBVER}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client
-
-_USE_PGSQL_DEP= contrib docs pgtcl pltcl plperl server
-_USE_PGSQL_DEP_contrib= pgbench
-_USE_PGSQL_DEP_docs= postgresql${PGSQL_VER}-docs>0
-_USE_PGSQL_DEP_pgtcl= ${LOCALBASE}/lib/pgtcl/pkgIndex.tcl
-_USE_PGSQL_DEP_plperl= postgresql${PGSQL_VER}-plperl>0
-_USE_PGSQL_DEP_pltcl= postgresql${PGSQL_VER}-pltcl>0
-_USE_PGSQL_DEP_server= postgres
-. for depend in ${_USE_PGSQL_DEP}
-. if ${USE_PGSQL:M${depend}}
-BUILD_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}
-RUN_DEPENDS+= ${_USE_PGSQL_DEP_${depend}}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}
-_PGSQL_DEV_WARN+= ${depend}
-. elif ${USE_PGSQL:M${depend}\:*}
-BUILD_DEPENDS+= ${NONEXISTENT}:${PORTSDIR}/databases/postgresql${PGSQL_VER}-${depend}:${USE_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
-_PGSQL_DEV_WARN+= ${depend}:${USE_PGSQL:M${depend}\:*:C,^[^:]*\:,,}
-. endif
-. endfor
-
-. ifdef _PGSQL_DEV_WARN
-DEV_WARNING+= "and WANT_PGSQL= ${_PGSQL_DEV_WARN}"
-. endif
-
-.else
-IGNORE?= cannot install: unknown PostgreSQL version: ${PGSQL_VER}
-.endif # Check for correct version
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
-.endif # USE_PGSQL
-
.if defined(USE_BDB)
# TODO: avoid malformed conditional with invalid USE_BDB/WITH_BDB_VER
# check if + works properly from test builds 01h12m23s
Modified: head/databases/glom/Makefile
==============================================================================
--- head/databases/glom/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/glom/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -27,6 +27,7 @@ RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/mi
GNU_CONFIGURE= yes
USES= desktop-file-utils gettext gmake libtool pathfix \
pgsql pkgconfig python shared-mime-info tar:xz
+WANT_PGSQL= server
USE_GNOME= gnomedocutils gnomeprefix intlhack pygobject3 libxml2 \
gtksourceviewmm3 libgdamm5
USE_LDCONFIG= yes
@@ -43,11 +44,6 @@ INSTALLS_ICONS= yes
PLIST_SUB+= VERSION=${PORTVERSION:R}
#PLIST_SUB+= VERSION=1.24
-# We need postgreSQL tools the server installs, and configure checks for these.
-# Note: USE_PGSQL has already been set above.
-BUILD_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER:S/.//}-server
-RUN_DEPENDS+= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER:S/.//}-server
-
post-patch:
@${REINPLACE_CMD} -e 's|-update-mime-database|true|g' \
${WRKSRC}/Makefile.in
Modified: head/databases/libzdb/Makefile
==============================================================================
--- head/databases/libzdb/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/libzdb/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -26,7 +26,7 @@ OPTIONS_DEFAULT= MYSQL PGSQL SQLITE SSL
MYSQL_USE= mysql=yes
MYSQL_CONFIGURE_ON= --with-mysql=${LOCALBASE}/bin/mysql_config
MYSQL_CONFIGURE_OFF= --without-mysql
-PGSQL_USE= pgsql=yes
+PGSQL_USES= pgsql
PGSQL_CONFIGURE_ON= --with-postgresql=${LOCALBASE}/bin/pg_config
PGSQL_CONFIGURE_OFF= --without-postgresql
SQLITE_USE= sqlite=3
Modified: head/databases/opendbx/Makefile
==============================================================================
--- head/databases/opendbx/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/opendbx/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -34,7 +34,7 @@ MYSQL_USE= MYSQL=YES
MYSQL_CPPFLAGS= -I${LOCALBASE}/include/mysql
MYSQL_LDFLAGS= -L${LOCALBASE}/lib/mysql
-PGSQL_USE= PGSQL=YES
+PGSQL_USES= pgsql
SQLITE_LIB_DEPENDS= libsqlite.so:${PORTSDIR}/databases/sqlite2
Modified: head/databases/pglesslog/Makefile
==============================================================================
--- head/databases/pglesslog/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/pglesslog/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -9,12 +9,11 @@ DISTNAME= pg_lesslogg_${PORTVERSION}_pg8
MAINTAINER= kuriyama at FreeBSD.org
COMMENT= Reduce size of PostgreSQL archive log files by replacing backup blocks
-USES= gmake
-USE_PGSQL= client server:build
-WANT_PGSQL_VER= 84
+USES= gmake pgsql:8.4
+WANT_PGSQL= server:build
WRKSRC= ${WRKDIR}/pg_lesslog_${PORTVERSION}_pg84
-PGSQL_PORT= databases/postgresql${PGSQL_VER}
+PGSQL_PORT= databases/postgresql${PGSQL_VER:S,.,,}
PGSQL_SRCDIR= `cd ${PORTSDIR}/${PGSQL_PORT}-server; ${MAKE} -VWRKSRC`
pre-build:
Modified: head/databases/qt4-pgsql-plugin/Makefile
==============================================================================
--- head/databases/qt4-pgsql-plugin/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/qt4-pgsql-plugin/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -13,7 +13,7 @@ DB= psql
USE_QT4= moc_build sql
QT_DIST= yes
-USE_PGSQL= yes
+USES+= pgsql
DRIVER= src/sql/drivers/${DB}
PLUGIN= src/plugins/sqldrivers/${DB}
EXTRACT_AFTER_ARGS?= ${DISTNAME}/${DRIVER} \
Modified: head/databases/qt5-sqldrivers-pgsql/Makefile
==============================================================================
--- head/databases/qt5-sqldrivers-pgsql/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/qt5-sqldrivers-pgsql/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -5,6 +5,6 @@ PORTNAME= pgsql
DB= PSQL
DB_DESC= PostgreSQL
-USE_PGSQL= yes
+USES+= pgsql
.include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers"
Modified: head/databases/rubygem-do_postgres/Makefile
==============================================================================
--- head/databases/rubygem-do_postgres/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/rubygem-do_postgres/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -11,7 +11,7 @@ COMMENT= Ruby DataObjects driver for Pos
RUN_DEPENDS= rubygem-data_objects>=0.10.13:${PORTSDIR}/databases/rubygem-data_objects
-USE_PGSQL= yes
+USES+= pgsql
USE_RUBY= yes
USE_RUBYGEMS= yes
Modified: head/databases/rubygem-pg/Makefile
==============================================================================
--- head/databases/rubygem-pg/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/rubygem-pg/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -15,7 +15,7 @@ LICENSE_COMB= dual
CONFIGURE_ARGS= --with-pgsql-include-dir=`${PG_CONFIG} --includedir` \
--with-pgsql-lib-dir=`${PG_CONFIG} --libdir`
PG_CONFIG= ${LOCALBASE}/bin/pg_config
-USE_PGSQL= yes
+USES+= pgsql
USE_RUBY= yes
USE_RUBYGEMS= yes
RUBYGEM_AUTOPLIST= yes
Modified: head/databases/skytools/Makefile
==============================================================================
--- head/databases/skytools/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/skytools/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -10,9 +10,7 @@ MAINTAINER= sam at cassiba.com
COMMENT= PostgreSQL tools from Skype: walshipping, queueing, replication
GNU_CONFIGURE= yes
-USES= gmake python:2 shebangfix
-
-USE_PGSQL= yes
+USES= gmake python:2 shebangfix pgsql
python_OLD_CMD= /usr/bin/env python
python_CMD= /usr/bin/env python2
Modified: head/databases/slony1v2/Makefile
==============================================================================
--- head/databases/slony1v2/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/slony1v2/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -16,8 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${P
${LOCALBASE}/bin/postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
GNU_CONFIGURE= yes
-USES= bison gmake shebangfix tar:bzip2
-USE_PGSQL= yes
+USES= bison gmake shebangfix tar:bzip2 pgsql
USE_RC_SUBR= slon
SHEBANG_FILES= tools/altperl/slonik_restart_node.pl
Modified: head/databases/sqlclient/Makefile
==============================================================================
--- head/databases/sqlclient/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/sqlclient/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -20,7 +20,7 @@ USE_GNUSTEP_BUILD= yes
USE_GNUSTEP_INSTALL= yes
USE_GNUSTEP_LOCAL_LIBS+= Performance:${PERFORMANCE_PORT}
USE_GNUSTEP_LDCONFIG= ${GNUSTEP_LOCAL_LIBRARIES}
-USE_PGSQL=yes
+USES+= pgsql
USE_MYSQL=yes
USE_SQLITE=yes
Modified: head/databases/sqlrelay/Makefile
==============================================================================
--- head/databases/sqlrelay/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/sqlrelay/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -101,7 +101,7 @@ CONFIGURE_ARGS+= --disable-firebird
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --with-postgresql-prefix="${LOCALBASE}"
.else
CONFIGURE_ARGS+= --disable-postgresql
Modified: head/databases/tablelog/Makefile
==============================================================================
--- head/databases/tablelog/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/tablelog/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -12,8 +12,7 @@ COMMENT= Logs changes on a table in Post
WRKSRC= ${WRKDIR}/table_log-${DISTVERSION}
-USES= gmake
-USE_PGSQL= yes
+USES= gmake pgsql
MAKE_ARGS= USE_PGXS=1
OPTIONS_DEFINE= DOCS
Modified: head/databases/tarantool/Makefile
==============================================================================
--- head/databases/tarantool/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/tarantool/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -62,7 +62,7 @@ PLIST_SUB+= MYSQL="@comment "
.if ${PORT_OPTIONS:MPGSQL}
CMAKE_ARGS+= -DWITH_POSTGRESQL=ON
PLIST_SUB+= PGSQL=""
-USE_PGSQL= yes
+USES+= pgsql
.else
CMAKE_ARGS+= -DWITH_POSTGRESQL=OFF
PLIST_SUB+= PGSQL="@comment "
Modified: head/databases/vfront/Makefile
==============================================================================
--- head/databases/vfront/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/databases/vfront/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -28,7 +28,7 @@ USE_MYSQL= yes
.if ${PORT_OPTIONS:MPGSQL}
USE_PHP+= pgsql
-USE_PGSQL= yes
+USES+= pgsql
.endif
post-patch:
Modified: head/deskutils/moregroupware/Makefile
==============================================================================
--- head/deskutils/moregroupware/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/deskutils/moregroupware/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -30,7 +30,8 @@ ADDONS_DESC= install additional workgrou
OPTIONS_SUB= yes
NLS_USES= gettext
-PGSQL_USE= PGSQL=server
+PGSQL_USES= pgsql
+WANT_PGSQL= server
MYSQL_USE= MYSQL=server
ADDONS_DISTFILES= ${PORTNAME}-addons-${PORTVERSION}${EXTRACT_SUFX}
Modified: head/deskutils/phpcollab/Makefile
==============================================================================
--- head/deskutils/phpcollab/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/deskutils/phpcollab/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -25,7 +25,8 @@ OPTIONS_SINGLE_WEBSERVER= APACHE LIGHTTP
OPTIONS_SINGLE_DB= PGSQL MYSQL
MYSQL_USE= PHP=mysql MYSQL=yes
-PGSQL_USE= PHP=pgsql,pdo_pgsql PGSQL=yes
+PGSQL_USE= PHP=pgsql,pdo_pgsql
+PGSQL_USES= pgsql
APACHE_USE= APACHE_RUN=22
LIGHTTPD_RUN_DEPENDS= lighttpd:${PORTSDIR}/ww/lighttpd
Modified: head/devel/cdash/Makefile
==============================================================================
--- head/devel/cdash/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/devel/cdash/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -37,7 +37,7 @@ DB_TYPE= mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
USE_PHP+= pgsql
DB_TYPE= pgsql
.endif
Modified: head/devel/gearmand-devel/Makefile
==============================================================================
--- head/devel/gearmand-devel/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/devel/gearmand-devel/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -88,7 +88,7 @@ CONFIGURE_ARGS+= --with-mysql=no
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --enable-libpq
.else
CONFIGURE_ARGS+= --disable-libpq
Modified: head/devel/preps-gui/Makefile
==============================================================================
--- head/devel/preps-gui/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/devel/preps-gui/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -15,9 +15,8 @@ COMMENT= Problem reporting system
RUN_DEPENDS= prepsdb_tool:${PORTSDIR}/devel/prepstools
-USES= gmake pathfix pkgconfig
+USES= gmake pathfix pkgconfig pgsql
USE_GNOME= gnomeprefix gtk20 gconf2 libgnomeui
-USE_PGSQL= yes
INSTALLS_OMF= yes
GCONF_SCHEMAS= preps.schema
Modified: head/devel/prepstools/Makefile
==============================================================================
--- head/devel/prepstools/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/devel/prepstools/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -14,8 +14,7 @@ RUN_DEPENDS= postgres:${PORTSDIR}/databa
LICENSE= GPLv2
-USE_PGSQL= yes
-USES= gmake pkgconfig libtool
+USES= gmake pkgconfig libtool pgsql
USE_GNOME= gtk20 gconf2 glib20 libgnomeui
INSTALL_TARGET= install-strip
GNU_CONFIGURE= yes
Modified: head/dns/mydns/Makefile
==============================================================================
--- head/dns/mydns/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/dns/mydns/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -41,7 +41,7 @@ CONFIGURE_ARGS+=--with-openssl \
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--without-mysql \
--with-pgsql-include=${LOCALBASE}/include \
--with-pgsql-lib=${LOCALBASE}/lib
Modified: head/graphics/mapnik/Makefile
==============================================================================
--- head/graphics/mapnik/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/graphics/mapnik/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -81,7 +81,7 @@ LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp
.if ${PORT_OPTIONS:MPOSTGIS}
INPUT_PLUGINS+= postgis
-USE_PGSQL= yes
+USES+= pgsql
.endif
.if ${PORT_OPTIONS:MSQLITE3}
Modified: head/irc/inspircd/Makefile
==============================================================================
--- head/irc/inspircd/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/irc/inspircd/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -89,7 +89,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
EXTRAS:=${EXTRAS},m_pgsql.cpp
PLIST_SUB+= PGSQL=""
.else
Modified: head/irc/ratbox-services/Makefile
==============================================================================
--- head/irc/ratbox-services/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/irc/ratbox-services/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -119,7 +119,7 @@ CONFIGURE_ARGS+= --enable-mysql=${LOCALB
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --enable-pgsql=${LOCALBASE}
.endif
Modified: head/lang/harbour/Makefile
==============================================================================
--- head/lang/harbour/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/harbour/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -119,7 +119,7 @@ MAKE_ENV+= HB_WITH_MYSQL=no
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
MAKE_ENV+= HB_WITH_PGSQL=nolocal
.else
MAKE_ENV+= HB_WITH_PGSQL=no
Modified: head/lang/mit-scheme/Makefile
==============================================================================
--- head/lang/mit-scheme/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/mit-scheme/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -70,7 +70,7 @@ CONFIGURE_ARGS+=--without-openssl
.if ${PORT_OPTIONS:MPGSQL}
PLIST_SUB+= POSTGRESQL=""
CONFIGURE_ARGS+=--with-libpq=${LOCALBASE}
-USE_PGSQL= yes
+USES+= pgsql
.else
PLIST_SUB+= POSTGRESQL="@comment "
CONFIGURE_ARGS+=--without-libpq
Modified: head/lang/newlisp-devel/Makefile
==============================================================================
--- head/lang/newlisp-devel/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/newlisp-devel/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -71,7 +71,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
MODULES+= postgres
PLIST_SUB+= PGSQL=""
.else
Modified: head/lang/newlisp/Makefile
==============================================================================
--- head/lang/newlisp/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/newlisp/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -69,7 +69,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
MODULES+= postgres
PLIST_SUB+= PGSQL=""
.else
Modified: head/lang/php5/Makefile.ext
==============================================================================
--- head/lang/php5/Makefile.ext Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/php5/Makefile.ext Sat Nov 22 20:40:08 2014 (r373100)
@@ -265,7 +265,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pdo_pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
@@ -282,7 +282,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
.endif
Modified: head/lang/php53/Makefile.ext
==============================================================================
--- head/lang/php53/Makefile.ext Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/php53/Makefile.ext Sat Nov 22 20:40:08 2014 (r373100)
@@ -255,7 +255,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pdo_pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
@@ -272,7 +272,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
.endif
Modified: head/lang/php55/Makefile.ext
==============================================================================
--- head/lang/php55/Makefile.ext Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/php55/Makefile.ext Sat Nov 22 20:40:08 2014 (r373100)
@@ -269,7 +269,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pdo_pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
@@ -286,7 +286,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
.endif
Modified: head/lang/php56/Makefile.ext
==============================================================================
--- head/lang/php56/Makefile.ext Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/php56/Makefile.ext Sat Nov 22 20:40:08 2014 (r373100)
@@ -269,7 +269,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pdo_pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pdo-pgsql=${LOCALBASE}
@@ -286,7 +286,7 @@ USE_PHP_BUILD= yes
.endif
.if ${PHP_MODNAME} == "pgsql"
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pgsql=${LOCALBASE}
.endif
Modified: head/lang/pike78/Makefile
==============================================================================
--- head/lang/pike78/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/pike78/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -32,7 +32,7 @@ FREETYPE_LIB_DEPENDS= libfreetype.so:${P
FREETYPE_CONFIGURE_WITH=freetype
MYSQL_USE= mysql=yes
MYSQL_CONFIGURE_WITH= mysql
-PGSQL_USE= pgsql=yes
+PGSQL_USES= pgsql
PGSQL_CONFIGURE_WITH= pgsql
CFLAGS+= -ffast-math -fomit-frame-pointer
Modified: head/lang/urweb/Makefile
==============================================================================
--- head/lang/urweb/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/lang/urweb/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -42,7 +42,8 @@ CONFIGURE_ARGS+= with_emacs=no
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= server
+USES+= pgsql
+WANT_PGSQL= server
.else
CONFIGURE_ENV+= PGHEADER="no"
.endif
Modified: head/mail/archiveopteryx-devel/Makefile
==============================================================================
--- head/mail/archiveopteryx-devel/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/archiveopteryx-devel/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -19,10 +19,8 @@ GH_PROJECT= aox
GH_TAGNAME= ${GH_COMMIT}
GH_COMMIT= 39bdb8b
-USES= perl5 tar:bzip2
+USES= perl5 tar:bzip2 pgsql:9.1+
USE_PERL5= build
-USE_PGSQL= yes
-WANT_PGSQL_VER= 91+
PORTDOCS= COPYING README bsd.txt
Modified: head/mail/archiveopteryx/Makefile
==============================================================================
--- head/mail/archiveopteryx/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/archiveopteryx/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -14,10 +14,8 @@ LICENSE= MIT
BUILD_DEPENDS= jam:${PORTSDIR}/devel/jam
-USES= perl5 tar:bzip2
+USES= perl5 tar:bzip2 pgsql:9.1+
USE_PERL5= build
-USE_PGSQL= yes
-WANT_PGSQL_VER= 91+
PORTDOCS= COPYING README bsd.txt
Modified: head/mail/exim/Makefile
==============================================================================
--- head/mail/exim/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/exim/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -51,7 +51,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTS
ICONV_USES= iconv:lib,build
MYSQL_USE= mysql=yes
OPENLDAP_USE= openldap=yes
-PGSQL_USE= pgsql=yes
+PGSQL_USES= pgsql
REDIS_LIB_DEPENDS= libhiredis.so:${PORTSDIR}/databases/hiredis
SASLAUTHD_RUN_DEPENDS= ${LOCALBASE}/sbin/saslauthd:${PORTSDIR}/security/cyrus-sasl2-saslauthd
SA_EXIM_RUN_DEPENDS= ${LOCALBASE}/bin/spamc:${PORTSDIR}/mail/spamassassin
Modified: head/mail/ezmlm-idx/Makefile
==============================================================================
--- head/mail/ezmlm-idx/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/ezmlm-idx/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -44,7 +44,7 @@ PLIST_SUB+= MYSQL="" PGSQL="@comment " S
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
EXTRACT_INCLUDE+= -I${LOCALBASE}/include
EXTRACT_LIB+= -L${LOCALBASE}/lib -lpq -lcrypt
ALL_TARGET+= pgsql
Modified: head/mail/gld/Makefile
==============================================================================
--- head/mail/gld/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/gld/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -38,7 +38,7 @@ SUB_LIST+= MYSQL=
.if ${PORT_OPTIONS:MPGSQL}
CONFIGURE_ARGS+= --with-pgsql=${LOCALBASE}
-USE_PGSQL= yes
+USES+= pgsql
. if ${PORT_OPTIONS:MLOCAL_DB_SERVER}
RUN_DEPENDS+= postgresql-server>=0:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
SUB_LIST+= PGSQL=postgresql
Modified: head/mail/perdition/Makefile
==============================================================================
--- head/mail/perdition/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/perdition/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -102,7 +102,7 @@ PLIST_SUB+= MYSQL="@comment "
.if ${PORT_OPTIONS:MPGSQL}
CONFIGURE_ARGS+= --enable-pg
-USE_PGSQL= yes
+USES+= pgsql
PLIST_SUB+= PGSQL=""
.else
CONFIGURE_ARGS+= --disable-pg
Modified: head/mail/postfix-current/Makefile
==============================================================================
--- head/mail/postfix-current/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/postfix-current/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -210,7 +210,7 @@ _REQUIRE+= mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
_REQUIRE+= postgresql
Modified: head/mail/postfix/Makefile
==============================================================================
--- head/mail/postfix/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/postfix/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -202,7 +202,7 @@ _REQUIRE+= mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
_REQUIRE+= postgresql
Modified: head/mail/postfix210/Makefile
==============================================================================
--- head/mail/postfix210/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/postfix210/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -177,7 +177,7 @@ _REQUIRE+= mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
POSTFIX_CCARGS+= -DHAS_PGSQL -I${LOCALBASE}/include -I${LOCALBASE}/pgsql/include
POSTFIX_AUXLIBS+= -L${LOCALBASE}/lib -L${LOCALBASE}/pgsql/lib -lpq -lcrypt
_REQUIRE+= postgresql
Modified: head/mail/spmfilter/Makefile
==============================================================================
--- head/mail/spmfilter/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/spmfilter/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -72,7 +72,7 @@ _REQUIRE+= mysql
.if ${PORT_OPTIONS:MPGSQL}
LIB_DEPENDS+= libzdb.so:${PORTSDIR}/databases/libzdb
-USE_PGSQL= yes
+USES+= pgsql
_REQUIRE+= postgresql
.endif
Modified: head/mail/tpop3d/Makefile
==============================================================================
--- head/mail/tpop3d/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/mail/tpop3d/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --enable-auth-mysql \
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
DEFAULT_PGSQL_VER= 80
CONFIGURE_ARGS+= --enable-auth-pgsql \
--with-pgsql-lib-dir=${LOCALBASE}/lib \
Modified: head/math/octave-forge-database/Makefile
==============================================================================
--- head/math/octave-forge-database/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/math/octave-forge-database/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -19,7 +19,7 @@ OCTSRC= ${DISTNAME}
WRKSRC= ${WRKDIR}/${OCTSRC}/src
GNU_CONFIGURE= yes
-USE_PGSQL= yes
+USES+= pgsql
ALL_TARGET=
.include "${.CURDIR}/../../Mk/bsd.octave.mk"
Modified: head/multimedia/motion/Makefile
==============================================================================
--- head/multimedia/motion/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/multimedia/motion/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -72,7 +72,7 @@ CONFIGURE_ARGS+=--without-mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-pgsql-lib=${LOCALBASE}/lib \
--with-pgsql-include=${LOCALBASE}/include
.else
Modified: head/net-im/jabber/Makefile
==============================================================================
--- head/net-im/jabber/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-im/jabber/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-mysql=${LOCALBAS
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE}
.endif
Modified: head/net-mgmt/collectd/Makefile
==============================================================================
--- head/net-mgmt/collectd/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/collectd/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -334,7 +334,7 @@ PLIST_SUB+= PDNS="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--enable-postgresql
PLIST_SUB+= PGSQL=""
.else
Modified: head/net-mgmt/collectd5/Makefile
==============================================================================
--- head/net-mgmt/collectd5/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/collectd5/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -299,7 +299,7 @@ PLIST_SUB+= PERL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-postgresql=${LOCALBASE} --enable-postgresql --with-libpq
PLIST_SUB+= PGSQL=""
.else
Modified: head/net-mgmt/flow-tools/Makefile
==============================================================================
--- head/net-mgmt/flow-tools/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/flow-tools/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -42,7 +42,7 @@ FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-
.if ${PORT_OPTIONS:MPGSQL}
CONFIGURE_ARGS+=--with-pgsql="${PREFIX}"
-USE_PGSQL= yes
+USES+= pgsql
.endif
.if ${PORT_OPTIONS:MMYSQL}
Modified: head/net-mgmt/nagios-check_postgres/Makefile
==============================================================================
--- head/net-mgmt/nagios-check_postgres/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/nagios-check_postgres/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -17,7 +17,7 @@ NO_ARCH= yes
USES= perl5
USE_PERL5= configure
-USE_PGSQL= yes
+USES+= pgsql
# This script is primarily used for monitoring via Nagios, but it also
# has output styles compatible with cacti or mrtg. The options
Modified: head/net-mgmt/netmagis-common/Makefile
==============================================================================
--- head/net-mgmt/netmagis-common/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/netmagis-common/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -17,10 +17,8 @@ COMMENT?= Netmagis common infrastructure
#LICENSE_FILE= ${WRKSRC}/LICENSE
#LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
-USES= tcl:85+
-
-USE_PGSQL= pgtcl
-WANT_PGSQL_VER= 91+
+USES= tcl:85+ pgsql:9.1+
+WANT_PGSQL= pgtcl
RUN_DEPENDS+= dtplite:${PORTSDIR}/devel/tcllib
@@ -30,7 +28,7 @@ RUN_DEPENDS+= netmagis-config:${PORTSDIR
.if ${PKGNAMESUFFIX} == -database
RUN_DEPENDS+= pwgen:${PORTSDIR}/sysutils/pwgen
-USE_PGSQL+= server pltcl
+WANT_PGSQL+= server
.endif
.if ${PKGNAMESUFFIX} == -www
Modified: head/net-mgmt/pmacct/Makefile
==============================================================================
--- head/net-mgmt/pmacct/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/pmacct/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -45,7 +45,7 @@ PLIST_SUB+= WITH_MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--enable-pgsql
PLIST_SUB+= WITH_PGSQL=""
.else
Modified: head/net-mgmt/rackmonkey/Makefile
==============================================================================
--- head/net-mgmt/rackmonkey/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-mgmt/rackmonkey/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -43,7 +43,7 @@ USE_MYSQL= yes
RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= 83
+USES+= pgsql
RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
@@ -80,7 +80,7 @@ do-install:
fi \
fi \
fi \
- elif [ "${USE_MYSQL}" -o "${USE_PGSQL}" ]; then \
+ elif [ "${USE_MYSQL}" -o "${USES:MPGSQL}" ]; then \
${INSTALL} ${WRKSRC}/conf/rackmonkey.conf-default ${STAGEDIR}${WWWDIR}/; \
fi
if [ -e "${WWWDIR}/rackmonkey.conf" ]; then \
Modified: head/net-p2p/gnunet/Makefile
==============================================================================
--- head/net-p2p/gnunet/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net-p2p/gnunet/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -66,7 +66,7 @@ NLS_USES= gettext
NLS_CONFIGURE_ON= --with-libintl-prefix=${LOCALBASE}
NLS_CONFIGURE_OFF= --disable-nls
PGSQL_DESC= Use PostgreSQL for the data store and cache
-PGSQL_USE= pgsql=yes
+PGSQL_USES= pgsql
PGSQL_CONFIGURE_ON= --with-postgres=${LOCALBASE}
PGSQL_CONFIGURE_OFF= --without-postgres
SQLITE_DESC= Use SQLite for the data store and cache
Modified: head/net/echoping/Makefile
==============================================================================
--- head/net/echoping/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/echoping/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -36,7 +36,7 @@ PLIST_SUB= WITH_LDAP="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
PING_PLUGINS+= postgresql
PLIST_SUB+= WITH_PGSQL=""
.else
Modified: head/net/freeradius2/Makefile
==============================================================================
--- head/net/freeradius2/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/freeradius2/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -158,7 +158,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= YES
+USES+= pgsql
CONFIGURE_ARGS+=--with-rlm_sql_postgresql
PLIST_SUB+= PGSQL=""
_REQUIRE+= postgresql
Modified: head/net/freeradius3/Makefile
==============================================================================
--- head/net/freeradius3/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/freeradius3/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -139,7 +139,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= YES
+USES+= pgsql
CONFIGURE_ARGS+=--with-rlm_sql_postgresql
PLIST_SUB+= PGSQL=""
_REQUIRE+= postgresql
Modified: head/net/gnu-radius/Makefile
==============================================================================
--- head/net/gnu-radius/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/gnu-radius/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -69,7 +69,7 @@ PLIST_SUB+= MYSQL="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CONFIGURE_ARGS+=--with-postgres
PLIST_SUB+= PGSQL=""
.else
Modified: head/net/prosearch/Makefile
==============================================================================
--- head/net/prosearch/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/prosearch/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -107,7 +107,7 @@ ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
RUN_DEPENDS+=\
p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
@@ -118,9 +118,8 @@ p5-DBD-PgPP>=0:${PORTSDIR}/databases/p5-
.endif
.if ${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MPGPP} || ${PORT_OPTIONS:MDB}
-USE_PGSQL= yes
-RUN_DEPENDS+=\
-${LOCALBASE}/bin/postgres:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
+USES+= pgsql
+WANT_PGSQL= client server
.endif
.if ${PORT_OPTIONS:MSQLITE}
Modified: head/net/traff/Makefile
==============================================================================
--- head/net/traff/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/traff/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -31,7 +31,7 @@ CONFIGURE_ARGS+=--enable-mysql
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
CPPFLAGS+= -DwithPGSQL -I${LOCALBASE}/include
LIBS+= -L${LOCALBASE}/lib -lpq
CONFIGURE_ARGS+=--enable-postgresql
Modified: head/net/yate/Makefile
==============================================================================
--- head/net/yate/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/net/yate/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -60,7 +60,7 @@ PLIST_SUB+= WITH_MYSQL="@comment "
.if ${PORT_OPTIONS:MPGSQL}
CONFIGURE_ARGS+= --with-libpq=${LOCALBASE}
PLIST_SUB+= WITH_PGSQL=""
-USE_PGSQL= yes
+USES+= pgsql
.else
CONFIGURE_ARGS+= --without-libpq
PLIST_SUB+= WITH_PGSQL="@comment "
Modified: head/ports-mgmt/portscout/Makefile
==============================================================================
--- head/ports-mgmt/portscout/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/ports-mgmt/portscout/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -35,7 +35,7 @@ RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/datab
#USE_SQLITE= 3
#RUN_DEPENDS+= p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
.elif !defined(WITHOUT_PGSQL)
-#USE_PGSQL= yes
+#USES+= pgsql
#RUN_DEPENDS+= p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg
.endif
Modified: head/ports-mgmt/tinderbox-devel/Makefile
==============================================================================
--- head/ports-mgmt/tinderbox-devel/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/ports-mgmt/tinderbox-devel/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -59,7 +59,7 @@ PLIST_SUB+= WEBUI="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
.if defined(WEBUI)
USE_PHP+= pgsql pdo_pgsql
.endif
Modified: head/ports-mgmt/tinderbox/Makefile
==============================================================================
--- head/ports-mgmt/tinderbox/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/ports-mgmt/tinderbox/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -53,7 +53,7 @@ PLIST_SUB+= WEBUI="@comment "
.endif
.if ${PORT_OPTIONS:MPGSQL}
-USE_PGSQL= yes
+USES+= pgsql
.if defined(WEBUI)
USE_PHP+= pgsql pdo_pgsql
.endif
Modified: head/security/base/Makefile
==============================================================================
--- head/security/base/Makefile Sat Nov 22 20:04:49 2014 (r373099)
+++ head/security/base/Makefile Sat Nov 22 20:40:08 2014 (r373100)
@@ -31,7 +31,7 @@ USE_MYSQL= yes
USE_PHP+= mysql
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list