Date: Mon, 25 Aug 2014 17:53:27 +0000 (UTC) From: Chris Rees <crees@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r366114 - in head: Mk/Uses databases/postgresql-libpgeasy databases/postgresql-libpqxx databases/postgresql-libpqxx3 databases/postgresql-odbc databases/postgresql-pllua databases/postg... Message-ID: <201408251753.s7PHrRVw037983@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: crees Date: Mon Aug 25 17:53:26 2014 New Revision: 366114 URL: http://svnweb.freebsd.org/changeset/ports/366114 QAT: https://qat.redports.org/buildarchive/r366114/ Log: Convert pgsql ports to use USES+=pgsql Reviewed by: bapt Modified: head/Mk/Uses/pgsql.mk head/databases/postgresql-libpgeasy/Makefile head/databases/postgresql-libpqxx/Makefile head/databases/postgresql-libpqxx3/Makefile head/databases/postgresql-odbc/Makefile head/databases/postgresql-pllua/Makefile head/databases/postgresql-plproxy/Makefile head/databases/postgresql-plruby/Makefile head/databases/postgresql-relay/Makefile head/databases/postgresql-repmgr/Makefile head/databases/postgresql84-client/Makefile head/databases/postgresql84-contrib/Makefile head/databases/postgresql84-docs/Makefile head/databases/postgresql84-plperl/Makefile head/databases/postgresql84-plpython/Makefile head/databases/postgresql84-pltcl/Makefile head/databases/postgresql84-server/Makefile head/databases/postgresql90-client/Makefile head/databases/postgresql90-contrib/Makefile head/databases/postgresql90-docs/Makefile head/databases/postgresql90-plperl/Makefile head/databases/postgresql90-plpython/Makefile head/databases/postgresql90-pltcl/Makefile head/databases/postgresql91-client/Makefile head/databases/postgresql91-contrib/Makefile head/databases/postgresql91-docs/Makefile head/databases/postgresql91-plperl/Makefile head/databases/postgresql91-plpython/Makefile head/databases/postgresql91-pltcl/Makefile head/databases/postgresql91-server/Makefile head/databases/postgresql92-client/Makefile head/databases/postgresql92-contrib/Makefile head/databases/postgresql92-docs/Makefile head/databases/postgresql92-plperl/Makefile head/databases/postgresql92-plpython/Makefile head/databases/postgresql92-pltcl/Makefile head/databases/postgresql92-server/Makefile head/databases/postgresql93-client/Makefile head/databases/postgresql_autodoc/Makefile Modified: head/Mk/Uses/pgsql.mk ============================================================================== --- head/Mk/Uses/pgsql.mk Mon Aug 25 17:49:03 2014 (r366113) +++ head/Mk/Uses/pgsql.mk Mon Aug 25 17:53:26 2014 (r366114) @@ -64,13 +64,13 @@ _PGSQL_VER!= ${PG_CONFIG} --version | ${ . if defined(pgsql_ARGS) . if ${pgsql_ARGS:M*+} . for version in ${VALID_PGSQL_VER} -. if ${pgsql_ARGS:S/+//} <= ${version:S/.//} +. if ${pgsql_ARGS:S/+//} <= ${version} _WANT_PGSQL_VER+=${version} . endif . endfor . elif ${pgsql_ARGS:M*-} . for version in ${VALID_PGSQL_VER} -. if ${pgsql_ARGS:S/-//} >= ${version:S/.//} +. if ${pgsql_ARGS:S/-//} >= ${version} _WANT_PGSQL_VER+=${version} . endif . endfor Modified: head/databases/postgresql-libpgeasy/Makefile ============================================================================== --- head/databases/postgresql-libpgeasy/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-libpgeasy/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -15,7 +15,7 @@ COMMENT= Easy-to-use C interface to Post OPTIONS_DEFINE= DOCS EXAMPLES -USES= gmake libtool pgsql +USES+= gmake libtool pgsql USE_LDCONFIG= YES GNU_CONFIGURE= YES DOCSDIR= ${PREFIX}/share/doc/postgresql/${PORTNAME} Modified: head/databases/postgresql-libpqxx/Makefile ============================================================================== --- head/databases/postgresql-libpqxx/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-libpqxx/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -18,7 +18,7 @@ CONFLICTS= postgresql-libpqxx-3.* postgr PORTSCOUT= limit:^2\. USE_PYTHON_BUILD= yes -USES= gmake libtool pgsql shebangfix +USES+= gmake libtool pgsql shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION:R} Modified: head/databases/postgresql-libpqxx3/Makefile ============================================================================== --- head/databases/postgresql-libpqxx3/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-libpqxx3/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -16,7 +16,7 @@ COMMENT= New C++ interface for PostgreSQ CONFLICTS= postgresql-libpqxx-[2-4].* PORTSCOUT= limit:^2\. -USES= gmake libtool pgsql pkgconfig shebangfix +USES+= gmake libtool pgsql pkgconfig shebangfix GNU_CONFIGURE= yes USE_LDCONFIG= yes PLIST_SUB= PORTVERSION=${PORTVERSION} Modified: head/databases/postgresql-odbc/Makefile ============================================================================== --- head/databases/postgresql-odbc/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-odbc/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -15,7 +15,7 @@ COMMENT= PostgreSQL ODBC driver LICENSE= LGPL20 -USES= libtool pgsql +USES+= libtool pgsql USE_OPENSSL= yes USE_LDCONFIG= yes Modified: head/databases/postgresql-pllua/Makefile ============================================================================== --- head/databases/postgresql-pllua/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-pllua/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -10,7 +10,7 @@ PKGNAMEPREFIX= postgresql- MAINTAINER= sunghyuk@gmail.com COMMENT= PL/Lua procedural language for PostgreSQL database -USES= gmake lua pgsql:91- +USES+= gmake lua pgsql:9.1- INSTALL_TARGET= install-strip SUB_FILES= pkg-message Modified: head/databases/postgresql-plproxy/Makefile ============================================================================== --- head/databases/postgresql-plproxy/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-plproxy/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -12,24 +12,13 @@ COMMENT= PL/Proxy - database partitionin LICENSE= BSD -USES= bison gmake -USE_PGSQL= yes +USES+= bison gmake pgsql PORTSCOUT= site:http://pgfoundry.org/frs/?group_id=1000207 .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/bin/postmaster) -PGSQL_VER!= ${LOCALBASE}/bin/postmaster -V | \ - ${SED} -En 's/.*PostgreSQL[^0-9]*([0-9]+)\.([0-9]+)\..*/\1\2/p' -.elif 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' -.else -PGSQL_VER= ${DEFAULT_PGSQL_VER} -.endif - -.if ${PGSQL_VER} > 91 +.if ${PGSQL_VER} > 9.1 PLIST_SUB+= NEW_CONTRIB_DIR="" OLD_CONTRIB_DIR="@comment " .else PLIST_SUB+= NEW_CONTRIB_DIR="@comment " OLD_CONTRIB_DIR="" Modified: head/databases/postgresql-plruby/Makefile ============================================================================== --- head/databases/postgresql-plruby/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-plruby/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -15,8 +15,8 @@ GH_ACCOUNT= CraigCottingham GH_TAGNAME= ${GH_COMMIT} GH_COMMIT= f8d9ced -USES= uidfix tar:bzip2 -USE_PGSQL= server +USES+= uidfix tar:bzip2 pgsql +WANT_PGSQL= server USE_RUBY= yes USE_RUBY_EXTCONF= yes USE_RUBY_RDOC= yes @@ -51,8 +51,6 @@ post-build: cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} rdoc .endif -.include <bsd.port.pre.mk> - post-install: @${MKDIR} ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ ${INSTALL_DATA} ${WRKDIR}/createlang.sql ${STAGEDIR}${RUBY_MODEXAMPLESDIR}/ @@ -67,4 +65,4 @@ post-install: >> ${TMPPLIST} .endif -.include <bsd.port.post.mk> +.include <bsd.port.mk> Modified: head/databases/postgresql-relay/Makefile ============================================================================== --- head/databases/postgresql-relay/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-relay/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -14,7 +14,7 @@ PLIST_FILES= bin/postgresql-relay etc/po man/man8/postgresql-relay.8.gz USE_RC_SUBR= postgresql-relay -USES= perl5 +USES+= perl5 USE_PERL5= build do-install: Modified: head/databases/postgresql-repmgr/Makefile ============================================================================== --- head/databases/postgresql-repmgr/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql-repmgr/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -15,9 +15,8 @@ LICENSE= GPLv3 RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync -USES= gmake -USE_PGSQL= server -WANT_PGSQL_VER= 90+ +USES+= gmake pgsql:9.0+ +WANT_PGSQL= server MAKE_ENV= USE_PGXS=1 OPTIONS_DEFINE= DOCS Modified: head/databases/postgresql84-client/Makefile ============================================================================== --- head/databases/postgresql84-client/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-client/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -15,6 +15,6 @@ BUILD_DIRS= config src/include src/inter CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -USES= readline +USES+= readline .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql84-contrib/Makefile ============================================================================== --- head/databases/postgresql84-contrib/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-contrib/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -12,11 +12,10 @@ COMMENT= The contrib utilities from the LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \ libxml2.so:${PORTSDIR}/textproc/libxml2 -USE_PGSQL= yes -DEFAULT_PGSQL_VER=84 -MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server +USES+= pgsql:8.4 +MASTERDIR= ${.CURDIR}/../postgresql84-server -USES= bison +USES+= bison BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib Modified: head/databases/postgresql84-docs/Makefile ============================================================================== --- head/databases/postgresql84-docs/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-docs/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -9,10 +9,9 @@ DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql84-server -USE_PGSQL= yes -WANT_PGSQL_VER?=84 +USES+= pgsql:8.4 NO_BUILD= YES SLAVE_ONLY= YES Modified: head/databases/postgresql84-plperl/Makefile ============================================================================== --- head/databases/postgresql84-plperl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-plperl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,6 +1,6 @@ # Created by: Palle Girgensohn <girgen@partitur.se> # $FreeBSD$ -WANT_PGSQL_VER= 84 +WANT_PGSQL_VER= 8.4 .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql84-plpython/Makefile ============================================================================== --- head/databases/postgresql84-plpython/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-plpython/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,6 +1,6 @@ # $FreeBSD$ USE_PYTHON= 2 -WANT_PGSQL_VER= 84 +WANT_PGSQL_VER= 8.4 .include "${.CURDIR}/../postgresql90-plpython/Makefile" Modified: head/databases/postgresql84-pltcl/Makefile ============================================================================== --- head/databases/postgresql84-pltcl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-pltcl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,6 +1,6 @@ # Created by: Palle Girgensohn <girgen@partitur.se> # $FreeBSD$ -WANT_PGSQL_VER?=84 +WANT_PGSQL_VER?=8.4 .include "${.CURDIR}/../postgresql91-pltcl/Makefile" Modified: head/databases/postgresql84-server/Makefile ============================================================================== --- head/databases/postgresql84-server/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql84-server/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -57,8 +57,7 @@ INSTALL_DIRS?= ${BUILD_DIRS} SERVER_ONLY= yes COMPONENT= -server USE_RC_SUBR= postgresql -USE_PGSQL= yes -WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql Modified: head/databases/postgresql90-client/Makefile ============================================================================== --- head/databases/postgresql90-client/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql90-client/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -16,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -USES= readline +USES+= readline .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql90-contrib/Makefile ============================================================================== --- head/databases/postgresql90-contrib/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql90-contrib/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -12,11 +12,9 @@ COMMENT= The contrib utilities from the LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \ libxml2.so:${PORTSDIR}/textproc/libxml2 -USE_PGSQL= yes -DEFAULT_PGSQL_VER=90 -MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../postgresql90-server -USES= bison +USES+= bison pgsql:9.0 BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib Modified: head/databases/postgresql90-docs/Makefile ============================================================================== --- head/databases/postgresql90-docs/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql90-docs/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,7 +1,7 @@ # Created by: Palle Girgensohn <girgen@pingpong.net> # $FreeBSD$ -WANT_PGSQL_VER=90 +WANT_PGSQL_VER= 9.0 COMPONENT= -docs .include "${.CURDIR}/../postgresql91-docs/Makefile" Modified: head/databases/postgresql90-plperl/Makefile ============================================================================== --- head/databases/postgresql90-plperl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql90-plperl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -8,13 +8,13 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${ MAINTAINER= pgsql@FreeBSD.org COMMENT= Write SQL functions for PostgreSQL using Perl5 -RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER}-server +RUN_DEPENDS= postgres:${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER:S/.//}-server -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server -WANT_PGSQL_VER?=90 +WANT_PGSQL_VER?=9.0 -USES= perl5 readline +USES+= perl5 readline CONFIGURE_ARGS= --with-perl BUILD_DIRS= src/backend src/pl/plperl Modified: head/databases/postgresql90-plpython/Makefile ============================================================================== --- head/databases/postgresql90-plpython/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql90-plpython/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -7,11 +7,12 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${ MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Python to write SQL functions -USE_PGSQL= server +USES+= pgsql:${WANT_PGSQL_VER} +WANT_PGSQL= server -MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../postgresql${WANT_PGSQL_VER:S/.//}-server -WANT_PGSQL_VER?= 90 +WANT_PGSQL_VER?= 9.0 USE_PYTHON?= yes CONFIGURE_ARGS= --with-python Modified: head/databases/postgresql90-pltcl/Makefile ============================================================================== --- head/databases/postgresql90-pltcl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql90-pltcl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,6 +1,6 @@ # Created by: Palle Girgensohn <girgen@partitur.se> # $FreeBSD$ -WANT_PGSQL_VER?=90 +WANT_PGSQL_VER?=9.0 .include "${.CURDIR}/../postgresql91-pltcl/Makefile" Modified: head/databases/postgresql91-client/Makefile ============================================================================== --- head/databases/postgresql91-client/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-client/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -16,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -USES= readline +USES+= readline .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql91-contrib/Makefile ============================================================================== --- head/databases/postgresql91-contrib/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-contrib/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -12,11 +12,9 @@ COMMENT= The contrib utilities from the LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \ libxml2.so:${PORTSDIR}/textproc/libxml2 -USE_PGSQL= yes -DEFAULT_PGSQL_VER=91 -MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../postgresql91-server -USES= bison +USES+= bison pgsql:9.1 BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib Modified: head/databases/postgresql91-docs/Makefile ============================================================================== --- head/databases/postgresql91-docs/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-docs/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -9,10 +9,10 @@ DISTV= ${DISTVERSION:R} MAINTAINER= pgsql@FreeBSD.org COMMENT= The PostgreSQL documentation set -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server -USE_PGSQL= YES -WANT_PGSQL_VER?=91 +USES+= pgsql:${WANT_PGSQL_VER} +WANT_PGSQL_VER?=9.1 SLAVE_ONLY= YES COMPONENT= -docs Modified: head/databases/postgresql91-plperl/Makefile ============================================================================== --- head/databases/postgresql91-plperl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-plperl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,7 +1,7 @@ # Created by: Palle Girgensohn <girgen@partitur.se> # $FreeBSD$ -WANT_PGSQL_VER= 91 +WANT_PGSQL_VER= 9.1 COMPONENT= -plperl .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql91-plpython/Makefile ============================================================================== --- head/databases/postgresql91-plpython/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-plpython/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,5 +1,5 @@ # $FreeBSD$ -WANT_PGSQL_VER= 91 +WANT_PGSQL_VER= 9.1 .include "${.CURDIR}/../postgresql90-plpython/Makefile" Modified: head/databases/postgresql91-pltcl/Makefile ============================================================================== --- head/databases/postgresql91-pltcl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-pltcl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -9,15 +9,13 @@ PKGNAMESUFFIX?= ${DISTVERSION:R:S/.//}${ MAINTAINER= pgsql@FreeBSD.org COMMENT= Module for using Tcl to write SQL functions -MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../../databases/postgresql${WANT_PGSQL_VER:S/.//}-server -BUILD_DEPENDS= postgres:${POSTGRESQL_PORT} -RUN_DEPENDS= postgres:${POSTGRESQL_PORT} -POSTGRESQL_PORT?=${PORTSDIR}/databases/postgresql${WANT_PGSQL_VER}-server +WANT_PGSQL_VER?=9.1 -WANT_PGSQL_VER?=91 +USES+= tcl pgsql:${WANT_PGSQL_VER} +WANT_PGSQL= server -USES= tcl CONFIGURE_ARGS= --with-tcl --without-tk \ --with-tclconfig="${TCL_LIBDIR}" \ --with-includes="${TCL_INCLUDEDIR}" Modified: head/databases/postgresql91-server/Makefile ============================================================================== --- head/databases/postgresql91-server/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql91-server/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -63,8 +63,7 @@ BUILD_DIRS?= src/port ${INSTALL_DIRS} COMPONENT= -server SERVER_ONLY= yes USE_RC_SUBR= postgresql -USE_PGSQL= yes -WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql Modified: head/databases/postgresql92-client/Makefile ============================================================================== --- head/databases/postgresql92-client/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-client/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -16,6 +16,6 @@ INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -USES= readline +USES+= readline .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql92-contrib/Makefile ============================================================================== --- head/databases/postgresql92-contrib/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-contrib/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -12,11 +12,9 @@ COMMENT= The contrib utilities from the LIB_DEPENDS= libxslt.so:${PORTSDIR}/textproc/libxslt \ libxml2.so:${PORTSDIR}/textproc/libxml2 -USE_PGSQL= yes -DEFAULT_PGSQL_VER=92 -MASTERDIR= ${.CURDIR}/../postgresql${DEFAULT_PGSQL_VER}-server +MASTERDIR= ${.CURDIR}/../postgresql92-server -USES= bison +USES+= bison pgsql:9.2 BUILD_DIRS= src/port contrib INSTALL_DIRS= contrib Modified: head/databases/postgresql92-docs/Makefile ============================================================================== --- head/databases/postgresql92-docs/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-docs/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,7 +1,7 @@ # Created by: Palle Girgensohn <girgen@pingpong.net> # $FreeBSD$ -WANT_PGSQL_VER=92 +WANT_PGSQL_VER=9.2 COMPONENT= -docs .include "${.CURDIR}/../postgresql91-docs/Makefile" Modified: head/databases/postgresql92-plperl/Makefile ============================================================================== --- head/databases/postgresql92-plperl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-plperl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,6 +1,6 @@ # Created by: Palle Girgensohn <girgen@partitur.se> # $FreeBSD$ -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 9.2 .include "${.CURDIR}/../postgresql90-plperl/Makefile" Modified: head/databases/postgresql92-plpython/Makefile ============================================================================== --- head/databases/postgresql92-plpython/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-plpython/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,5 +1,5 @@ # $FreeBSD$ -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 9.2 .include "${.CURDIR}/../postgresql90-plpython/Makefile" Modified: head/databases/postgresql92-pltcl/Makefile ============================================================================== --- head/databases/postgresql92-pltcl/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-pltcl/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -1,6 +1,6 @@ # Created by: Palle Girgensohn <girgen@partitur.se> # $FreeBSD$ -WANT_PGSQL_VER= 92 +WANT_PGSQL_VER= 9.2 .include "${.CURDIR}/../postgresql91-pltcl/Makefile" Modified: head/databases/postgresql92-server/Makefile ============================================================================== --- head/databases/postgresql92-server/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql92-server/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -63,8 +63,7 @@ BUILD_DIRS?= src/port ${INSTALL_DIRS} SERVER_ONLY= yes COMPONENT= -server USE_RC_SUBR= postgresql -USE_PGSQL= yes -WANT_PGSQL_VER= ${DISTVERSION:C/([0-9][0-9]*)\.([0-9][0-9]*).*/\1\2/g} +USES+= pgsql:${DISTVERSION:C/([0-9][0-9]*\.[0-9][0-9]*).*/\1/g} USERS= ${PG_USER} GROUPS= ${PG_GROUP} SUB_FILES+= 502.pgsql Modified: head/databases/postgresql93-client/Makefile ============================================================================== --- head/databases/postgresql93-client/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql93-client/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -17,6 +17,6 @@ INSTALL_DIRS= ${BUILD_DIRS} CLIENT_ONLY= yes COMPONENT= -client USE_LDCONFIG= yes -USES= pkgconfig readline +USES+= pkgconfig readline .include "${MASTERDIR}/Makefile" Modified: head/databases/postgresql_autodoc/Makefile ============================================================================== --- head/databases/postgresql_autodoc/Makefile Mon Aug 25 17:49:03 2014 (r366113) +++ head/databases/postgresql_autodoc/Makefile Mon Aug 25 17:53:26 2014 (r366114) @@ -13,7 +13,7 @@ BUILD_DEPENDS= p5-HTML-Template>=0:${POR p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey \ p5-DBD-Pg>=0:${PORTSDIR}/databases/p5-DBD-Pg -USES= gmake perl5 +USES+= gmake perl5 CONFIGURE_ARGS+=--datadir=${DATADIR} WRKSRC= ${WRKDIR}/postgresql_autodoc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201408251753.s7PHrRVw037983>