diff options
author | rillig <rillig@pkgsrc.org> | 2005-12-05 23:55:01 +0000 |
---|---|---|
committer | rillig <rillig@pkgsrc.org> | 2005-12-05 23:55:01 +0000 |
commit | 579e97796954edc2469fac176e855589e1dc2997 (patch) | |
tree | 1390f4897127f87b9dc78eb04234494436dbf1a4 /databases | |
parent | a86447cb0763e94327a0380243bb3a2cc0ecbb68 (diff) | |
download | pkgsrc-579e97796954edc2469fac176e855589e1dc2997.tar.gz |
Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
Diffstat (limited to 'databases')
38 files changed, 92 insertions, 92 deletions
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile index c99ed08e7ae..10e40e994b8 100644 --- a/databases/freetds/Makefile +++ b/databases/freetds/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/10/31 09:55:28 rillig Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 23:55:04 rillig Exp $ DISTNAME= freetds-0.63 PKGREVISION= 1 @@ -16,7 +16,7 @@ USE_TOOLS+= gmake GNU_CONFIGURE= yes GNU_CONFIGURE_PREFIX= ${PREFIX}/freetds GNU_CONFIGURE_MANDIR= ${GNU_CONFIGURE_PREFIX}/${PKGMANDIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/share CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} CONFIGURE_ARGS+= --with-tdsver=7.0 diff --git a/databases/gnats/Makefile b/databases/gnats/Makefile index 78b37788b3e..1047e432bed 100644 --- a/databases/gnats/Makefile +++ b/databases/gnats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/08/28 12:36:42 recht Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:04 rillig Exp $ DISTNAME= gnats-4.1.0 PKGREVISION= 1 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-gnats-service=service-name=${GNATS_SERVICE} -CONFIGURE_ARGS+= --with-gnats-user=${GNATS_USER} +CONFIGURE_ARGS+= --with-gnats-user=${GNATS_USER:Q} CONFIGURE_ARGS+= --with-gnatsd-user-access-file=${GNATS_USER_FILE:Q} CONFIGURE_ARGS+= --with-gnatsd-host-access-file=${GNATS_HOST_FILE:Q} CONFIGURE_ARGS+= --with-gnats-dblist-file=${GNATS_DB_FILE:Q} diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index 4e83bb63bad..bc09d80eced 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:57 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:04 rillig Exp $ DISTNAME= lbdb_0.31 PKGNAME= ${DISTNAME:S/_/-/} @@ -16,7 +16,7 @@ USE_TOOLS+= gmake perl:run USE_PKGINSTALL= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/lbdb/ -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-lbdb_dotlock CONFIGURE_ARGS+= --without-getent CONFIGURE_ARGS+= --without-evolution-addressbook-export diff --git a/databases/libgda-postgres/Makefile b/databases/libgda-postgres/Makefile index aa085e4d9bc..5a980c03b16 100644 --- a/databases/libgda-postgres/Makefile +++ b/databases/libgda-postgres/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.4 2005/02/25 17:22:43 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:04 rillig Exp $ # LIBGDA_PROVIDER= postgres .include "../../databases/libgda/Makefile.common" -CONFIGURE_ARGS+= --with-postgres=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --with-postgres=${PGSQL_PREFIX:Q} .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common index e6cedccfeaf..16f680d424f 100644 --- a/databases/libgda/Makefile.common +++ b/databases/libgda/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2005/09/23 20:08:05 wiz Exp $ +# $NetBSD: Makefile.common,v 1.35 2005/12/05 23:55:04 rillig Exp $ # DISTNAME= libgda-1.2.2 @@ -19,7 +19,7 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir="${PREFIX}/share/doc" CONFIGURE_ARGS+= --without-ldap diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 740c3f85a05..da2c2c13f05 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.51 2005/12/05 20:49:57 rillig Exp $ +# $NetBSD: Makefile.common,v 1.52 2005/12/05 23:55:04 rillig Exp $ DISTNAME= mysql-4.0.26 CATEGORIES= databases @@ -30,7 +30,7 @@ MYSQL_DATADIR?= ${VARBASE}/mysql MYSQL_CHARSET?= latin1 MYSQL_EXTRA_CHARSET?= all -CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} +CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} CONFIGURE_ARGS+= --with-named-z-libs=z CONFIGURE_ARGS+= --without-libwrap CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap" @@ -51,8 +51,8 @@ CONFIGURE_ARGS+= --with-low-memory CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-vio -CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET} -CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET} +CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} +CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} .if !empty(MACHINE_ARCH:Mi386) CONFIGURE_ARGS+= --enable-assembler diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index cba393d7a9d..9877968e99d 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.67 2005/12/05 20:49:57 rillig Exp $ +# $NetBSD: Makefile,v 1.68 2005/12/05 23:55:04 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -14,7 +14,7 @@ CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --with-raid CONFIGURE_ARGS+= --without-berkeley-db CONFIGURE_ARGS+= --without-mysqlfs -CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} +CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 3d5450b91dd..73484319c9f 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.47 2005/12/05 20:49:57 rillig Exp $ +# $NetBSD: Makefile.common,v 1.48 2005/12/05 23:55:04 rillig Exp $ DISTNAME= mysql-4.1.15 CATEGORIES= databases @@ -30,7 +30,7 @@ MYSQL_DATADIR?= ${VARBASE}/mysql MYSQL_CHARSET?= latin1 MYSQL_EXTRA_CHARSET?= all -CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} +CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} CONFIGURE_ARGS+= --with-named-z-libs=z CONFIGURE_ARGS+= --without-libwrap CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap" @@ -64,8 +64,8 @@ CONFIGURE_ARGS+= --with-low-memory CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-vio -CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET} -CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET} +CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} +CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} .if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" CONFIGURE_ARGS+= --enable-assembler diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index f182f28b591..a75c1bd821f 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:57 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:04 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} #PKGREVISION= 1 @@ -14,7 +14,7 @@ CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --with-raid CONFIGURE_ARGS+= --without-berkeley-db CONFIGURE_ARGS+= --without-mysqlfs -CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} +CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads diff --git a/databases/mysql5-client/Makefile.common b/databases/mysql5-client/Makefile.common index b58bab0e436..9c949720a9d 100644 --- a/databases/mysql5-client/Makefile.common +++ b/databases/mysql5-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/12/02 08:13:26 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/12/05 23:55:04 rillig Exp $ DISTNAME= mysql-5.0.16 CATEGORIES= databases @@ -30,7 +30,7 @@ MYSQL_DATADIR?= ${VARBASE}/mysql MYSQL_CHARSET?= latin1 MYSQL_EXTRA_CHARSET?= all -CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR} +CONFIGURE_ARGS+= --localstatedir=${MYSQL_DATADIR:Q} CONFIGURE_ARGS+= --with-named-z-libs=z CONFIGURE_ARGS+= --without-libwrap CONFIGURE_ARGS+= --with-named-curses-libs="-lcurses -ltermcap" @@ -64,8 +64,8 @@ CONFIGURE_ARGS+= --with-low-memory CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-vio -CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET} -CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET} +CONFIGURE_ARGS+= --with-charset=${MYSQL_CHARSET:Q} +CONFIGURE_ARGS+= --with-extra-charsets=${MYSQL_EXTRA_CHARSET:Q} .if !empty(MACHINE_ARCH:Mi386) && ${OPSYS} != "Interix" CONFIGURE_ARGS+= --enable-assembler diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index df9eb361121..9995a36fcec 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:58 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:04 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} #PKGREVISION= 1 @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --with-raid CONFIGURE_ARGS+= --without-berkeley-db CONFIGURE_ARGS+= --without-mysqlfs -CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER} +CONFIGURE_ARGS+= --with-mysqld-user=${MYSQL_USER:Q} PTHREAD_OPTS+= require CONFIGURE_ARGS+= --with-pthreads diff --git a/databases/nss_ldap/Makefile b/databases/nss_ldap/Makefile index d41f11edd3e..7c960b47603 100644 --- a/databases/nss_ldap/Makefile +++ b/databases/nss_ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/09/19 16:13:26 drochner Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:04 rillig Exp $ # DISTNAME= nss_ldap-240 @@ -17,7 +17,7 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/nss_ldap.conf CONFIGURE_ARGS+= --with-ldap-secret-file=${PKG_SYSCONFDIR}/nss_ldap.secret -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/${PKGBASE} INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} diff --git a/databases/odbc-postgresql/Makefile b/databases/odbc-postgresql/Makefile index 4e35960dc4f..cd65ee00c00 100644 --- a/databases/odbc-postgresql/Makefile +++ b/databases/odbc-postgresql/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.8 2002/10/19 03:51:00 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:04 rillig Exp $ .include "Makefile.common" PKGNAME= odbc-postgresql-${BASE_VERS} COMMENT= ODBC interface to PostgreSQL -CONFIGURE_ARGS+= --with-odbcinst=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-odbcinst=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/databases/odbc-postgresql/Makefile.common b/databases/odbc-postgresql/Makefile.common index f58668a3f70..e94a977ecf5 100644 --- a/databases/odbc-postgresql/Makefile.common +++ b/databases/odbc-postgresql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/05/22 20:07:46 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/12/05 23:55:04 rillig Exp $ DISTNAME= postgresql-${DIST_VERS} CATEGORIES= databases @@ -43,7 +43,7 @@ GNU_CONFIGURE= YES # This variable controls the language encoding on the backend process. .if defined(PG_MB_ENCODING) -CONFIGURE_ARGS+= --enable-multibyte=${PG_MB_ENCODING} +CONFIGURE_ARGS+= --enable-multibyte=${PG_MB_ENCODING:Q} .else CONFIGURE_ARGS+= --enable-multibyte # accept default .endif @@ -60,13 +60,13 @@ CONFIGURE_ARGS+= --without-tk CONFIGURE_ARGS+= --includedir=${PREFIX}/include/pgsql CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/postgresql -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --disable-readline CONFIGURE_ARGS+= --enable-locale CONFIGURE_ARGS+= --enable-syslog CONFIGURE_ARGS+= --with-CXX -CONFIGURE_ARGS+= --with-template="${LOWER_OPSYS}" +CONFIGURE_ARGS+= --with-template=${LOWER_OPSYS:Q} BUILD_DIRS= ${WRKSRC}/src/interfaces/odbc diff --git a/databases/pgpool/Makefile b/databases/pgpool/Makefile index 71af2e5c1c3..0b057e93f2a 100644 --- a/databases/pgpool/Makefile +++ b/databases/pgpool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/07/11 14:23:48 minskim Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:04 rillig Exp $ DISTNAME= pgpool-2.5.1 CATEGORIES= databases @@ -11,7 +11,7 @@ COMMENT= Connection pooling/replication server for PostgreSQL GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES= ${PREFIX}/share/examples/pgpool.conf.sample \ ${PKG_SYSCONFDIR}/pgpool.conf diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile index a127b177f79..113eabbab32 100644 --- a/databases/postgresql73-client/Makefile +++ b/databases/postgresql73-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:58 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:04 rillig Exp $ PKGNAME= postgresql73-client-${BASE_VERS} SVR4_PKGNAME= pstgc @@ -7,7 +7,7 @@ COMMENT= PostgreSQL database client programs .include "../../databases/postgresql73/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --with-readline MAKE_ENV+= INSTALLED_LIBPQ=1 diff --git a/databases/postgresql73-lib/Makefile b/databases/postgresql73-lib/Makefile index 0b3eb05954e..15350f52543 100644 --- a/databases/postgresql73-lib/Makefile +++ b/databases/postgresql73-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/02 19:46:40 joerg Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:04 rillig Exp $ PKGNAME= postgresql73-lib-${BASE_VERS} PKGREVISION= 1 @@ -9,7 +9,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../databases/postgresql73/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/src/include BUILD_DIRS+= ${WRKSRC}/src/interfaces BUILD_DIRS+= ${WRKSRC}/src/pl diff --git a/databases/postgresql73-plperl/Makefile b/databases/postgresql73-plperl/Makefile index 11950ac70ce..eb48e444e08 100644 --- a/databases/postgresql73-plperl/Makefile +++ b/databases/postgresql73-plperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:58 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:04 rillig Exp $ PKGNAME= postgresql73-plperl-${BASE_VERS} COMMENT= PL/Perl procedural language for the PostgreSQL backend @@ -8,7 +8,7 @@ DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server .include "../../databases/postgresql73/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-perl BUILD_DIRS= ${WRKSRC}/src/pl/plperl diff --git a/databases/postgresql73-pltcl/Makefile b/databases/postgresql73-pltcl/Makefile index 6423c668d53..6cc3da137dc 100644 --- a/databases/postgresql73-pltcl/Makefile +++ b/databases/postgresql73-pltcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:59 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:04 rillig Exp $ PKGNAME= postgresql73-pltcl-${BASE_VERS} COMMENT= PL/Tcl procedural language for the PostgreSQL backend @@ -8,7 +8,7 @@ DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server .include "../../databases/postgresql73/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ENV+= TCLSH=${TCLSH:Q} diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index c736fa80da5..d3c9bf252f5 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:59 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:04 rillig Exp $ PKGNAME= postgresql73-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -16,7 +16,7 @@ USE_PKGINSTALL= yes DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL USE_TOOLS+= gtar -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/src/backend BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs diff --git a/databases/postgresql73/Makefile.common b/databases/postgresql73/Makefile.common index 574c279ab5f..5a1e811d2b7 100644 --- a/databases/postgresql73/Makefile.common +++ b/databases/postgresql73/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/12/02 19:41:18 joerg Exp $ +# $NetBSD: Makefile.common,v 1.13 2005/12/05 23:55:04 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -56,7 +56,7 @@ CONFIGURE_ARGS+= --without-readline CONFIGURE_ARGS+= --without-zlib CONFIGURE_ARGS+= --includedir=${PREFIX}/include/postgresql -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/share/doc/html/postgresql CONFIGURE_ARGS+= --without-java diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index df3644f1566..53763fce885 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:59 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:05 rillig Exp $ PKGNAME= postgresql74-client-${BASE_VERS} SVR4_PKGNAME= pstgc @@ -10,7 +10,7 @@ COMMENT= PostgreSQL database client programs USE_GNU_READLINE= yes USE_TOOLS+= tar -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --with-readline MAKE_ENV+= INSTALLED_LIBPQ=1 diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile index a0ae8ce3719..f6c03acff06 100644 --- a/databases/postgresql74-contrib/Makefile +++ b/databases/postgresql74-contrib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:59 rillig Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:05 rillig Exp $ PKGNAME= postgresql74-contrib-${BASE_VERS} SVR4_PKGNAME= pstgc @@ -6,7 +6,7 @@ COMMENT= PostgreSQL database contrib programs .include "../../databases/postgresql74/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --with-readline MAKE_ENV+= INSTALLED_LIBPQ=1 diff --git a/databases/postgresql74-lib/Makefile b/databases/postgresql74-lib/Makefile index 47f9f1bce7c..36c2d252b45 100644 --- a/databases/postgresql74-lib/Makefile +++ b/databases/postgresql74-lib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/12/02 21:01:34 joerg Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:05 rillig Exp $ PKGNAME= postgresql74-lib-${BASE_VERS} PKGREVISION= 2 @@ -8,7 +8,7 @@ COMMENT= PostgreSQL database headers and libraries .include "../../databases/postgresql74/Makefile.common" USE_TOOLS+= tar -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .include "../../mk/bsd.prefs.mk" diff --git a/databases/postgresql74-plperl/Makefile b/databases/postgresql74-plperl/Makefile index a016210931e..01de59b88ec 100644 --- a/databases/postgresql74-plperl/Makefile +++ b/databases/postgresql74-plperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:00 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:05 rillig Exp $ PKGNAME= postgresql74-plperl-${BASE_VERS} PKGREVISION= 2 @@ -10,7 +10,7 @@ DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server .include "../../databases/postgresql74/Makefile.common" PERL5_CONFIGURE= NO -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-perl BUILD_DIRS= ${WRKSRC}/src/pl/plperl diff --git a/databases/postgresql74-plpython/Makefile b/databases/postgresql74-plpython/Makefile index b7893abd648..32b571e7ce7 100644 --- a/databases/postgresql74-plpython/Makefile +++ b/databases/postgresql74-plpython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:00 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:05 rillig Exp $ PKGNAME= postgresql74-plpython-${BASE_VERS} @@ -9,7 +9,7 @@ DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server .include "../../databases/postgresql74/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-python CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index e779dfbfd1d..a694dec1b21 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:00 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:05 rillig Exp $ PKGNAME= postgresql74-server-${BASE_VERS} SVR4_PKGNAME= pstgs @@ -16,7 +16,7 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL MESSAGE_SRC= ${.CURDIR}/MESSAGE USE_TOOLS+= tar -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/src/backend BUILD_DIRS+= ${WRKSRC}/src/backend/utils/mb/conversion_procs diff --git a/databases/postgresql74/Makefile.common b/databases/postgresql74/Makefile.common index 5203d7e7bb3..1726370a476 100644 --- a/databases/postgresql74/Makefile.common +++ b/databases/postgresql74/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.27 2005/12/02 21:01:34 joerg Exp $ +# $NetBSD: Makefile.common,v 1.28 2005/12/05 23:55:04 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -71,7 +71,7 @@ PGSQL_TEMPLATE.IRIX= irix5 PGSQL_TEMPLATE.${OPSYS}= ${LOWER_OPSYS} .endif -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/postgresql CONFIGURE_ARGS+= --with-template="${PGSQL_TEMPLATE.${OPSYS}}" CONFIGURE_ARGS+= --without-readline diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common index e5b3544d875..c40705c94c3 100644 --- a/databases/postgresql80/Makefile.common +++ b/databases/postgresql80/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:00 rillig Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/12/05 23:55:05 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -73,9 +73,9 @@ PG_LOCALE_DIR= ${PG_PREFIX}/${PKGLOCALEDIR}/locale PG_ETC_DIR= ${PKG_SYSCONFDIR:S/^${PREFIX}\//${PG_PREFIX}\//} GNU_CONFIGURE_PREFIX= ${PG_PREFIX} -CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR} -CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR} -CONFIGURE_ARGS+= --with-docdir=${PG_DOC_DIR} +CONFIGURE_ARGS+= --sysconfdir=${PG_ETC_DIR:Q} +CONFIGURE_ARGS+= --datadir=${PG_DATA_DIR:Q} +CONFIGURE_ARGS+= --with-docdir=${PG_DOC_DIR:Q} CONFIGURE_ARGS+= --with-template=${PGSQL_TEMPLATE.${OPSYS}} CONFIGURE_ARGS+= --without-readline CONFIGURE_ARGS+= --without-zlib diff --git a/databases/py-psycopg/Makefile b/databases/py-psycopg/Makefile index 470abc3264e..57e64edcc67 100644 --- a/databases/py-psycopg/Makefile +++ b/databases/py-psycopg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/11 23:10:19 joerg Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:05 rillig Exp $ # DISTNAME= psycopg-1.1.21 @@ -11,7 +11,7 @@ HOMEPAGE= http://initd.org/software/psycopg COMMENT= PostgreSQL database adapter for Python GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} CONFIGURE_ARGS+= \ --with-postgres-includes=${PGSQL_PREFIX}/include/postgresql\ --with-postgres-libraries=${PGSQL_PREFIX}/lib diff --git a/databases/sqlrelay/options.mk b/databases/sqlrelay/options.mk index f67b503d47d..64219605a50 100644 --- a/databases/sqlrelay/options.mk +++ b/databases/sqlrelay/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/12/02 17:28:37 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:05 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.sqlrelay PKG_SUPPORTED_OPTIONS+= mysql pgsql @@ -18,11 +18,11 @@ PKG_OPTIONS_DEPRECATED_WARNINGS+="Deprecated variable SQLRELAY_DATABASES used, u .include "../../mk/bsd.options.mk" .if !empty(PKG_OPTIONS:Mmysql) -CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_DIR:Q} .include "../../mk/mysql.buildlink3.mk" .endif .if !empty(PKG_OPTIONS:Mpgsql) -CONFIGURE_ARGS+= --with-postgresql=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-postgresql=${BUILDLINK_DIR:Q} .include "../../mk/pgsql.buildlink3.mk" .endif diff --git a/databases/tcl-postgresql73/Makefile b/databases/tcl-postgresql73/Makefile index 81b37c555b3..4fe776af153 100644 --- a/databases/tcl-postgresql73/Makefile +++ b/databases/tcl-postgresql73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:05 rillig Exp $ PKGNAME= tcl-postgresql73-${BASE_VERS} PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= Tcl interface to PostgreSQL .include "../../databases/postgresql73/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ENV+= TCLSH=${TCLSH:Q} diff --git a/databases/tcl-postgresql74/Makefile b/databases/tcl-postgresql74/Makefile index f447de14ae8..154db1a7525 100644 --- a/databases/tcl-postgresql74/Makefile +++ b/databases/tcl-postgresql74/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:05 rillig Exp $ PKGNAME= tcl-postgresql74-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL .include "../../databases/postgresql74/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" CONFIGURE_ENV+= TCLSH=${TCLSH:Q} diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile index 5d771a4d41e..6f6832f0336 100644 --- a/databases/tk-postgresql73/Makefile +++ b/databases/tk-postgresql73/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:05 rillig Exp $ PKGNAME= tk-postgresql73-${BASE_VERS} PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= Tk interface to PostgreSQL .include "../../databases/postgresql73/Makefile.common" USE_TOOLS+= gtar -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tk CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile index 861b8c57242..5f1bf6bc45b 100644 --- a/databases/unixodbc-DataManager/Makefile +++ b/databases/unixodbc-DataManager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:05 rillig Exp $ PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS} PKGREVISION= 4 @@ -7,9 +7,9 @@ COMMENT= GUI tool for unixODBC data source management .include "../../databases/unixodbc/Makefile.common" CONFIGURE_ARGS+= --enable-gui -CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}" -CONFIGURE_ARGS+= --with-extra-includes="${_EXTRA_INCLUDES}" -CONFIGURE_ARGS+= --with-extra-libs="${_EXTRA_LIBS}" +CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} +CONFIGURE_ARGS+= --with-extra-includes=${_EXTRA_INCLUDES:Q} +CONFIGURE_ARGS+= --with-extra-libs=${_EXTRA_LIBS:Q} CONFIGURE_ARGS+= --disable-rpath CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile index 9257d228575..f10b9e8cb6c 100644 --- a/databases/unixodbc-ODBCConfig/Makefile +++ b/databases/unixodbc-ODBCConfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:05 rillig Exp $ PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS} PKGREVISION= 4 @@ -7,9 +7,9 @@ COMMENT= GUI tool for unixODBC driver configuration .include "../../databases/unixodbc/Makefile.common" CONFIGURE_ARGS+= --enable-gui -CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}" -CONFIGURE_ARGS+= --with-extra-includes="${_EXTRA_INCLUDES}" -CONFIGURE_ARGS+= --with-extra-libs="${_EXTRA_LIBS}" +CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} +CONFIGURE_ARGS+= --with-extra-includes=${_EXTRA_INCLUDES:Q} +CONFIGURE_ARGS+= --with-extra-libs=${_EXTRA_LIBS:Q} CONFIGURE_ARGS+= --disable-rpath CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common index 103a2b9193e..23af8779bba 100644 --- a/databases/unixodbc/Makefile.common +++ b/databases/unixodbc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/04/11 21:45:16 tv Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:05 rillig Exp $ DISTNAME= unixODBC-${ODBC_DIST_VERS} CATEGORIES= databases @@ -18,7 +18,7 @@ ODBC_BASE_VERS= ${ODBC_DIST_VERS} USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-threads PTHREAD_OPTS+= require @@ -61,5 +61,5 @@ fix-ltdl-and-lexlib: .if defined(PTHREAD_TYPE) && (${PTHREAD_TYPE} == "pth") CONFIGURE_ARGS+= --enable-gnuthreads -CONFIGURE_ARGS+= --with-pth=${PTHREADBASE} +CONFIGURE_ARGS+= --with-pth=${PTHREADBASE:Q} .endif diff --git a/databases/yasql/Makefile b/databases/yasql/Makefile index 089890fdacf..f1cf0f223a8 100644 --- a/databases/yasql/Makefile +++ b/databases/yasql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/09/28 20:52:19 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:05 rillig Exp $ DISTNAME= yasql-1.81 CATEGORIES= databases @@ -12,7 +12,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes NO_BUILD= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} DEPENDS+= p5-DBD-Oracle-[0-9]*:../../databases/p5-DBD-Oracle DEPENDS+= p5-Term-ReadLine-[0-9]*:../../devel/p5-Term-ReadLine |