diff options
88 files changed, 112 insertions, 239 deletions
@@ -10,6 +10,16 @@ in the release notes and/or placed into UPDATING. All ports committers are allowed to commit to this file. +20141122: +AUTHOR: crees@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@FreeBSD.org diff --git a/Mk/bsd.database.mk b/Mk/bsd.database.mk index 68eb5bd4d6bf..9b03cb8e45d4 100644 --- a/Mk/bsd.database.mk +++ b/Mk/bsd.database.mk @@ -32,23 +32,7 @@ Database_Include_MAINTAINER= ports@FreeBSD.org # 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 version: ${MYSQL_VER} .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 diff --git a/databases/glom/Makefile b/databases/glom/Makefile index aadc085e137b..fb26c704bea0 100644 --- a/databases/glom/Makefile +++ b/databases/glom/Makefile @@ -27,6 +27,7 @@ RUN_DEPENDS= iso-codes>=0:${PORTSDIR}/misc/iso-codes \ 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 diff --git a/databases/libzdb/Makefile b/databases/libzdb/Makefile index 1ccec4f0c21a..59e91585f49d 100644 --- a/databases/libzdb/Makefile +++ b/databases/libzdb/Makefile @@ -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 diff --git a/databases/opendbx/Makefile b/databases/opendbx/Makefile index 8cc319779ca5..22d99bed775c 100644 --- a/databases/opendbx/Makefile +++ b/databases/opendbx/Makefile @@ -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 diff --git a/databases/pglesslog/Makefile b/databases/pglesslog/Makefile index 243b037d3850..82adb2d1776f 100644 --- a/databases/pglesslog/Makefile +++ b/databases/pglesslog/Makefile @@ -9,12 +9,11 @@ DISTNAME= pg_lesslogg_${PORTVERSION}_pg84 MAINTAINER= kuriyama@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: diff --git a/databases/qt4-pgsql-plugin/Makefile b/databases/qt4-pgsql-plugin/Makefile index 7e95027e2dce..6a1e0a3e8eb5 100644 --- a/databases/qt4-pgsql-plugin/Makefile +++ b/databases/qt4-pgsql-plugin/Makefile @@ -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} \ diff --git a/databases/qt5-sqldrivers-pgsql/Makefile b/databases/qt5-sqldrivers-pgsql/Makefile index 5325533a4c29..bf7cb5bdaa22 100644 --- a/databases/qt5-sqldrivers-pgsql/Makefile +++ b/databases/qt5-sqldrivers-pgsql/Makefile @@ -5,6 +5,6 @@ PORTNAME= pgsql DB= PSQL DB_DESC= PostgreSQL -USE_PGSQL= yes +USES+= pgsql .include "${.CURDIR:H:H}/devel/qt5/Makefile.sqldrivers" diff --git a/databases/rubygem-do_postgres/Makefile b/databases/rubygem-do_postgres/Makefile index beff9063ca1b..052d81f9e80c 100644 --- a/databases/rubygem-do_postgres/Makefile +++ b/databases/rubygem-do_postgres/Makefile @@ -11,7 +11,7 @@ COMMENT= Ruby DataObjects driver for PostgreSQL RUN_DEPENDS= rubygem-data_objects>=0.10.13:${PORTSDIR}/databases/rubygem-data_objects -USE_PGSQL= yes +USES+= pgsql USE_RUBY= yes USE_RUBYGEMS= yes diff --git a/databases/rubygem-pg/Makefile b/databases/rubygem-pg/Makefile index 05eb9a4b0cd4..6d67f11d866a 100644 --- a/databases/rubygem-pg/Makefile +++ b/databases/rubygem-pg/Makefile @@ -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 diff --git a/databases/skytools/Makefile b/databases/skytools/Makefile index 06bbaae34b0f..29b8c08b4e6f 100644 --- a/databases/skytools/Makefile +++ b/databases/skytools/Makefile @@ -10,9 +10,7 @@ MAINTAINER= sam@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 diff --git a/databases/slony1v2/Makefile b/databases/slony1v2/Makefile index d54d785d5425..397a51854a29 100644 --- a/databases/slony1v2/Makefile +++ b/databases/slony1v2/Makefile @@ -16,8 +16,7 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/flex:${PORTSDIR}/textproc/flex \ ${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 diff --git a/databases/sqlclient/Makefile b/databases/sqlclient/Makefile index f596b8c5232a..8d490d9e9932 100644 --- a/databases/sqlclient/Makefile +++ b/databases/sqlclient/Makefile @@ -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 diff --git a/databases/sqlrelay/Makefile b/databases/sqlrelay/Makefile index 92e18a83ca3b..71adf63e4b3c 100644 --- a/databases/sqlrelay/Makefile +++ b/databases/sqlrelay/Makefile @@ -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 diff --git a/databases/tablelog/Makefile b/databases/tablelog/Makefile index 9ca0cdbafa48..b502481cd390 100644 --- a/databases/tablelog/Makefile +++ b/databases/tablelog/Makefile @@ -12,8 +12,7 @@ COMMENT= Logs changes on a table in PostgreSQL WRKSRC= ${WRKDIR}/table_log-${DISTVERSION} -USES= gmake -USE_PGSQL= yes +USES= gmake pgsql MAKE_ARGS= USE_PGXS=1 OPTIONS_DEFINE= DOCS diff --git a/databases/tarantool/Makefile b/databases/tarantool/Makefile index bb8d528bd630..3806508d9a6a 100644 --- a/databases/tarantool/Makefile +++ b/databases/tarantool/Makefile @@ -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 " diff --git a/databases/vfront/Makefile b/databases/vfront/Makefile index 3bdc883448e9..ad47235f01ef 100644 --- a/databases/vfront/Makefile +++ b/databases/vfront/Makefile @@ -28,7 +28,7 @@ USE_MYSQL= yes .if ${PORT_OPTIONS:MPGSQL} USE_PHP+= pgsql -USE_PGSQL= yes +USES+= pgsql .endif post-patch: diff --git a/deskutils/moregroupware/Makefile b/deskutils/moregroupware/Makefile index 0d99c585d382..26ba5d7e4d39 100644 --- a/deskutils/moregroupware/Makefile +++ b/deskutils/moregroupware/Makefile @@ -30,7 +30,8 @@ ADDONS_DESC= install additional workgroup features (addons) 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} diff --git a/deskutils/phpcollab/Makefile b/deskutils/phpcollab/Makefile index 24ea07b689f7..84dd879386b5 100644 --- a/deskutils/phpcollab/Makefile +++ b/deskutils/phpcollab/Makefile @@ -25,7 +25,8 @@ OPTIONS_SINGLE_WEBSERVER= APACHE LIGHTTPD 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 diff --git a/devel/cdash/Makefile b/devel/cdash/Makefile index 0d404065af05..a048b6f40e56 100644 --- a/devel/cdash/Makefile +++ b/devel/cdash/Makefile @@ -37,7 +37,7 @@ DB_TYPE= mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql USE_PHP+= pgsql DB_TYPE= pgsql .endif diff --git a/devel/gearmand-devel/Makefile b/devel/gearmand-devel/Makefile index fd0c0dc38da1..314cc7452a0b 100644 --- a/devel/gearmand-devel/Makefile +++ b/devel/gearmand-devel/Makefile @@ -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 diff --git a/devel/preps-gui/Makefile b/devel/preps-gui/Makefile index 74ebdc485be8..6b217f634433 100644 --- a/devel/preps-gui/Makefile +++ b/devel/preps-gui/Makefile @@ -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 diff --git a/devel/prepstools/Makefile b/devel/prepstools/Makefile index 4829d977e432..3490ee5e83d6 100644 --- a/devel/prepstools/Makefile +++ b/devel/prepstools/Makefile @@ -14,8 +14,7 @@ RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-serve 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 diff --git a/dns/mydns/Makefile b/dns/mydns/Makefile index 28912de2d393..da9a1ac15bdf 100644 --- a/dns/mydns/Makefile +++ b/dns/mydns/Makefile @@ -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 diff --git a/graphics/mapnik/Makefile b/graphics/mapnik/Makefile index 5121986aec22..d94ffc4e6c56 100644 --- a/graphics/mapnik/Makefile +++ b/graphics/mapnik/Makefile @@ -81,7 +81,7 @@ LIB_DEPENDS+= libcurl.so:${PORTSDIR}/ftp/curl .if ${PORT_OPTIONS:MPOSTGIS} INPUT_PLUGINS+= postgis -USE_PGSQL= yes +USES+= pgsql .endif .if ${PORT_OPTIONS:MSQLITE3} diff --git a/irc/inspircd/Makefile b/irc/inspircd/Makefile index a065d1d37865..9c6beedab83a 100644 --- a/irc/inspircd/Makefile +++ b/irc/inspircd/Makefile @@ -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 diff --git a/irc/ratbox-services/Makefile b/irc/ratbox-services/Makefile index c2e967983a08..21ddeebd0ffe 100644 --- a/irc/ratbox-services/Makefile +++ b/irc/ratbox-services/Makefile @@ -119,7 +119,7 @@ CONFIGURE_ARGS+= --enable-mysql=${LOCALBASE} .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --enable-pgsql=${LOCALBASE} .endif diff --git a/lang/harbour/Makefile b/lang/harbour/Makefile index f10d687bcf12..60794c840ee4 100644 --- a/lang/harbour/Makefile +++ b/lang/harbour/Makefile @@ -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 diff --git a/lang/mit-scheme/Makefile b/lang/mit-scheme/Makefile index 3ed12a286744..1a3c13bfa886 100644 --- a/lang/mit-scheme/Makefile +++ b/lang/mit-scheme/Makefile @@ -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 diff --git a/lang/newlisp-devel/Makefile b/lang/newlisp-devel/Makefile index 1c5ef9f54040..037dbb40b382 100644 --- a/lang/newlisp-devel/Makefile +++ b/lang/newlisp-devel/Makefile @@ -71,7 +71,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql MODULES+= postgres PLIST_SUB+= PGSQL="" .else diff --git a/lang/newlisp/Makefile b/lang/newlisp/Makefile index d89141022be5..b3e38d25d96a 100644 --- a/lang/newlisp/Makefile +++ b/lang/newlisp/Makefile @@ -69,7 +69,7 @@ PLIST_SUB+= MYSQL="@comment " .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql MODULES+= postgres PLIST_SUB+= PGSQL="" .else diff --git a/lang/php5/Makefile.ext b/lang/php5/Makefile.ext index dd15b6851644..558f964035b3 100644 --- a/lang/php5/Makefile.ext +++ b/lang/php5/Makefile.ext @@ -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 diff --git a/lang/php53/Makefile.ext b/lang/php53/Makefile.ext index 721fa72e9817..c16ef0c53abe 100644 --- a/lang/php53/Makefile.ext +++ b/lang/php53/Makefile.ext @@ -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 diff --git a/lang/php55/Makefile.ext b/lang/php55/Makefile.ext index c330c85aae91..4ab7342617d2 100644 --- a/lang/php55/Makefile.ext +++ b/lang/php55/Makefile.ext @@ -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 diff --git a/lang/php56/Makefile.ext b/lang/php56/Makefile.ext index d293fa272e8b..bf4a20532ca6 100644 --- a/lang/php56/Makefile.ext +++ b/lang/php56/Makefile.ext @@ -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 diff --git a/lang/pike78/Makefile b/lang/pike78/Makefile index 46cd8f4046b5..0ed7797e69f6 100644 --- a/lang/pike78/Makefile +++ b/lang/pike78/Makefile @@ -32,7 +32,7 @@ FREETYPE_LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 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 diff --git a/lang/urweb/Makefile b/lang/urweb/Makefile index b3952d38e008..212942129d2c 100644 --- a/lang/urweb/Makefile +++ b/lang/urweb/Makefile @@ -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 diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile index 8fc3491884a1..ef0077238d21 100644 --- a/mail/archiveopteryx-devel/Makefile +++ b/mail/archiveopteryx-devel/Makefile @@ -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 diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile index bbe24c8d7a31..f80b0ebbc56e 100644 --- a/mail/archiveopteryx/Makefile +++ b/mail/archiveopteryx/Makefile @@ -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 diff --git a/mail/exim/Makefile b/mail/exim/Makefile index da1afdc1f100..bd5d7195b845 100644 --- a/mail/exim/Makefile +++ b/mail/exim/Makefile @@ -51,7 +51,7 @@ GNUTLS_LIB_DEPENDS= libgnutls.so:${PORTSDIR}/security/gnutls 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 diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index 9c6abd774321..3505da5600e7 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -44,7 +44,7 @@ PLIST_SUB+= MYSQL="" PGSQL="@comment " SQLITE="@comment " .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 diff --git a/mail/gld/Makefile b/mail/gld/Makefile index fce4e8c1f10e..24b5338324dc 100644 --- a/mail/gld/Makefile +++ b/mail/gld/Makefile @@ -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 diff --git a/mail/perdition/Makefile b/mail/perdition/Makefile index bca3fb39e894..0c731da878e6 100644 --- a/mail/perdition/Makefile +++ b/mail/perdition/Makefile @@ -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 diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index 3b51fe179e40..75a95acf1fe0 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -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 diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 76f069bdb7d7..1bdda1e7e4d6 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -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 diff --git a/mail/postfix210/Makefile b/mail/postfix210/Makefile index 8f9cc9f964f6..44fd5c63fa5c 100644 --- a/mail/postfix210/Makefile +++ b/mail/postfix210/Makefile @@ -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 diff --git a/mail/spmfilter/Makefile b/mail/spmfilter/Makefile index 4e19dc39de07..67c0bc65e558 100644 --- a/mail/spmfilter/Makefile +++ b/mail/spmfilter/Makefile @@ -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 diff --git a/mail/tpop3d/Makefile b/mail/tpop3d/Makefile index 2c6a76e2303a..b15ba5f6a41e 100644 --- a/mail/tpop3d/Makefile +++ b/mail/tpop3d/Makefile @@ -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 \ diff --git a/math/octave-forge-database/Makefile b/math/octave-forge-database/Makefile index d9af14aba948..d826d0d0fbe8 100644 --- a/math/octave-forge-database/Makefile +++ b/math/octave-forge-database/Makefile @@ -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" diff --git a/multimedia/motion/Makefile b/multimedia/motion/Makefile index d4650f4258c1..0bc0261d755e 100644 --- a/multimedia/motion/Makefile +++ b/multimedia/motion/Makefile @@ -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 diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile index a7972b705b52..525f755d0eda 100644 --- a/net-im/jabber/Makefile +++ b/net-im/jabber/Makefile @@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} .endif diff --git a/net-mgmt/collectd/Makefile b/net-mgmt/collectd/Makefile index 2443f5d7203d..65f95aefe537 100644 --- a/net-mgmt/collectd/Makefile +++ b/net-mgmt/collectd/Makefile @@ -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 diff --git a/net-mgmt/collectd5/Makefile b/net-mgmt/collectd5/Makefile index 74d1877c87a5..27d00c36e9fb 100644 --- a/net-mgmt/collectd5/Makefile +++ b/net-mgmt/collectd5/Makefile @@ -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 diff --git a/net-mgmt/flow-tools/Makefile b/net-mgmt/flow-tools/Makefile index 53039cb4b6c8..1b2de5877afa 100644 --- a/net-mgmt/flow-tools/Makefile +++ b/net-mgmt/flow-tools/Makefile @@ -42,7 +42,7 @@ FLOW_CAPTURE_PIDDIR= ${VARDIR}/run/flow-capture .if ${PORT_OPTIONS:MPGSQL} CONFIGURE_ARGS+=--with-pgsql="${PREFIX}" -USE_PGSQL= yes +USES+= pgsql .endif .if ${PORT_OPTIONS:MMYSQL} diff --git a/net-mgmt/nagios-check_postgres/Makefile b/net-mgmt/nagios-check_postgres/Makefile index 88db6cab161a..aaadbfa86df0 100644 --- a/net-mgmt/nagios-check_postgres/Makefile +++ b/net-mgmt/nagios-check_postgres/Makefile @@ -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 diff --git a/net-mgmt/netmagis-common/Makefile b/net-mgmt/netmagis-common/Makefile index efb9f4f78c91..ff57a83a0200 100644 --- a/net-mgmt/netmagis-common/Makefile +++ b/net-mgmt/netmagis-common/Makefile @@ -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}/net-mgmt/netmagis-common .if ${PKGNAMESUFFIX} == -database RUN_DEPENDS+= pwgen:${PORTSDIR}/sysutils/pwgen -USE_PGSQL+= server pltcl +WANT_PGSQL+= server .endif .if ${PKGNAMESUFFIX} == -www diff --git a/net-mgmt/pmacct/Makefile b/net-mgmt/pmacct/Makefile index 971de46e40a7..be32390fb06e 100644 --- a/net-mgmt/pmacct/Makefile +++ b/net-mgmt/pmacct/Makefile @@ -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 diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile index 960b3de6dc79..950d89a9ca76 100644 --- a/net-mgmt/rackmonkey/Makefile +++ b/net-mgmt/rackmonkey/Makefile @@ -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 \ diff --git a/net-p2p/gnunet/Makefile b/net-p2p/gnunet/Makefile index 0a14b49654a1..1ff971385157 100644 --- a/net-p2p/gnunet/Makefile +++ b/net-p2p/gnunet/Makefile @@ -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 diff --git a/net/echoping/Makefile b/net/echoping/Makefile index d7d0529a5f51..60a4431c1be1 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -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 diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile index d4ebe57e2a18..4ec631592ea9 100644 --- a/net/freeradius2/Makefile +++ b/net/freeradius2/Makefile @@ -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 diff --git a/net/freeradius3/Makefile b/net/freeradius3/Makefile index 8d64d1c5b1d5..acf0f5f6e3ef 100644 --- a/net/freeradius3/Makefile +++ b/net/freeradius3/Makefile @@ -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 diff --git a/net/gnu-radius/Makefile b/net/gnu-radius/Makefile index 6080525b1f46..6d5b56e5316e 100644 --- a/net/gnu-radius/Makefile +++ b/net/gnu-radius/Makefile @@ -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 diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile index 7b581dcc2047..8e086d9bf8c4 100644 --- a/net/prosearch/Makefile +++ b/net/prosearch/Makefile @@ -107,7 +107,7 @@ ${LOCALBASE}/libexec/mysqld:${PORTSDIR}/databases/mariadb-server .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-DBD-PgPP .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} diff --git a/net/traff/Makefile b/net/traff/Makefile index 4d1bd5acc0cc..b22da7ac50c7 100644 --- a/net/traff/Makefile +++ b/net/traff/Makefile @@ -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 diff --git a/net/yate/Makefile b/net/yate/Makefile index 259cbc68031b..398d2b430f97 100644 --- a/net/yate/Makefile +++ b/net/yate/Makefile @@ -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 " diff --git a/ports-mgmt/portscout/Makefile b/ports-mgmt/portscout/Makefile index b1f869eb7620..1f98e0fbd4dd 100644 --- a/ports-mgmt/portscout/Makefile +++ b/ports-mgmt/portscout/Makefile @@ -35,7 +35,7 @@ RUN_DEPENDS= p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \ #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 diff --git a/ports-mgmt/tinderbox-devel/Makefile b/ports-mgmt/tinderbox-devel/Makefile index 2dcc8749b158..62c14ea5fc6d 100644 --- a/ports-mgmt/tinderbox-devel/Makefile +++ b/ports-mgmt/tinderbox-devel/Makefile @@ -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 diff --git a/ports-mgmt/tinderbox/Makefile b/ports-mgmt/tinderbox/Makefile index 23a13c8fd057..c3ed0e3591ea 100644 --- a/ports-mgmt/tinderbox/Makefile +++ b/ports-mgmt/tinderbox/Makefile @@ -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 diff --git a/security/base/Makefile b/security/base/Makefile index 442a8ef11415..fae854201c5f 100644 --- a/security/base/Makefile +++ b/security/base/Makefile @@ -31,7 +31,7 @@ USE_MYSQL= yes USE_PHP+= mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql USE_PHP+= pgsql .endif .if ${PORT_OPTIONS:MPDF} diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 9cb6cf4cd5dd..3c5e3057d01a 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -126,7 +126,7 @@ CONFIGURE_ARGS+=--without-authmysql .if ${AUTHMOD} == authpgsql DOCS= README.authpostgres.html -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+=--with-authpgsql .else CONFIGURE_ARGS+=--without-authpgsql diff --git a/security/maia/Makefile b/security/maia/Makefile index c854da36f52b..959c59d3e790 100644 --- a/security/maia/Makefile +++ b/security/maia/Makefile @@ -133,7 +133,7 @@ USE_PHP+= mysql mysqli .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql USE_PHP+= pgsql .endif diff --git a/security/medusa/Makefile b/security/medusa/Makefile index 702428e5fd43..385653465da0 100644 --- a/security/medusa/Makefile +++ b/security/medusa/Makefile @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --enable-module-svn=no .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --enable-module-postgres .else CONFIGURE_ARGS+= --enable-module-postgres=no diff --git a/security/ossec-hids-server/Makefile b/security/ossec-hids-server/Makefile index 6aef19478f1f..53eaaa26fa11 100644 --- a/security/ossec-hids-server/Makefile +++ b/security/ossec-hids-server/Makefile @@ -49,7 +49,7 @@ USE_MYSQL= client .if ${PORT_OPTIONS:MPGSQL} WITH_DB= yes -USE_PGSQL= yes +USES+= pgsql .endif .endif diff --git a/security/pam-pgsql/Makefile b/security/pam-pgsql/Makefile index bce1dc35732e..5cf634d25ba4 100644 --- a/security/pam-pgsql/Makefile +++ b/security/pam-pgsql/Makefile @@ -15,8 +15,7 @@ LICENSE= GPLv2 LIB_DEPENDS= libmhash.so:${PORTSDIR}/security/mhash \ libgcrypt.so:${PORTSDIR}/security/libgcrypt -USES= libtool -USE_PGSQL= yes +USES= libtool pgsql GNU_CONFIGURE= yes SUB_FILES= pkg-message diff --git a/sysutils/cfengine33/Makefile b/sysutils/cfengine33/Makefile index 0d73beb351d0..f005f629efa8 100644 --- a/sysutils/cfengine33/Makefile +++ b/sysutils/cfengine33/Makefile @@ -59,7 +59,7 @@ LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif diff --git a/sysutils/cfengine34/Makefile b/sysutils/cfengine34/Makefile index 40c58d7668e0..9a117cb30051 100644 --- a/sysutils/cfengine34/Makefile +++ b/sysutils/cfengine34/Makefile @@ -63,7 +63,7 @@ LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif diff --git a/sysutils/cfengine35/Makefile b/sysutils/cfengine35/Makefile index a47a8ccf6e08..66ff63397e46 100644 --- a/sysutils/cfengine35/Makefile +++ b/sysutils/cfengine35/Makefile @@ -62,7 +62,7 @@ LIB_DEPENDS+= libqdbm.so:${PORTSDIR}/databases/qdbm .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+= --with-postgresql=${LOCALBASE} LIB_DEPENDS+= libpq.so:${PORTSDIR}/databases/postgresql${PGSQL_VER}-client .endif diff --git a/sysutils/condor/Makefile b/sysutils/condor/Makefile index ca6aa1c143e4..b2294b773d65 100644 --- a/sysutils/condor/Makefile +++ b/sysutils/condor/Makefile @@ -18,9 +18,9 @@ LIB_DEPENDS+= libkrb5support.so:${PORTSDIR}/security/krb5 \ WRKSRC= ${WRKDIR}/condor-${PORTVERSION} USE_LDCONFIG= yes -USES= cmake gmake perl5 +USES= cmake gmake perl5 pgsql +WANT_PGSQL= server USE_GCC= any -USE_PGSQL= server CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -rpath=${LOCALBASE}/lib:/usr/lib:/lib CMAKE_ARGS+= -DCMAKE_CXX_FLAGS:STRING=${CXXFLAGS} \ diff --git a/sysutils/rsyslog7-devel/Makefile b/sysutils/rsyslog7-devel/Makefile index ca43540eb403..09f66cded3a7 100644 --- a/sysutils/rsyslog7-devel/Makefile +++ b/sysutils/rsyslog7-devel/Makefile @@ -74,7 +74,7 @@ CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so .else diff --git a/sysutils/rsyslog7/Makefile b/sysutils/rsyslog7/Makefile index 7063e4998f68..c9b7c2fa15f4 100644 --- a/sysutils/rsyslog7/Makefile +++ b/sysutils/rsyslog7/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so .else diff --git a/sysutils/rsyslog8-devel/Makefile b/sysutils/rsyslog8-devel/Makefile index 4219a2512c70..62641836b80b 100644 --- a/sysutils/rsyslog8-devel/Makefile +++ b/sysutils/rsyslog8-devel/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so .else diff --git a/sysutils/rsyslog8/Makefile b/sysutils/rsyslog8/Makefile index 36f8cb8be0d4..98327d2baabb 100644 --- a/sysutils/rsyslog8/Makefile +++ b/sysutils/rsyslog8/Makefile @@ -73,7 +73,7 @@ CONFIGURE_ARGS+=--disable-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql CONFIGURE_ARGS+=--enable-pgsql PLIST_FILES+= lib/rsyslog/ompgsql.so .else diff --git a/sysutils/slurm-hpc/Makefile b/sysutils/slurm-hpc/Makefile index c56ad576e399..100e6ee30f6c 100644 --- a/sysutils/slurm-hpc/Makefile +++ b/sysutils/slurm-hpc/Makefile @@ -57,7 +57,7 @@ CONFIGURE_ARGS+=--with-mysql_config=/nomysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes # Job accounting +USES+= pgsql # Job accounting PLIST_FILES+= lib/slurm/accounting_storage_pgsql.a \ lib/slurm/accounting_storage_pgsql.la \ lib/slurm/accounting_storage_pgsql.so \ diff --git a/sysutils/watchmen/Makefile b/sysutils/watchmen/Makefile index 64a5729138d2..a01491414752 100644 --- a/sysutils/watchmen/Makefile +++ b/sysutils/watchmen/Makefile @@ -41,7 +41,7 @@ RUN_DEPENDS+= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql .endif .if ${PORT_OPTIONS:MPGSQL} -USE_PGSQL= yes +USES+= pgsql RUN_DEPENDS+= p5-DBD-Pg>=2.19.2:${PORTSDIR}/databases/p5-DBD-Pg .endif diff --git a/textproc/openfts/Makefile b/textproc/openfts/Makefile index 82220a84d0f2..6f7184b48d10 100644 --- a/textproc/openfts/Makefile +++ b/textproc/openfts/Makefile @@ -13,8 +13,7 @@ COMMENT= Open Source Full Text Search engine RUN_DEPENDS= ${LOCALBASE}/lib/postgresql/tsearch2.so:${PORTSDIR}/databases/postgresql${DEFAULT_PGSQL_VER}-contrib \ p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg -USE_PGSQL= yes -USES= perl5 +USES+= perl5 pgsql USE_PERL5= configure OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/textproc/sphinxsearch-devel/Makefile b/textproc/sphinxsearch-devel/Makefile index 1636942389e4..651e700a5d89 100644 --- a/textproc/sphinxsearch-devel/Makefile +++ b/textproc/sphinxsearch-devel/Makefile @@ -77,7 +77,7 @@ OPTIMIZED_CFLAGS_CXXFLAGS=-O3 -fomit-frame-pointer PGSQL_CONFIGURE_WITH= pgsql PGSQL_CONFIGURE_ON= --with-pgsql-includes=${LOCALBASE}/include \ --with-pgsql-libs=${LOCALBASE}/lib -PGSQL_USE= pgsql +PGSQL_USES= pgsql SYSLOG_DESC= Enable logging via syslog SYSLOG_CONFIGURE_WITH= syslog @@ -85,7 +85,6 @@ SYSLOG_CONFIGURE_WITH= syslog UNIXODBC_CONFIGURE_WITH=unixodbc UNIXODBC_LIB_DEPENDS= libodbc.so:${PORTSDIR}/databases/unixODBC - CONFLICTS= sphinxsearch-[0-9]* dpsearch-[0-9]* rdb-[0-9]* \ swish++-[0-9]* xaira-[0-9]* diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile index d314e81fa48e..7a761a564d3a 100644 --- a/www/udmsearch/Makefile +++ b/www/udmsearch/Makefile @@ -25,7 +25,7 @@ OPTIONS_DEFAULT= MYSQL MYSQL_USE= MYSQL=YES MYSQL_CONFIGURE_ON+= --with-mysql=${LOCALBASE} -PGSQL_USE= PGSQL=YES +PGSQL_USES= pgsql PGSQL_CONFIGURE_ON+= --with-pgsql=${LOCALBASE}/pgsql PORTDOCS= * |