diff options
24 files changed, 60 insertions, 36 deletions
diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index d51a9ef4f0f7..e9fc85afe298 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -16,7 +16,7 @@ MAINTAINER= simuran@shaw.ca RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base BUILD_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base -LIB_DEPENDS= pq.2:${PORTSDIR}/${POSTGRESQL_PORT} +LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} POSTGRESQL_PORT?= databases/postgresql7 USE_GMAKE= yes diff --git a/databases/py-pyPgSQL/Makefile b/databases/py-pyPgSQL/Makefile index ad2d6e02ce28..f02d64dee52d 100644 --- a/databases/py-pyPgSQL/Makefile +++ b/databases/py-pyPgSQL/Makefile @@ -16,7 +16,9 @@ DISTNAME= pyPgSQL-${PORTVERSION} MAINTAINER= gerhard.haering@gmx.de RUN_DEPENDS= ${DATETIME_DEP}:${PORTSDIR}/lang/py-mx-base -LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7 +LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT} + +POSTGRESQL_PORT?= databases/postgresql7 WRKSRC= ${WRKDIR}/pypgsql USE_PYTHON= yes diff --git a/mail/courier/scripts/configure.courier b/mail/courier/scripts/configure.courier index 476526d0012e..03882cdf5de7 100644 --- a/mail/courier/scripts/configure.courier +++ b/mail/courier/scripts/configure.courier @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.3 2002-06-08 18:54:01 ijliao Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/courier/scripts/Attic/configure.courier,v 1.4 2003-01-04 16:17:26 seanc Exp $ [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ] && exit @@ -234,7 +234,8 @@ while [ "$1" ]; do fi ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" WITH_PGSQL="--with-authpgsql" WITH_PGSQL="${WITH_PGSQL} --with-pgsql-libs=${PGSQLBASE}/lib" WITH_PGSQL="${WITH_PGSQL} --with-pgsql-includes=${PGSQLINCLUDES}" diff --git a/mail/postfix-current/scripts/configure.postfix b/mail/postfix-current/scripts/configure.postfix index 1f20fbc84196..8df1cc3cc11a 100644 --- a/mail/postfix-current/scripts/configure.postfix +++ b/mail/postfix-current/scripts/configure.postfix @@ -130,7 +130,8 @@ while [ "$1" ]; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix/scripts/configure.postfix b/mail/postfix/scripts/configure.postfix index 9a5d3bc8c1a0..46981470b890 100644 --- a/mail/postfix/scripts/configure.postfix +++ b/mail/postfix/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix1/scripts/configure.postfix b/mail/postfix1/scripts/configure.postfix index c7d01cba9bea..2dfc25262944 100644 --- a/mail/postfix1/scripts/configure.postfix +++ b/mail/postfix1/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix1/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix20/scripts/configure.postfix b/mail/postfix20/scripts/configure.postfix index af7eb044326d..99a9a97232d8 100644 --- a/mail/postfix20/scripts/configure.postfix +++ b/mail/postfix20/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix20/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix21/scripts/configure.postfix b/mail/postfix21/scripts/configure.postfix index ab884c198dd8..79469aa9db60 100644 --- a/mail/postfix21/scripts/configure.postfix +++ b/mail/postfix21/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix21/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix22/scripts/configure.postfix b/mail/postfix22/scripts/configure.postfix index 95854f0e47fd..79715fb882bf 100644 --- a/mail/postfix22/scripts/configure.postfix +++ b/mail/postfix22/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix22/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix23/scripts/configure.postfix b/mail/postfix23/scripts/configure.postfix index 2a3729d2d765..2bf10a49bb3b 100644 --- a/mail/postfix23/scripts/configure.postfix +++ b/mail/postfix23/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix23/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix24/scripts/configure.postfix b/mail/postfix24/scripts/configure.postfix index c5b0d143b063..5743fffcac27 100644 --- a/mail/postfix24/scripts/configure.postfix +++ b/mail/postfix24/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix24/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix25/scripts/configure.postfix b/mail/postfix25/scripts/configure.postfix index 655b4bce7922..2d14da6221a3 100644 --- a/mail/postfix25/scripts/configure.postfix +++ b/mail/postfix25/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix25/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix26/scripts/configure.postfix b/mail/postfix26/scripts/configure.postfix index 6092c3d47cdf..3617f6a8b6a7 100644 --- a/mail/postfix26/scripts/configure.postfix +++ b/mail/postfix26/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix26/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix27/scripts/configure.postfix b/mail/postfix27/scripts/configure.postfix index 51193eba3c4f..99540543bfbb 100644 --- a/mail/postfix27/scripts/configure.postfix +++ b/mail/postfix27/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix27/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/mail/postfix28/scripts/configure.postfix b/mail/postfix28/scripts/configure.postfix index bce09e9962c4..3c8530d6a361 100644 --- a/mail/postfix28/scripts/configure.postfix +++ b/mail/postfix28/scripts/configure.postfix @@ -1,5 +1,5 @@ #!/bin/sh -# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.24 2002-08-26 21:33:57 dwcjr Exp $ +# $FreeBSD: /tmp/pcvs/ports/mail/postfix28/scripts/Attic/configure.postfix,v 1.25 2003-01-04 16:17:26 seanc Exp $ if [ -f ${WRKDIRPREFIX}${CURDIR}/Makefile.inc ]; then exit @@ -109,7 +109,8 @@ for i; do echo "MYSQL_SUFFIX= +mysql" ;; PgSQL) - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "POSTFIX_CCARGS+= -DHAS_PGSQL -I\${LOCALBASE}/include -I\${LOCALBASE}/pgsql/include" echo "POSTFIX_AUXLIBS+= -L\${LOCALBASE}/lib -L\${LOCALBASE}/pgsql/lib -lpq -lcrypt" echo "PGSQL_SUFFIX= +pgsql" diff --git a/net-mgmt/nagios-plugins/scripts/configure b/net-mgmt/nagios-plugins/scripts/configure index 171e89e58aa8..66a3aee9dca6 100644 --- a/net-mgmt/nagios-plugins/scripts/configure +++ b/net-mgmt/nagios-plugins/scripts/configure @@ -83,7 +83,8 @@ while [ "$1" ]; do SUB_MYSQL="" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "CONFIGURE_ARGS+= --with-pgsql=\${LOCALBASE}" SUB_PGSQL="" ;; diff --git a/net-mgmt/netsaint-plugins/scripts/configure b/net-mgmt/netsaint-plugins/scripts/configure index e466804b992a..cb5b819b257d 100644 --- a/net-mgmt/netsaint-plugins/scripts/configure +++ b/net-mgmt/netsaint-plugins/scripts/configure @@ -81,7 +81,8 @@ while [ "$1" ]; do SUB_MYSQL="" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "CONFIGURE_ARGS+= --with-pgsql=\${LOCALBASE}" SUB_PGSQL="" ;; diff --git a/net/gnu-radius/scripts/configure b/net/gnu-radius/scripts/configure index 78e961fee908..80526d02ebb5 100644 --- a/net/gnu-radius/scripts/configure +++ b/net/gnu-radius/scripts/configure @@ -58,7 +58,8 @@ while [ "$1" ]; do LIB_PATH="$LIB_PATH:${LOCALBASE}/lib/mysql/" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7:install" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/${POSTGRESQL_PORT}:install" echo "CONFIGURE_ARGS+= --with-postgres" INCLUDE_PATH="$INCLUDE_PATH:${LOCALBASE}/include/pgsql/" ;; diff --git a/net/nagios-plugins/scripts/configure b/net/nagios-plugins/scripts/configure index 171e89e58aa8..66a3aee9dca6 100644 --- a/net/nagios-plugins/scripts/configure +++ b/net/nagios-plugins/scripts/configure @@ -83,7 +83,8 @@ while [ "$1" ]; do SUB_MYSQL="" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "CONFIGURE_ARGS+= --with-pgsql=\${LOCALBASE}" SUB_PGSQL="" ;; diff --git a/net/netsaint-plugins/scripts/configure b/net/netsaint-plugins/scripts/configure index e466804b992a..cb5b819b257d 100644 --- a/net/netsaint-plugins/scripts/configure +++ b/net/netsaint-plugins/scripts/configure @@ -81,7 +81,8 @@ while [ "$1" ]; do SUB_MYSQL="" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "CONFIGURE_ARGS+= --with-pgsql=\${LOCALBASE}" SUB_PGSQL="" ;; diff --git a/www/mod_php3/scripts/configure.php b/www/mod_php3/scripts/configure.php index a974db6a1f86..f46e1ffa0547 100644 --- a/www/mod_php3/scripts/configure.php +++ b/www/mod_php3/scripts/configure.php @@ -94,7 +94,8 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+=--with-mysql=\${PREFIX}" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "CONFIGURE_ARGS+=--with-pgsql=\${PREFIX}" if /usr/bin/ldd ${PREFIX}/bin/postgres | /usr/bin/grep -q "libssl"; then LIBS="-lcrypto -lssl" diff --git a/www/mod_php4/scripts/configure.php b/www/mod_php4/scripts/configure.php index dd709527cacb..2230696ea58d 100644 --- a/www/mod_php4/scripts/configure.php +++ b/www/mod_php4/scripts/configure.php @@ -168,7 +168,8 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then PGPREFIX=${LOCALBASE}/pgsql else diff --git a/www/mod_php5/scripts/configure.php b/www/mod_php5/scripts/configure.php index dd709527cacb..2230696ea58d 100644 --- a/www/mod_php5/scripts/configure.php +++ b/www/mod_php5/scripts/configure.php @@ -168,7 +168,8 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+=--with-mysql=\${LOCALBASE}" ;; \"PostgreSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" if [ -x ${LOCALBASE}/pgsql/bin/postgres -a ! -x ${LOCALBASE}/bin/postgres ]; then PGPREFIX=${LOCALBASE}/pgsql else diff --git a/www/oops/scripts/configure.oops b/www/oops/scripts/configure.oops index 1aa2f69016f8..00d75a479bc6 100644 --- a/www/oops/scripts/configure.oops +++ b/www/oops/scripts/configure.oops @@ -58,7 +58,8 @@ while [ "$1" ]; do echo "CONFIGURE_ARGS+= --with-MYSQL=\${PREFIX}" ;; \"PgSQL\") - echo "LIB_DEPENDS+= pq.2:\${PORTSDIR}/databases/postgresql7" + echo "POSTGRESQL_PORT?= databases/postgresql7" + echo "LIB_DEPENDS+= pq.3:\${PORTSDIR}/\${POSTGRESQL_PORT}" echo "CONFIGURE_ARGS+= --with-PGSQL=\${PREFIX}/pgsql" ;; \"PCRE\") |