diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
| commit | b71a1d488b6b45e0a968a4c149990c25b6a09215 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /databases | |
| parent | 624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff) | |
| download | pkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'databases')
66 files changed, 160 insertions, 175 deletions
diff --git a/databases/db/Makefile b/databases/db/Makefile index 7a307121af5..f10192c88a1 100644 --- a/databases/db/Makefile +++ b/databases/db/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/22 22:06:28 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:56 rillig Exp $ DISTNAME= db-2.7.7 PKGREVISION= 2 @@ -11,7 +11,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.sleepycat.com/ COMMENT= Sleepycat Software's Berkeley DB version 2 -NO_PKGTOOLS_REQD_CHECK= # defined (needed for pkgtools/pkg_install) +NO_PKGTOOLS_REQD_CHECK= yes # (needed for pkgtools/pkg_install) PKG_INSTALLATION_TYPES= overwrite pkgviews diff --git a/databases/db4/Makefile b/databases/db4/Makefile index 84d396e9bd1..bb469850fd9 100644 --- a/databases/db4/Makefile +++ b/databases/db4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/11/04 18:47:52 tv Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 20:49:57 rillig Exp $ DISTNAME= db-4.3.29 PKGNAME= ${DISTNAME:S/db/db4/} @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --program-transform-name=s,db_,db4_, # NetBSD-sparc64-1.6*'s f77 makes configure failing and as f77 is not # needed for this package the following does no harm on other platform. -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} # Along with a hack in patch-ab, this forces shlib detection via # the pkgsrc-supplied libtool only. @@ -37,7 +37,7 @@ OPSYSVARS+= LIBSO_LIBS LIBSO_LIBS.Interix+= -lrpclib LIBS.Interix+= -lrpclib # needed for in-tree programs, too LIBSO_LIBS.SunOS+= -lnsl -lrt -CONFIGURE_ENV+= LIBSO_LIBS="${LIBSO_LIBS}" +CONFIGURE_ENV+= LIBSO_LIBS=${LIBSO_LIBS:Q} # DB4 only want pthreads because it's really after POSIX 1003.1 # inter-process mutexes. In this case, we only care to use the native diff --git a/databases/db4/hacks.mk b/databases/db4/hacks.mk index 161dadbc279..31e6f7d5ae6 100644 --- a/databases/db4/hacks.mk +++ b/databases/db4/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.3 2005/07/01 15:32:51 tron Exp $ +# $NetBSD: hacks.mk,v 1.4 2005/12/05 20:49:57 rillig Exp $ ### [Sun Mar 14 19:32:40 UTC 2004 : jlam] ### GCC 3.3.x and older versions have an optimization bug on powerpc that's @@ -15,7 +15,7 @@ _GCC_IS_TOO_OLD!= \ else \ ${ECHO} "no"; \ fi -MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD} +MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q} . endif . if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS]) PKG_HACKS+= powerpc-codegen diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile index d53d6a79cc7..716c2514297 100644 --- a/databases/dbh/Makefile +++ b/databases/dbh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:57 rillig Exp $ DISTNAME= dbh-1.0.24 CATEGORIES= databases @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= pkg-config # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/doc/dbh diff --git a/databases/gdbm_primitive/Makefile b/databases/gdbm_primitive/Makefile index ded9b0ee50e..31e478517f5 100644 --- a/databases/gdbm_primitive/Makefile +++ b/databases/gdbm_primitive/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/04/11 21:45:11 tv Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= gdbm-prim-1.15 @@ -13,7 +13,7 @@ HOMEPAGE= http://homepage.mac.com/leffert/FileSharing.html COMMENT= Shell primitives for working with GDBMs EXTRACT_CMD= ${_DFLT_EXTRACT_CMD} -MAKE_ENV+= BUILDLINK_LDFLAGS="${BUILDLINK_LDFLAGS}" +MAKE_ENV+= BUILDLINK_LDFLAGS=${BUILDLINK_LDFLAGS:Q} WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} .include "../../databases/gdbm/buildlink3.mk" diff --git a/databases/geneweb/Makefile b/databases/geneweb/Makefile index 89fb062d0cf..e8c64f9bae0 100644 --- a/databases/geneweb/Makefile +++ b/databases/geneweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= geneweb-4.10 @@ -10,7 +10,7 @@ MAINTAINER= wulf@NetBSD.org HOMEPAGE= http://cristal.inria.fr/~ddr/GeneWeb/ COMMENT= GeneWeb is a comprehensive genealogy database application -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb1 USE_PKGINSTALL= yes USE_TOOLS+= gmake diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile index e3ec0aeafbb..ee6b9689927 100644 --- a/databases/gnome-mime-data/Makefile +++ b/databases/gnome-mime-data/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:08 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= gnome-mime-data-2.4.2 @@ -24,7 +24,7 @@ GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= gnome-mime-data-2.0.pc.in -CONFIGURE_ARGS= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/gnome-mime-data CONF_FILES= ${EGDIR}/gnome-vfs-mime-magic \ diff --git a/databases/gramps/Makefile b/databases/gramps/Makefile index 66c560a3f7f..5e4b55e5ee5 100644 --- a/databases/gramps/Makefile +++ b/databases/gramps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/08/10 20:56:13 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= gramps-1.0.11 @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_TOOLS+= pkg-config -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} # i18n support with other python versions appears to not work PYTHON_VERSION_REQD= 23 diff --git a/databases/gramps2/Makefile b/databases/gramps2/Makefile index 568d5571f03..482262db6e7 100644 --- a/databases/gramps2/Makefile +++ b/databases/gramps2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/09/08 17:55:52 drochner Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= gramps-2.0.8 @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes # disable gconf schema and mime type processing CONFIGURE_ARGS+= --disable-mime-install --enable-packager-mode -CONFIGURE_ENV+= PYTHON=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} # i18n support with other python versions appears to not work PYTHON_VERSIONS_ACCEPTED= 24 23 diff --git a/databases/gtksql/Makefile b/databases/gtksql/Makefile index b58446b4811..993bc1a8ca2 100644 --- a/databases/gtksql/Makefile +++ b/databases/gtksql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/09/28 20:52:18 rillig Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= gtksql-0.3 @@ -14,7 +14,7 @@ HOMEPAGE= http://www.multimania.com/bbrox/GtkSQL/ COMMENT= Query tool for PostgreSQL written with GTK USE_X11BASE= yes -MAKE_ENV+= MCFLAGS="${CFLAGS}" +MAKE_ENV+= MCFLAGS=${CFLAGS:M*:Q} PGSQL_VERSION_REQD= 73 diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile index ca7d6e201b1..d69ecf7b8a6 100644 --- a/databases/java-db3/Makefile +++ b/databases/java-db3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/11/29 06:45:28 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:49:57 rillig Exp $ DISTNAME= db-3.3.11 PKGNAME= java-db3-3.11.2 @@ -32,9 +32,9 @@ CONFIGURE_ARGS+= --program-transform-name=s,db_,db3_, CONFIGURE_ARGS+= --includedir=${PREFIX}/include/db3 CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-java -CONFIGURE_ENV+= JAVAC="${JAVAC}" -CONFIGURE_ENV+= JAVACABS="${JAVACABS}" -CONFIGURE_ENV+= JAR="${JAR}" +CONFIGURE_ENV+= JAVAC=${JAVAC:Q} +CONFIGURE_ENV+= JAVACABS=${JAVACABS:Q} +CONFIGURE_ENV+= JAR=${JAR:Q} CPPFLAGS+= ${BUILDLINK_CPPFLAGS.${PKG_JVM}} diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile index db00f1e2f8b..4e83bb63bad 100644 --- a/databases/lbdb/Makefile +++ b/databases/lbdb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/12 17:43:42 tonio Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:49:57 rillig Exp $ DISTNAME= lbdb_0.31 PKGNAME= ${DISTNAME:S/_/-/} @@ -23,8 +23,8 @@ CONFIGURE_ARGS+= --without-evolution-addressbook-export CONFIGURE_ARGS+= --without-pgp CONFIGURE_ARGS+= --without-pgpk -CONFIGURE_ENV+= SH=${TOOLS_SH} -CONFIGURE_ENV+= AWK=${TOOLS_AWK} +CONFIGURE_ENV+= SH=${TOOLS_SH:Q} +CONFIGURE_ENV+= AWK=${TOOLS_AWK:Q} .include "options.mk" diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile index 4ab7174e113..e67025be714 100644 --- a/databases/libgnomedb/Makefile +++ b/databases/libgnomedb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/09/23 20:08:05 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 20:49:57 rillig Exp $ # DISTNAME= libgnomedb-1.2.2 @@ -20,7 +20,7 @@ GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= libgnomedb.pc.in -CONFIGURE_ARGS= --enable-gtk-doc=no +CONFIGURE_ARGS+= --enable-gtk-doc=no CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc GCONF2_SCHEMAS= libgnomedb.schemas diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile index 1f04415dda8..13cb5cf2ae4 100644 --- a/databases/libpqxx/Makefile +++ b/databases/libpqxx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/06/27 01:57:26 markd Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:57 rillig Exp $ # .include "../../databases/libpqxx/Makefile.common" @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --disable-thread-safety .endif # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 485cdaa41f1..740c3f85a05 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.50 2005/11/09 19:49:52 tv Exp $ +# $NetBSD: Makefile.common,v 1.51 2005/12/05 20:49:57 rillig Exp $ DISTNAME= mysql-4.0.26 CATEGORIES= databases @@ -59,7 +59,7 @@ CONFIGURE_ARGS+= --enable-assembler .endif # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} CPPFLAGS+= -Dunix CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat diff --git a/databases/mysql-server/Makefile b/databases/mysql-server/Makefile index f3ed6ef1ed4..cba393d7a9d 100644 --- a/databases/mysql-server/Makefile +++ b/databases/mysql-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.66 2005/10/03 14:24:29 xtraeme Exp $ +# $NetBSD: Makefile,v 1.67 2005/12/05 20:49:57 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= MySQL 4, a free SQL database (server) CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} -.include "../mysql-client/Makefile.common" +.include "../../databases/mysql-client/Makefile.common" CONFIGURE_ARGS+= --with-libwrap @@ -26,9 +26,9 @@ PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL PKG_GROUPS= ${MYSQL_GROUP} RCD_SCRIPTS= mysqld -FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD} \ - MYSQL_DATADIR=${MYSQL_DATADIR} \ - MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} +FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ + MYSQL_DATADIR=${MYSQL_DATADIR:Q} \ + MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q} MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} BUILD_DEFS+= MYSQL_DATADIR diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common index 75dfe58eef6..3d5450b91dd 100644 --- a/databases/mysql4-client/Makefile.common +++ b/databases/mysql4-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.46 2005/11/09 19:48:44 tv Exp $ +# $NetBSD: Makefile.common,v 1.47 2005/12/05 20:49:57 rillig Exp $ DISTNAME= mysql-4.1.15 CATEGORIES= databases @@ -72,7 +72,7 @@ CONFIGURE_ARGS+= --enable-assembler .endif # Avoid an ICE in gcc2 on sparc64 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} CPPFLAGS+= -Dunix CFLAGS+= -DUSE_OLD_FUNCTIONS # 3.23.x compat diff --git a/databases/mysql4-server/Makefile b/databases/mysql4-server/Makefile index 1c1e72620a4..f182f28b591 100644 --- a/databases/mysql4-server/Makefile +++ b/databases/mysql4-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/10/29 14:14:00 xtraeme Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:57 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} #PKGREVISION= 1 @@ -7,7 +7,7 @@ COMMENT= MySQL 4, a free SQL database (server) CONFLICTS= {mysql-server-[0-9]*,mysql3-server-[0-9]*} -.include "../mysql4-client/Makefile.common" +.include "../../databases/mysql4-client/Makefile.common" CONFIGURE_ARGS+= --with-libwrap @@ -26,9 +26,9 @@ PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL PKG_GROUPS= ${MYSQL_GROUP} RCD_SCRIPTS= mysqld -FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD} \ - MYSQL_DATADIR=${MYSQL_DATADIR} \ - MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} +FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ + MYSQL_DATADIR=${MYSQL_DATADIR:Q} \ + MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q} MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} BUILD_DEFS+= MYSQL_DATADIR diff --git a/databases/mysql5-server/Makefile b/databases/mysql5-server/Makefile index 49175b864b0..df9eb361121 100644 --- a/databases/mysql5-server/Makefile +++ b/databases/mysql5-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/12/02 08:13:26 xtraeme Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:49:58 rillig Exp $ PKGNAME= ${DISTNAME:S/-/-server-/} #PKGREVISION= 1 @@ -25,9 +25,9 @@ PKG_USERS= ${MYSQL_USER}:${MYSQL_GROUP}::MySQL\ database\ administrator:${MYSQL PKG_GROUPS= ${MYSQL_GROUP} RCD_SCRIPTS= mysqld -FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD} \ - MYSQL_DATADIR=${MYSQL_DATADIR} \ - MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} +FILES_SUBST+= HOSTNAME_CMD=${HOSTNAME_CMD:Q} \ + MYSQL_DATADIR=${MYSQL_DATADIR:Q} \ + MYSQL_USER=${MYSQL_USER:Q} MYSQL_GROUP=${MYSQL_GROUP:Q} MESSAGE_SUBST+= MYSQL_DATADIR=${MYSQL_DATADIR} \ MYSQL_USER=${MYSQL_USER} MYSQL_GROUP=${MYSQL_GROUP} BUILD_DEFS+= MYSQL_DATADIR diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile index f67075660f0..ae9f49334f0 100644 --- a/databases/openldap/Makefile +++ b/databases/openldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.103 2005/11/19 18:41:15 joerg Exp $ +# $NetBSD: Makefile,v 1.104 2005/12/05 20:49:58 rillig Exp $ DISTNAME= openldap-2.3.11 PKGREVISION= 1 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes TEST_TARGET= test -MAKE_ENV+= LIBMODE=${LIBMODE} +MAKE_ENV+= LIBMODE=${LIBMODE:Q} OPENLDAP_ETCDIR= ${PKG_SYSCONFDIR}/openldap OPENLDAP_MODULEDIR= ${PREFIX}/lib/openldap OPENLDAP_VARDIR= ${VARBASE}/openldap diff --git a/databases/openldap/options.mk b/databases/openldap/options.mk index d96bcc02648..68078ecab67 100644 --- a/databases/openldap/options.mk +++ b/databases/openldap/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2005/10/26 15:08:13 jlam Exp $ +# $NetBSD: options.mk,v 1.14 2005/12/05 20:49:58 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.openldap PKG_SUPPORTED_OPTIONS= bdb kerberos sasl slp @@ -8,7 +8,7 @@ PKG_SUGGESTED_OPTIONS= bdb ### ### Whether to build with the Berkeley DB based slapd backends. -### +### ### NOTE: that option is enabled, because the openldap server needs ### to have local storage support to work as standalone. ### diff --git a/databases/p5-BerkeleyDB/Makefile b/databases/p5-BerkeleyDB/Makefile index cffe55e2bf7..5b9b812470b 100644 --- a/databases/p5-BerkeleyDB/Makefile +++ b/databases/p5-BerkeleyDB/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/08/06 06:19:06 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:49:58 rillig Exp $ # DISTNAME= BerkeleyDB-0.26 @@ -19,7 +19,7 @@ PERL5_PACKLIST= auto/BerkeleyDB/.packlist MAKE_ENV+= BERKELEYDB_INCLUDE="${BDBBASE}/include/${BDB_TYPE}" MAKE_ENV+= BERKELEYDB_LIB="${BDBBASE}/lib" -MAKE_ENV+= BERKELEYDB_NAME="${BDB_LIBS}" +MAKE_ENV+= BERKELEYDB_NAME=${BDB_LIBS:Q} .include "../../mk/bdb.buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/databases/p5-DBD-Sybase/Makefile b/databases/p5-DBD-Sybase/Makefile index bf83fb310d7..50fc50d9a76 100644 --- a/databases/p5-DBD-Sybase/Makefile +++ b/databases/p5-DBD-Sybase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/08/06 06:19:06 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:49:58 rillig Exp $ # DISTNAME= DBD-Sybase-0.94 @@ -29,7 +29,7 @@ _SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds .endif PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib -MAKE_ENV+= SYBASE=${_SYBASE} +MAKE_ENV+= SYBASE=${_SYBASE:Q} .if !defined(USE_SYBASE_OPENCLIENT) . include "../../databases/freetds/buildlink3.mk" diff --git a/databases/p5-DBD-postgresql/Makefile b/databases/p5-DBD-postgresql/Makefile index b05f69251ea..2569d3dcc53 100644 --- a/databases/p5-DBD-postgresql/Makefile +++ b/databases/p5-DBD-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/08/06 06:19:06 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 20:49:58 rillig Exp $ # VER= 1.41 @@ -22,8 +22,8 @@ PGPREFIX= ${PREFIX}/${PGUSER} POSTGRES_INCLUDE= ${PGSQL_PREFIX}/include/postgresql POSTGRES_LIB= ${PGSQL_PREFIX}/lib -MAKE_ENV+= POSTGRES_INCLUDE="${POSTGRES_INCLUDE}" -MAKE_ENV+= POSTGRES_LIB="${POSTGRES_LIB}" +MAKE_ENV+= POSTGRES_INCLUDE=${POSTGRES_INCLUDE:Q} +MAKE_ENV+= POSTGRES_LIB=${POSTGRES_LIB:Q} .include "../../databases/p5-DBI/buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/databases/p5-DB_File/Makefile b/databases/p5-DB_File/Makefile index 2c097b7a10f..4ad577b7406 100644 --- a/databases/p5-DB_File/Makefile +++ b/databases/p5-DB_File/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/11/11 20:14:51 heinz Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:49:58 rillig Exp $ DISTNAME= DB_File-1.814 PKGNAME= p5-${DISTNAME} @@ -14,7 +14,7 @@ PERL5_PACKLIST= auto/DB_File/.packlist .include "../../mk/bsd.prefs.mk" .include "../../mk/bdb.buildlink3.mk" -MAKE_ENV+= DB_FILE_NAME="${BDB_LIBS}" +MAKE_ENV+= DB_FILE_NAME=${BDB_LIBS:Q} MAKE_ENV+= DB_FILE_INCLUDE="${BDBBASE}/${BUILDLINK_INCDIRS.${BDB_TYPE}}" MAKE_ENV+= DB_FILE_LIB="${BDBBASE}/lib" .if empty(BDB_TYPE:Mdb1) diff --git a/databases/p5-sybperl/Makefile b/databases/p5-sybperl/Makefile index 2fdaa796186..c6263e9dfb6 100644 --- a/databases/p5-sybperl/Makefile +++ b/databases/p5-sybperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/06 06:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:49:58 rillig Exp $ # DISTNAME= sybperl-2.16 @@ -28,7 +28,7 @@ _SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds .endif PERL5_LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib -MAKE_ENV+= SYBASE=${_SYBASE} +MAKE_ENV+= SYBASE=${_SYBASE:Q} .if !defined(USE_SYBASE_OPENCLIENT) . include "../../databases/freetds/buildlink3.mk" diff --git a/databases/php-dba/Makefile b/databases/php-dba/Makefile index e57744dc3e8..2d140b0fe19 100644 --- a/databases/php-dba/Makefile +++ b/databases/php-dba/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ MODNAME= dba CATEGORIES+= databases -PKGREVISION= # empty COMMENT= PHP extension for DBM database access diff --git a/databases/php-dbase/Makefile b/databases/php-dbase/Makefile index e6ed0ed1783..e5d5f675d5b 100644 --- a/databases/php-dbase/Makefile +++ b/databases/php-dbase/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ MODNAME= dbase CATEGORIES+= databases -PKGREVISION= # empty COMMENT= PHP extension for dBase database access diff --git a/databases/php-dbx/Makefile b/databases/php-dbx/Makefile index 55f6e6735f7..dba614663a8 100644 --- a/databases/php-dbx/Makefile +++ b/databases/php-dbx/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.3 2005/10/09 10:09:15 jdolecek Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:49:58 rillig Exp $ MODNAME= dbx PECL_VERSION= 1.1.0 CATEGORIES+= databases -PKGREVISION= # empty COMMENT= PHP database abstraction layer extension MAINTAINER= jdolecek@NetBSD.org diff --git a/databases/php-filepro/Makefile b/databases/php-filepro/Makefile index ec1f5d5941b..e1ab1a02633 100644 --- a/databases/php-filepro/Makefile +++ b/databases/php-filepro/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ MODNAME= filepro CATEGORIES+= databases -PKGREVISION= # empty COMMENT= PHP extension for read-only filePro database access diff --git a/databases/php-mysql/Makefile b/databases/php-mysql/Makefile index 8f1901c2c37..2dd31358bf3 100644 --- a/databases/php-mysql/Makefile +++ b/databases/php-mysql/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ MODNAME= mysql CATEGORIES+= databases -PKGREVISION= # empty COMMENT= PHP extension for MySQL databases MAINTAINER= tech-pkg@NetBSD.org diff --git a/databases/php-odbc/Makefile b/databases/php-odbc/Makefile index 10bf9274d5a..7ec5f98bdb4 100644 --- a/databases/php-odbc/Makefile +++ b/databases/php-odbc/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ MODNAME= odbc CATEGORIES+= databases -PKGREVISION= # empty COMMENT= PHP extension for ODBC access diff --git a/databases/php-pgsql/Makefile b/databases/php-pgsql/Makefile index 6b3bf5f662b..f5200fb326e 100644 --- a/databases/php-pgsql/Makefile +++ b/databases/php-pgsql/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ MODNAME= pgsql -PKGREVISION= # empty CATEGORIES+= databases COMMENT= PHP extension for PostgreSQL databases diff --git a/databases/phpmyadmin/Makefile b/databases/phpmyadmin/Makefile index 47691c6b4e8..5bd9eec87a3 100644 --- a/databases/phpmyadmin/Makefile +++ b/databases/phpmyadmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/11/21 13:47:42 tron Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 20:49:58 rillig Exp $ DISTNAME= phpMyAdmin-${DIST_VERSION} PKGNAME= phpmyadmin-${DIST_VERSION:S/-//} @@ -13,8 +13,8 @@ COMMENT= Set of PHP-scripts to adminstrate MySQL over the WWW DEPENDS+= php-mbstring>=4.3.3:../../misc/php-mbstring DEPENDS+= php-mysql{,i}>=4.3.3:../../databases/php-mysql -PLIST_SUBST+= CP="${CP}" DIST_VERSION=${DIST_VERSION} \ - PMCONFFILE=${PMCONFFILE} TEST="${TEST}" +PLIST_SUBST+= CP=${CP:Q} DIST_VERSION=${DIST_VERSION:Q} \ + PMCONFFILE=${PMCONFFILE:Q} TEST=${TEST:Q} MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} PMCONFFILE=${PMCONFFILE} \ PMDIR=${PMDIR} EXDIR=${EXDIR} diff --git a/databases/postgresql73-client/Makefile b/databases/postgresql73-client/Makefile index c757a49f9d0..a127b177f79 100644 --- a/databases/postgresql73-client/Makefile +++ b/databases/postgresql73-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.5 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:58 rillig Exp $ PKGNAME= postgresql73-client-${BASE_VERS} -PKGREVISION= # empty SVR4_PKGNAME= pstgc COMMENT= PostgreSQL database client programs diff --git a/databases/postgresql73-docs/Makefile b/databases/postgresql73-docs/Makefile index c96ceca48dd..1ac1aadb819 100644 --- a/databases/postgresql73-docs/Makefile +++ b/databases/postgresql73-docs/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:58 rillig Exp $ PKGNAME= postgresql73-docs-${BASE_VERS} SVR4_PKGNAME= pstgd -PKGREVISION= # empty COMMENT= PostgreSQL database system documentation diff --git a/databases/postgresql73-plperl/Makefile b/databases/postgresql73-plperl/Makefile index 7a7abd38a46..11950ac70ce 100644 --- a/databases/postgresql73-plperl/Makefile +++ b/databases/postgresql73-plperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/08/07 18:19:16 adrianp Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:49:58 rillig Exp $ PKGNAME= postgresql73-plperl-${BASE_VERS} COMMENT= PL/Perl procedural language for the PostgreSQL backend @@ -6,7 +6,7 @@ COMMENT= PL/Perl procedural language for the PostgreSQL backend DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server -.include "../postgresql73/Makefile.common" +.include "../../databases/postgresql73/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-perl @@ -14,7 +14,7 @@ CONFIGURE_ARGS+= --with-perl BUILD_DIRS= ${WRKSRC}/src/pl/plperl MAKEFILE= GNUmakefile -.include "../postgresql73-lib/buildlink3.mk" +.include "../../databases/postgresql73-lib/buildlink3.mk" .include "../../lang/perl5/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql73-pltcl/Makefile b/databases/postgresql73-pltcl/Makefile index d0b2f060053..6423c668d53 100644 --- a/databases/postgresql73-pltcl/Makefile +++ b/databases/postgresql73-pltcl/Makefile @@ -1,23 +1,22 @@ -# $NetBSD: Makefile,v 1.4 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:49:59 rillig Exp $ PKGNAME= postgresql73-pltcl-${BASE_VERS} -PKGREVISION= # empty COMMENT= PL/Tcl procedural language for the PostgreSQL backend DEPENDS+= postgresql73-server>=${BASE_VERS}:../../databases/postgresql73-server -.include "../postgresql73/Makefile.common" +.include "../../databases/postgresql73/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" -CONFIGURE_ENV+= TCLSH="${TCLSH}" +CONFIGURE_ENV+= TCLSH=${TCLSH:Q} TCLSH= ${LOCALBASE}/bin/tclsh BUILD_DIRS= ${WRKSRC}/src/pl/tcl -.include "../postgresql73-lib/buildlink3.mk" +.include "../../databases/postgresql73-lib/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql73-server/Makefile b/databases/postgresql73-server/Makefile index 02f63d7aab5..c736fa80da5 100644 --- a/databases/postgresql73-server/Makefile +++ b/databases/postgresql73-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.15 2005/08/23 11:48:47 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 20:49:59 rillig Exp $ PKGNAME= postgresql73-server-${BASE_VERS} -PKGREVISION= # empty SVR4_PKGNAME= pstgs COMMENT= PostgreSQL database server programs @@ -42,10 +41,10 @@ CONFIGURE_ARGS+= --with-pam PGUSER?= pgsql PGGROUP?= pgsql PGHOME?= ${PREFIX}/${PGUSER} -FILES_SUBST+= PGUSER=${PGUSER} -FILES_SUBST+= PGGROUP=${PGGROUP} -FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS= PGUSER PGGROUP PGHOME +FILES_SUBST+= PGUSER=${PGUSER:Q} +FILES_SUBST+= PGGROUP=${PGGROUP:Q} +FILES_SUBST+= PGHOME=${PGHOME:Q} +BUILD_DEFS+= PGUSER PGGROUP PGHOME PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} PKG_GROUPS= ${PGGROUP} diff --git a/databases/postgresql74-client/Makefile b/databases/postgresql74-client/Makefile index fcdc3341b17..df3644f1566 100644 --- a/databases/postgresql74-client/Makefile +++ b/databases/postgresql74-client/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.16 2005/12/02 21:01:34 joerg Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:59 rillig Exp $ PKGNAME= postgresql74-client-${BASE_VERS} -PKGREVISION= # empty SVR4_PKGNAME= pstgc COMMENT= PostgreSQL database client programs diff --git a/databases/postgresql74-contrib/Makefile b/databases/postgresql74-contrib/Makefile index 2e566d3f230..a0ae8ce3719 100644 --- a/databases/postgresql74-contrib/Makefile +++ b/databases/postgresql74-contrib/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2005/12/02 21:01:34 joerg Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:49:59 rillig Exp $ PKGNAME= postgresql74-contrib-${BASE_VERS} -PKGREVISION= # empty SVR4_PKGNAME= pstgc COMMENT= PostgreSQL database contrib programs diff --git a/databases/postgresql74-plperl/Makefile b/databases/postgresql74-plperl/Makefile index dc501aedb13..a016210931e 100644 --- a/databases/postgresql74-plperl/Makefile +++ b/databases/postgresql74-plperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:00 rillig Exp $ PKGNAME= postgresql74-plperl-${BASE_VERS} PKGREVISION= 2 @@ -7,7 +7,7 @@ COMMENT= PL/Perl procedural language for the PostgreSQL backend DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server -.include "../postgresql74/Makefile.common" +.include "../../databases/postgresql74/Makefile.common" PERL5_CONFIGURE= NO CONFIGURE_ARGS+= --with-openssl=${SSLBASE} @@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --with-perl BUILD_DIRS= ${WRKSRC}/src/pl/plperl MAKEFILE= GNUmakefile -.include "../postgresql74-lib/buildlink3.mk" +.include "../../databases/postgresql74-lib/buildlink3.mk" .include "../../security/openssl/buildlink3.mk" .include "../../lang/perl5/module.mk" diff --git a/databases/postgresql74-plpython/Makefile b/databases/postgresql74-plpython/Makefile index dc22b4d61fb..b7893abd648 100644 --- a/databases/postgresql74-plpython/Makefile +++ b/databases/postgresql74-plpython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:14 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:00 rillig Exp $ PKGNAME= postgresql74-plpython-${BASE_VERS} @@ -7,16 +7,16 @@ COMMENT= PL/Python procedural language for the PostgreSQL backend DEPENDS+= postgresql74-server>=${BASE_VERS}:../../databases/postgresql74-server -.include "../postgresql74/Makefile.common" +.include "../../databases/postgresql74/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-python -CONFIGURE_ENV+= PYTHON="${PYTHONBIN}" +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} BUILD_DIRS= ${WRKSRC}/src/pl/plpython .include "../../security/openssl/buildlink3.mk" -.include "../postgresql74-lib/buildlink3.mk" +.include "../../databases/postgresql74-lib/buildlink3.mk" .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/postgresql74-server/Makefile b/databases/postgresql74-server/Makefile index 2d9e62a78a7..e779dfbfd1d 100644 --- a/databases/postgresql74-server/Makefile +++ b/databases/postgresql74-server/Makefile @@ -1,7 +1,6 @@ -# $NetBSD: Makefile,v 1.19 2005/12/02 21:01:34 joerg Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:00 rillig Exp $ PKGNAME= postgresql74-server-${BASE_VERS} -PKGREVISION= # empty SVR4_PKGNAME= pstgs COMMENT= PostgreSQL database server programs @@ -42,10 +41,10 @@ CONFIGURE_ARGS+= --with-pam PGUSER?= pgsql PGGROUP?= pgsql PGHOME?= ${PREFIX}/${PGUSER} -FILES_SUBST+= PGUSER=${PGUSER} -FILES_SUBST+= PGGROUP=${PGGROUP} -FILES_SUBST+= PGHOME=${PGHOME} -BUILD_DEFS= PGUSER PGGROUP PGHOME +FILES_SUBST+= PGUSER=${PGUSER:Q} +FILES_SUBST+= PGGROUP=${PGGROUP:Q} +FILES_SUBST+= PGHOME=${PGHOME:Q} +BUILD_DEFS+= PGUSER PGGROUP PGHOME PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} PKG_GROUPS= ${PGGROUP} diff --git a/databases/postgresql80-plpython/Makefile b/databases/postgresql80-plpython/Makefile index d8efb4c7206..302adef9b0c 100644 --- a/databases/postgresql80-plpython/Makefile +++ b/databases/postgresql80-plpython/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/08/06 06:25:12 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:00 rillig Exp $ PKGNAME= postgresql80-plpython-${BASE_VERS} COMMENT= PL/Python procedural language for the PostgreSQL backend @@ -8,7 +8,7 @@ DEPENDS+= postgresql80-server>=${BASE_VERS}:../../databases/postgresql80-server .include "../../databases/postgresql80/Makefile.common" CONFIGURE_ARGS+= --with-python -CONFIGURE_ENV+= PYTHON="${PYTHONBIN}" +CONFIGURE_ENV+= PYTHON=${PYTHONBIN:Q} BUILD_DIRS= ${WRKSRC}/src/pl/plpython diff --git a/databases/postgresql80-pltcl/Makefile b/databases/postgresql80-pltcl/Makefile index 86c19663e44..a5065caa2ca 100644 --- a/databases/postgresql80-pltcl/Makefile +++ b/databases/postgresql80-pltcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/08/06 06:25:51 jlam Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:50:00 rillig Exp $ PKGNAME= postgresql80-pltcl-${BASE_VERS} COMMENT= PL/Tcl procedural language for the PostgreSQL backend @@ -9,7 +9,7 @@ DEPENDS+= postgresql80-server>=${BASE_VERS}:../../databases/postgresql80-server CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" -CONFIGURE_ENV+= TCLSH="${TCLSH}" +CONFIGURE_ENV+= TCLSH=${TCLSH:Q} TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh BUILD_DIRS= ${WRKSRC}/src/pl/tcl diff --git a/databases/postgresql80-server/Makefile b/databases/postgresql80-server/Makefile index 926ac28dc72..b643cd8abc4 100644 --- a/databases/postgresql80-server/Makefile +++ b/databases/postgresql80-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/23 20:16:52 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:00 rillig Exp $ PKGNAME= postgresql80-server-${BASE_VERS} COMMENT= PostgreSQL database server programs @@ -56,9 +56,9 @@ PKG_SUPPORTED_OPTIONS= pam PGUSER?= pgsql PGGROUP?= pgsql PGHOME?= ${PREFIX}/${PGUSER} -FILES_SUBST+= PGUSER=${PGUSER} -FILES_SUBST+= PGGROUP=${PGGROUP} -FILES_SUBST+= PGHOME=${PGHOME} +FILES_SUBST+= PGUSER=${PGUSER:Q} +FILES_SUBST+= PGGROUP=${PGGROUP:Q} +FILES_SUBST+= PGHOME=${PGHOME:Q} BUILD_DEFS+= PGUSER PGGROUP PGHOME PKG_USERS= ${PGUSER}:${PGGROUP}::PostgreSQL\ database\ administrator:${PGHOME}:${SH} diff --git a/databases/postgresql80/Makefile.common b/databases/postgresql80/Makefile.common index 6feb32a75aa..e5b3544d875 100644 --- a/databases/postgresql80/Makefile.common +++ b/databases/postgresql80/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/10/23 20:16:52 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:00 rillig Exp $ # # This Makefile fragment is included by all PostgreSQL packages built from # the main sources of the PostgreSQL distribution except jdbc-postgresql. @@ -9,7 +9,7 @@ # <lang>-postgresql client-side interface to PostgreSQL # postgresql-<lang> server-side module for PostgreSQL backend -.include "../postgresql80/Makefile.mirrors" +.include "../../databases/postgresql80/Makefile.mirrors" DISTNAME?= postgresql-${DIST_VERS} CATEGORIES+= databases diff --git a/databases/py-pgnotify/Makefile b/databases/py-pgnotify/Makefile index b31d8a38abf..ea7606a9544 100644 --- a/databases/py-pgnotify/Makefile +++ b/databases/py-pgnotify/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:00 rillig Exp $ # DISTNAME= pgnotify-0.1 @@ -18,7 +18,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin USE_TOOLS+= gmake PYDISTUTILSPKG= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/py-postgresql/Makefile b/databases/py-postgresql/Makefile index 7f64d444c53..78f610e5aee 100644 --- a/databases/py-postgresql/Makefile +++ b/databases/py-postgresql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/09/07 11:42:27 darcy Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:00 rillig Exp $ DISTNAME= PyGreSQL-3.7 PKGNAME= ${PYPKGPREFIX}-postgresql-3.7 @@ -18,7 +18,7 @@ MAKEFILE= GNUmakefile MAKE_ENV+= INSTALLED_LIBPQ=1 PY_PATCHPLIST= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} PYDISTUTILSPKG= yes PYBINMODULE= yes @@ -34,4 +34,3 @@ post-install: .include "../../lang/python/extension.mk" .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" - diff --git a/databases/py-sybase/Makefile b/databases/py-sybase/Makefile index 8b5f14c4e7b..a0a0990db3f 100644 --- a/databases/py-sybase/Makefile +++ b/databases/py-sybase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/07/01 00:29:06 reed Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:00 rillig Exp $ # DISTNAME= sybase-0.36 @@ -18,7 +18,7 @@ PYSETUPBUILDARGS= build_ext -D HAVE_FREETDS=61 -U WANT_BULKCOPY PYDISTUTILSPKG= yes SYBASE= ${BUILDLINK_PREFIX.freetds}/freetds -MAKE_ENV+= SYBASE=${SYBASE} +MAKE_ENV+= SYBASE=${SYBASE:Q} post-patch: ${SED} "s|\(runtime_library_dirs = \)None|\1['${SYBASE}'+'/lib']|" \ diff --git a/databases/py-table/Makefile b/databases/py-table/Makefile index f3a7ddd53b1..a4e01443918 100644 --- a/databases/py-table/Makefile +++ b/databases/py-table/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/05/22 20:07:46 jlam Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= pytable-0.8.3a @@ -17,7 +17,7 @@ MAKE_ENV+= BINDIR=${PREFIX}/bin USE_TOOLS+= gmake PYDISTUTILSPKG= yes -PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX} +PLIST_SUBST+= PYPKGPREFIX=${PYPKGPREFIX:Q} .include "../../lang/python/extension.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile index f4af5bf4b11..b4a8239d253 100644 --- a/databases/rrdtool/Makefile +++ b/databases/rrdtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/10/12 19:24:42 abs Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= rrdtool-1.2.11 @@ -19,7 +19,7 @@ USE_TOOLS+= gmake pkg-config GNU_CONFIGURE= yes PTHREAD_OPTS+= require -CONFIGURE_ARGS= --enable-shared +CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-perl-options=${MAKE_PARAMS:Q} PERL5_CONFIGURE= NO diff --git a/databases/sdbm/Makefile b/databases/sdbm/Makefile index 959cea8f20f..7b1af15cb31 100644 --- a/databases/sdbm/Makefile +++ b/databases/sdbm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/05/16 17:04:42 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= sdbm @@ -14,7 +14,7 @@ COMMENT= Substitute DBM, an implementation of the `real' ndbm library WRKSRC= ${WRKDIR} MAKE_ENV+= LIBDIR=${PREFIX}/lib NOLINT=1 \ - LIBOWN=${LIBOWN} LIBGRP=${LIBGRP} + LIBOWN=${LIBOWN:Q} LIBGRP=${LIBGRP:Q} post-extract: @cd ${WRKDIR} && ${SH} sdbm.shar >/dev/null diff --git a/databases/sdbm/distinfo b/databases/sdbm/distinfo index e9d8e2818e6..1c7745ac5c9 100644 --- a/databases/sdbm/distinfo +++ b/databases/sdbm/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.4 2005/02/23 16:33:10 agc Exp $ +$NetBSD: distinfo,v 1.5 2005/12/05 20:50:01 rillig Exp $ SHA1 (sdbm.tar.Z) = ebeb769b308a00853b0119f32dda781829e1d712 RMD160 (sdbm.tar.Z) = 33a48f642ad81bb15a7ce4440dca605e97774afa Size (sdbm.tar.Z) = 63557 bytes -SHA1 (patch-aa) = b5434430d01134c2ba580a609b6a9c3f7be86e50 +SHA1 (patch-aa) = cbac91086cf9b149b62d63f7f3b3435786ac6090 SHA1 (patch-ab) = 76594d681bc8733e75703123312bd8c82afed333 SHA1 (patch-ac) = 9b1265bceada93f6a4cb4c4ed2b01e4a6b75c96c SHA1 (patch-ad) = bfc801d5b42902fd75d66d3b775d2a52d7c93921 diff --git a/databases/sdbm/patches/patch-aa b/databases/sdbm/patches/patch-aa index 7dac558a992..7e49d599fc2 100644 --- a/databases/sdbm/patches/patch-aa +++ b/databases/sdbm/patches/patch-aa @@ -1,8 +1,8 @@ -$NetBSD: patch-aa,v 1.4 2004/04/28 00:20:22 minskim Exp $ +$NetBSD: patch-aa,v 1.5 2005/12/05 20:50:01 rillig Exp $ --- sdbm.c.orig 2004-04-27 19:10:43.000000000 -0500 +++ sdbm.c -@@ -25,6 +25,10 @@ static char rcsid[] = "$Id: sdbm.c,v 1.1 +@@ -25,6 +25,10 @@ #endif #include <errno.h> #include <string.h> @@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.4 2004/04/28 00:20:22 minskim Exp $ #ifdef __STDC__ #include <stddef.h> -@@ -35,17 +39,6 @@ static char rcsid[] = "$Id: sdbm.c,v 1.1 +@@ -35,17 +39,6 @@ #endif /* diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common index 0dc949c9a9e..416fd588a3e 100644 --- a/databases/sqsh/Makefile.common +++ b/databases/sqsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/12/05 20:50:01 rillig Exp $ DISTNAME= sqsh-2.1-src CATEGORIES= databases @@ -34,7 +34,7 @@ MAKE_FLAGS+= SYBASE_LIBS=-lct .endif LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib -CONFIGURE_ENV+= SYBASE="${_SYBASE}" +CONFIGURE_ENV+= SYBASE=${_SYBASE:Q} CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include" CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib" diff --git a/databases/tcl-postgresql73/Makefile b/databases/tcl-postgresql73/Makefile index e39c86210cb..81b37c555b3 100644 --- a/databases/tcl-postgresql73/Makefile +++ b/databases/tcl-postgresql73/Makefile @@ -1,16 +1,16 @@ -# $NetBSD: Makefile,v 1.6 2005/07/29 05:39:00 grant Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:01 rillig Exp $ PKGNAME= tcl-postgresql73-${BASE_VERS} PKGREVISION= 1 COMMENT= Tcl interface to PostgreSQL -.include "../postgresql73/Makefile.common" +.include "../../databases/postgresql73/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" -CONFIGURE_ENV+= TCLSH="${TCLSH}" +CONFIGURE_ENV+= TCLSH=${TCLSH:Q} TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh MAKE_ENV+= INSTALLED_LIBPQ=1 USE_TOOLS+= gtar @@ -23,7 +23,7 @@ post-install: ${GTAR} zxCf ${PREFIX}/man ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tcl` -.include "../postgresql73-lib/buildlink3.mk" +.include "../../databases/postgresql73-lib/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tcl-postgresql74/Makefile b/databases/tcl-postgresql74/Makefile index a7ece7cf109..f447de14ae8 100644 --- a/databases/tcl-postgresql74/Makefile +++ b/databases/tcl-postgresql74/Makefile @@ -1,14 +1,14 @@ -# $NetBSD: Makefile,v 1.5 2005/12/02 21:01:34 joerg Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:01 rillig Exp $ PKGNAME= tcl-postgresql74-${BASE_VERS} COMMENT= Tcl interface to PostgreSQL -.include "../postgresql74/Makefile.common" +.include "../../databases/postgresql74/Makefile.common" CONFIGURE_ARGS+= --with-openssl=${SSLBASE} CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib" -CONFIGURE_ENV+= TCLSH="${TCLSH}" +CONFIGURE_ENV+= TCLSH=${TCLSH:Q} TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh MAKE_ENV+= INSTALLED_LIBPQ=1 @@ -20,7 +20,7 @@ post-install: cd ${PREFIX}/man && ${TAR} -zxf ${WRKSRC}/doc/man.tar.gz \ `${SED} -e "s|#.*||" ${FILESDIR}/man.tcl` -.include "../postgresql74-lib/buildlink3.mk" +.include "../../databases/postgresql74-lib/buildlink3.mk" .include "../../lang/tcl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/databases/tk-postgresql73/Makefile b/databases/tk-postgresql73/Makefile index fe454942bfc..5d771a4d41e 100644 --- a/databases/tk-postgresql73/Makefile +++ b/databases/tk-postgresql73/Makefile @@ -1,10 +1,10 @@ -# $NetBSD: Makefile,v 1.10 2005/08/16 23:41:54 grant Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:01 rillig Exp $ PKGNAME= tk-postgresql73-${BASE_VERS} PKGREVISION= 1 COMMENT= Tk interface to PostgreSQL -.include "../postgresql73/Makefile.common" +.include "../../databases/postgresql73/Makefile.common" USE_TOOLS+= gtar CONFIGURE_ARGS+= --with-openssl=${SSLBASE} @@ -12,7 +12,7 @@ CONFIGURE_ARGS+= --with-tcl CONFIGURE_ARGS+= --with-tk CONFIGURE_ARGS+= --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib -CONFIGURE_ENV+= TCLSH="${TCLSH}" +CONFIGURE_ENV+= TCLSH=${TCLSH:Q} TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh MAKE_ENV+= INSTALLED_LIBPQ=1 INSTALLED_LIBPGTCL=1 diff --git a/databases/unixodbc-DataManager/Makefile b/databases/unixodbc-DataManager/Makefile index 20df4bac9b3..861b8c57242 100644 --- a/databases/unixodbc-DataManager/Makefile +++ b/databases/unixodbc-DataManager/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:50:01 rillig Exp $ PKGNAME= unixodbc-DataManager-${ODBC_BASE_VERS} PKGREVISION= 4 @@ -13,9 +13,9 @@ CONFIGURE_ARGS+= --with-extra-libs="${_EXTRA_LIBS}" CONFIGURE_ARGS+= --disable-rpath CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" -CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= ac_cv_have_x="${_AC_CV_HAVE_X}" -CONFIGURE_ENV+= ac_cv_have_qt="${_AC_CV_HAVE_QT}" +CONFIGURE_ENV+= USER_LDFLAGS=${LDFLAGS:M*:Q} +CONFIGURE_ENV+= ac_cv_have_x=${_AC_CV_HAVE_X:Q} +CONFIGURE_ENV+= ac_cv_have_qt=${_AC_CV_HAVE_QT:Q} MAKE_FLAGS+= DataManager_DEPENDENCIES="" diff --git a/databases/unixodbc-ODBCConfig/Makefile b/databases/unixodbc-ODBCConfig/Makefile index a1169216d1d..9257d228575 100644 --- a/databases/unixodbc-ODBCConfig/Makefile +++ b/databases/unixodbc-ODBCConfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:01 rillig Exp $ PKGNAME= unixodbc-ODBCConfig-${ODBC_BASE_VERS} PKGREVISION= 4 @@ -13,9 +13,9 @@ CONFIGURE_ARGS+= --with-extra-libs="${_EXTRA_LIBS}" CONFIGURE_ARGS+= --disable-rpath CONFIGURE_ENV+= UIC="${QTDIR}/bin/uic" -CONFIGURE_ENV+= USER_LDFLAGS="${LDFLAGS}" -CONFIGURE_ENV+= ac_cv_have_x="${_AC_CV_HAVE_X}" -CONFIGURE_ENV+= ac_cv_have_qt="${_AC_CV_HAVE_QT}" +CONFIGURE_ENV+= USER_LDFLAGS=${LDFLAGS:M*:Q} +CONFIGURE_ENV+= ac_cv_have_x=${_AC_CV_HAVE_X:Q} +CONFIGURE_ENV+= ac_cv_have_qt=${_AC_CV_HAVE_QT:Q} MAKE_FLAGS+= ODBCConfig_DEPENDENCIES="" diff --git a/databases/unixodbc/Makefile b/databases/unixodbc/Makefile index 690ba2fded4..be3f59a9b7b 100644 --- a/databases/unixodbc/Makefile +++ b/databases/unixodbc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/11/09 21:21:10 tv Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:01 rillig Exp $ PKGNAME= unixodbc-${ODBC_BASE_VERS} PKGREVISION= 5 @@ -12,8 +12,8 @@ USE_PKGINSTALL= yes USE_TOOLS+= flex # to get libodbctxt.la CONFIGURE_ARGS+= --disable-gui -PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} -FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR} +PLIST_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q} +FILES_SUBST+= UNIXODBC_DRIVERS_DIR=${UNIXODBC_DRIVERS_DIR:Q} EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/databases/xmysql/Makefile b/databases/xmysql/Makefile index 13b458f1fc3..572495c82d7 100644 --- a/databases/xmysql/Makefile +++ b/databases/xmysql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/06/01 18:02:42 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= xmysql-1.10 @@ -12,7 +12,7 @@ COMMENT= Graphical front end to the MySQL database engine BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 -MAKE_ENV+= X11PREFIX=${X11PREFIX} +MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} BUILD_TARGET= xmysql diff --git a/databases/xmysqladmin/Makefile b/databases/xmysqladmin/Makefile index 6442cdaa030..25f7d11bbcb 100644 --- a/databases/xmysqladmin/Makefile +++ b/databases/xmysqladmin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:42 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= xmysqladmin-1.0 @@ -16,7 +16,7 @@ COMMENT= Graphical front end for administering MySQL databases BUILDLINK_DEPENDS.mysql-client= mysql-client>=3.23.35 -MAKE_ENV+= X11PREFIX=${X11PREFIX} +MAKE_ENV+= X11PREFIX=${X11PREFIX:Q} BUILD_TARGET= xmysqladmin diff --git a/databases/xsqlmenu/Makefile b/databases/xsqlmenu/Makefile index 7defb2350ba..8f566c557fd 100644 --- a/databases/xsqlmenu/Makefile +++ b/databases/xsqlmenu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/16 06:57:44 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:01 rillig Exp $ # DISTNAME= xsqlmenu-2.10 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.jlab.org/~saw/xsqlmenu/ COMMENT= X based GUI for MySQL USE_TOOLS+= gmake -MAKE_ENV+= MAKE=${MAKE_PROGRAM} +MAKE_ENV+= MAKE=${MAKE_PROGRAM:Q} INSTALLATION_DIRS= bin |