From 579e97796954edc2469fac176e855589e1dc2997 Mon Sep 17 00:00:00 2001 From: rillig Date: Mon, 5 Dec 2005 23:55:01 +0000 Subject: Ran "pkglint --autofix", which corrected some of the quoting issues in CONFIGURE_ARGS. --- sysutils/adtool/Makefile | 4 ++-- sysutils/amanda-common/Makefile.common | 14 +++++++------- sysutils/apcupsd/Makefile | 4 ++-- sysutils/bacula/Makefile | 6 +++--- sysutils/bacula/Makefile.common | 8 ++++---- sysutils/bacula/options.mk | 6 +++--- sysutils/cdbkup/Makefile | 6 +++--- sysutils/dbus/Makefile.common | 6 +++--- sysutils/desktop-file-utils/Makefile | 4 ++-- sysutils/fam/Makefile | 4 ++-- sysutils/file/Makefile | 4 ++-- sysutils/findutils/Makefile | 4 ++-- sysutils/gamin/Makefile | 4 ++-- sysutils/gentoo/Makefile | 4 ++-- sysutils/gnome-vfs2/Makefile.common | 4 ++-- sysutils/libirman/Makefile | 4 ++-- sysutils/nautilus-cd-burner/Makefile | 4 ++-- sysutils/nautilus/Makefile | 4 ++-- sysutils/rsnapshot/Makefile | 6 +++--- sysutils/tpb/Makefile | 4 ++-- sysutils/ups-nut-cgi/Makefile | 12 ++++++------ sysutils/ups-nut/Makefile | 20 ++++++++++---------- sysutils/xcdroast/Makefile | 4 ++-- sysutils/xosview/Makefile | 4 ++-- 24 files changed, 72 insertions(+), 72 deletions(-) (limited to 'sysutils') diff --git a/sysutils/adtool/Makefile b/sysutils/adtool/Makefile index 620152a6e02..1dab1722a40 100644 --- a/sysutils/adtool/Makefile +++ b/sysutils/adtool/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:47:22 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= adtool-1.2 @@ -17,7 +17,7 @@ USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes PTHREAD_OPTS+= require -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/adtool CONF_FILES= ${EGDIR}/adtool.cfg.dist ${PKG_SYSCONFDIR}/adtool.cfg diff --git a/sysutils/amanda-common/Makefile.common b/sysutils/amanda-common/Makefile.common index b833cd4cbed..eddcaa3e523 100644 --- a/sysutils/amanda-common/Makefile.common +++ b/sysutils/amanda-common/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:19 rillig Exp $ # # common make file fragment shared by all amanda-* pkgs. # @@ -34,13 +34,13 @@ CONFIGURE_ENV+= GNUTAR=${TOOLS_GTAR:Q} TOOLS_DEPENDS.gtar= {gtar,gtar-base}>=1.12:../../archivers/gtar-base GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-user=${AMANDA_USER} -CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP} -CONFIGURE_ARGS+= --with-owner=${ROOT_USER} +CONFIGURE_ARGS+= --with-user=${AMANDA_USER:Q} +CONFIGURE_ARGS+= --with-group=${AMANDA_GROUP:Q} +CONFIGURE_ARGS+= --with-owner=${ROOT_USER:Q} CONFIGURE_ARGS+= --with-mmap CONFIGURE_ARGS+= --with-amandahosts -CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP} -CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR} +CONFIGURE_ARGS+= --with-tmpdir=${AMANDA_TMP:Q} +CONFIGURE_ARGS+= --localstatedir=${AMANDA_VAR:Q} CONFIGURE_ARGS+= --with-gnutar-listdir=${AMANDA_VAR}/gnutar-lists CONFIGURE_ARGS+= --with-dump-honor-nodump -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} diff --git a/sysutils/apcupsd/Makefile b/sysutils/apcupsd/Makefile index 193e1a117ab..25d103c55ae 100644 --- a/sysutils/apcupsd/Makefile +++ b/sysutils/apcupsd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 23:55:19 rillig Exp $ DISTNAME= apcupsd-3.8.6 PKGREVISION= 4 @@ -30,7 +30,7 @@ CONFIGURE_ARGS+= --with-catgets # use catgets functions CONFIGURE_ARGS+= --enable-nls # i18n support CONFIGURE_ARGS+= --with-lock-dir=${VARBASE}/spool/lock CONFIGURE_ARGS+= --with-serial-dev=/dev/tty01 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # configure sets sbindir to '${prefix}/sbin' without expanding $prefix # this breaks .in files that uses @sbindir@ CONFIGURE_ARGS+= --sbindir=${PREFIX}/sbin diff --git a/sysutils/bacula/Makefile b/sysutils/bacula/Makefile index 84aa436c156..88170d48fa2 100644 --- a/sysutils/bacula/Makefile +++ b/sysutils/bacula/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:19 rillig Exp $ CONFLICTS+= bacula-client-[0-9]* @@ -8,8 +8,8 @@ PLIST_SUBST+= BACULA_DB=${BACULA_DB:Q} MESSAGE_SUBST+= PREFIX=${PREFIX} MESSAGE_SUBST+= PKGNAME_NOREV=${PKGNAME_NOREV} -CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER} --with-dir-group=${BACULA_GROUP} -CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER} --with-sd-group=${BACULA_GROUP} +CONFIGURE_ARGS+= --with-dir-user=${BACULA_DIR_USER:Q} --with-dir-group=${BACULA_GROUP:Q} +CONFIGURE_ARGS+= --with-sd-user=${BACULA_SD_USER:Q} --with-sd-group=${BACULA_GROUP:Q} BUILD_DEFS+= BACULA_DIR_USER BACULA_SD_USER BACULA_GROUP diff --git a/sysutils/bacula/Makefile.common b/sysutils/bacula/Makefile.common index d6b97b18cfc..a95cef6dedb 100644 --- a/sysutils/bacula/Makefile.common +++ b/sysutils/bacula/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:19 rillig Exp $ DISTNAME= bacula-1.38.1 CATEGORIES= sysutils @@ -30,11 +30,11 @@ FILES_SUBST+= BACULA_GROUP=${BACULA_GROUP:Q} FILES_SUBST+= BACULA_DIR_USER=${BACULA_DIR_USER:Q} FILES_SUBST+= BACULA_SD_USER=${BACULA_SD_USER:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-scriptdir=${PREFIX}/libexec/bacula CONFIGURE_ARGS+= --with-sbin-perm=0755 -CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR} -CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR} +CONFIGURE_ARGS+= --with-working-dir=${BACULA_WORKINGDIR:Q} +CONFIGURE_ARGS+= --with-pid-dir=${BACULA_PIDDIR:Q} CONFIGURE_ARGS+= --with-readline=${PREFIX}/include/readline PKG_GROUPS= ${BACULA_GROUP} diff --git a/sysutils/bacula/options.mk b/sysutils/bacula/options.mk index 822a4876e07..11a40efff0d 100644 --- a/sysutils/bacula/options.mk +++ b/sysutils/bacula/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/11/22 19:48:32 tv Exp $ +# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:19 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.bacula PKG_OPTIONS_REQUIRED_GROUPS= database @@ -17,10 +17,10 @@ CONFIGURE_ARGS+= --with-sqlite3=${BUILDLINK_PREFIX.sqlite3} BACULA_DB= sqlite3 .elif !empty(PKG_OPTIONS:Mcatalog-pgsql) . include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX:Q} BACULA_DB= postgresql .elif !empty(PKG_OPTIONS:Mcatalog-mysql) . include "../../mk/mysql.buildlink3.mk" -CONFIGURE_ARGS+= --with-mysql=${PREFIX} +CONFIGURE_ARGS+= --with-mysql=${PREFIX:Q} BACULA_DB= mysql .endif diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile index 4a596434383..ec12464a231 100644 --- a/sysutils/cdbkup/Makefile +++ b/sysutils/cdbkup/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:19 rillig Exp $ DISTNAME= cdbkup-1.0 PKGREVISION= 3 @@ -29,8 +29,8 @@ CDBKUP_SNARDIR?= /var/db/${PKGBASE} CDBKUP_DUMPGRP?= operator .endif -CONFIGURE_ARGS+= --with-snardir=${CDBKUP_SNARDIR} \ - --with-dumpgrp=${CDBKUP_DUMPGRP} +CONFIGURE_ARGS+= --with-snardir=${CDBKUP_SNARDIR:Q} \ + --with-dumpgrp=${CDBKUP_DUMPGRP:Q} PLIST_SUBST+= CDBKUP_SNARDIR=${CDBKUP_SNARDIR:Q} \ CDBKUP_DUMPGRP=${CDBKUP_DUMPGRP:Q} \ INSTALL=${INSTALL:Q} RMDIR=${RMDIR:Q} TRUE=${TRUE:Q} diff --git a/sysutils/dbus/Makefile.common b/sysutils/dbus/Makefile.common index ffc4acd8b69..b03d3ba7dfa 100644 --- a/sysutils/dbus/Makefile.common +++ b/sysutils/dbus/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:51:00 rillig Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/12/05 23:55:19 rillig Exp $ # # XXX Do not update to 0.30 or above yet. The API in the 0.2x series is @@ -37,8 +37,8 @@ CONFIGURE_ARGS+= --disable-mono-docs CONFIGURE_ARGS+= --disable-python CONFIGURE_ARGS+= --disable-selinux CONFIGURE_ARGS+= --enable-checks -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-xml=expat CONFIGURE_ARGS+= --without-x diff --git a/sysutils/desktop-file-utils/Makefile b/sysutils/desktop-file-utils/Makefile index 5c677865ed1..77be1daa64b 100644 --- a/sysutils/desktop-file-utils/Makefile +++ b/sysutils/desktop-file-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:23 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= desktop-file-utils-0.10 @@ -16,7 +16,7 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= EMACS=no INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile index 16b9463d273..1f334330e81 100644 --- a/sysutils/fam/Makefile +++ b/sysutils/fam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/10/31 13:03:32 joerg Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= fam-2.7.0 @@ -24,7 +24,7 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES USE_LANGUAGES= c c++ -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/fam CONF_FILES= ${EGDIR}/fam.conf ${PKG_SYSCONFDIR}/fam.conf diff --git a/sysutils/file/Makefile b/sysutils/file/Makefile index fe53f7ffd5c..52362936ce4 100644 --- a/sysutils/file/Makefile +++ b/sysutils/file/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:23 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:19 rillig Exp $ DISTNAME= file-4.13 CATEGORIES= sysutils @@ -11,7 +11,7 @@ COMMENT= Tool for determining file type GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-fsect-man5 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} MESSAGE_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR} diff --git a/sysutils/findutils/Makefile b/sysutils/findutils/Makefile index f9aa8eb4948..3b068441f2f 100644 --- a/sysutils/findutils/Makefile +++ b/sysutils/findutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:00 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:19 rillig Exp $ DISTNAME= findutils-4.1 PKGREVISION= 4 @@ -26,7 +26,7 @@ PLIST_SUBST+= USE_CATMAN="" .endif .if defined(GNU_PROGRAM_PREFIX) -CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} .endif PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX diff --git a/sysutils/gamin/Makefile b/sysutils/gamin/Makefile index a66aefc4623..207dde996ab 100644 --- a/sysutils/gamin/Makefile +++ b/sysutils/gamin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:00 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:19 rillig Exp $ DISTNAME= gamin-0.1.5 PKGREVISION= 1 @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-debug CONFIGURE_ARGS+= --disable-gtk-doc CONFIGURE_ARGS+= --without-threads -CONFIGURE_ARGS+= --with-html-dir=${DOCDIR} +CONFIGURE_ARGS+= --with-html-dir=${DOCDIR:Q} # glib2/buildlink3.mk pulls in gettext-lib/buildlink3.mk, but the gamin # libraries don't need to be linked against -lintl automatically. diff --git a/sysutils/gentoo/Makefile b/sysutils/gentoo/Makefile index a3dba258732..fe3ba2dda6d 100644 --- a/sysutils/gentoo/Makefile +++ b/sysutils/gentoo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/30 15:29:13 adam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:19 rillig Exp $ DISTNAME= gentoo-0.11.55 CATEGORIES= sysutils @@ -13,7 +13,7 @@ BUILD_USES_MSGFMT= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/gentoo CONF_FILES= ${EGDIR}/gentoorc ${PKG_SYSCONFDIR}/gentoorc diff --git a/sysutils/gnome-vfs2/Makefile.common b/sysutils/gnome-vfs2/Makefile.common index bd24a8c6479..ae0d392affb 100644 --- a/sysutils/gnome-vfs2/Makefile.common +++ b/sysutils/gnome-vfs2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2005/12/05 20:51:00 rillig Exp $ +# $NetBSD: Makefile.common,v 1.25 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= gnome-vfs-2.12.1.1 @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --disable-openssl CONFIGURE_ARGS+= --disable-samba CONFIGURE_ARGS+= --enable-gnutls CONFIGURE_ARGS+= --enable-platform-gnome-2 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CPPFLAGS+= -DPREFIX="\"${PREFIX}\"" diff --git a/sysutils/libirman/Makefile b/sysutils/libirman/Makefile index ce58ba41c8e..fc274e8a29c 100644 --- a/sysutils/libirman/Makefile +++ b/sysutils/libirman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2004/12/31 20:31:19 minskim Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= libirman-0.4.1b @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/irman.conf ${PKG_SYSCONFDIR}/irman.conf diff --git a/sysutils/nautilus-cd-burner/Makefile b/sysutils/nautilus-cd-burner/Makefile index fb2e18b8aaa..892a9935728 100644 --- a/sysutils/nautilus-cd-burner/Makefile +++ b/sysutils/nautilus-cd-burner/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= nautilus-cd-burner-2.12.1 @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= libnautilus-burn.pc.in CONFIGURE_ARGS+= --disable-hal -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CPPFLAGS+= -D__unix__ diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile index 396c4f29ffc..858afbaad5d 100644 --- a/sysutils/nautilus/Makefile +++ b/sysutils/nautilus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.55 2005/12/05 23:55:19 rillig Exp $ # DISTNAME= nautilus-2.12.1 @@ -22,7 +22,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes PKGCONFIG_OVERRIDE= libnautilus-extension/libnautilus-extension.pc.in -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} GCONF2_SCHEMAS= apps_nautilus_preferences.schemas diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile index 7414c4acd7a..73778e54f88 100644 --- a/sysutils/rsnapshot/Makefile +++ b/sysutils/rsnapshot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/09/13 11:47:49 abs Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= rsnapshot-1.2.1 @@ -22,8 +22,8 @@ EGDIR= ${PREFIX}/share/examples/${PKGBASE} CONF_FILES+= ${EGDIR}/rsnapshot.conf.default \ ${PKG_SYSCONFDIR}/rsnapshot.conf -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-rsync=${LOCALBASE}/bin/rsync INSTALLATION_DIRS= bin man/man1 diff --git a/sysutils/tpb/Makefile b/sysutils/tpb/Makefile index 2437ca14024..f4a5c19c79d 100644 --- a/sysutils/tpb/Makefile +++ b/sysutils/tpb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/11/15 14:48:13 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= tpb-0.6.1 @@ -16,7 +16,7 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= yes GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/tpb CONF_FILES= ${EGDIR}/tpbrc ${PKG_SYSCONFDIR}/tpbrc diff --git a/sysutils/ups-nut-cgi/Makefile b/sysutils/ups-nut-cgi/Makefile index 125808a01ca..16c7d367111 100644 --- a/sysutils/ups-nut-cgi/Makefile +++ b/sysutils/ups-nut-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/01 18:03:23 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 23:55:20 rillig Exp $ DISTNAME= nut-2.0.1 PKGNAME= ups-nut-cgi-2.0.1 @@ -16,12 +16,12 @@ INSTALL_TARGET= install-cgi USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ - --datadir=${NUT_DATADIR} \ - --localstatedir=${NUT_STATEDIR} \ - --with-statepath=${NUT_STATEDIR} \ +CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR:Q} \ + --datadir=${NUT_DATADIR:Q} \ + --localstatedir=${NUT_STATEDIR:Q} \ + --with-statepath=${NUT_STATEDIR:Q} \ --with-cgi \ - --with-cgipath=${NUT_CGIDIR} + --with-cgipath=${NUT_CGIDIR:Q} PKG_SYSCONFSUBDIR?= nut NUT_CONFDIR= ${PKG_SYSCONFDIR} diff --git a/sysutils/ups-nut/Makefile b/sysutils/ups-nut/Makefile index 10ed8402c2f..15ec5e07d57 100644 --- a/sysutils/ups-nut/Makefile +++ b/sysutils/ups-nut/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:01 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= nut-2.0.1 @@ -12,15 +12,15 @@ COMMENT= Network UPS Tools USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR} \ - --datadir=${NUT_DATADIR} \ - --localstatedir=${NUT_STATEDIR} \ - --with-user=${NUT_USER} \ - --with-group=${NUT_GROUP} \ - --with-statepath=${NUT_STATEDIR} \ - --with-drvpath=${NUT_DRVDIR} \ - --with-altpidpath=${NUT_STATEDIR} \ - --with-pidpath=${NUT_STATEDIR} +CONFIGURE_ARGS+= --sysconfdir=${NUT_CONFDIR:Q} \ + --datadir=${NUT_DATADIR:Q} \ + --localstatedir=${NUT_STATEDIR:Q} \ + --with-user=${NUT_USER:Q} \ + --with-group=${NUT_GROUP:Q} \ + --with-statepath=${NUT_STATEDIR:Q} \ + --with-drvpath=${NUT_DRVDIR:Q} \ + --with-altpidpath=${NUT_STATEDIR:Q} \ + --with-pidpath=${NUT_STATEDIR:Q} PKG_SYSCONFSUBDIR?= nut NUT_CONFDIR= ${PKG_SYSCONFDIR} diff --git a/sysutils/xcdroast/Makefile b/sysutils/xcdroast/Makefile index af3051b5a9c..466feb603f2 100644 --- a/sysutils/xcdroast/Makefile +++ b/sysutils/xcdroast/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/05 20:51:02 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:20 rillig Exp $ DISTNAME= xcdroast-0.98alpha15 PKGNAME= xcdroast-0.98a15 @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-gtk2 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/sysutils/xosview/Makefile b/sysutils/xosview/Makefile index ea4a14414ca..32b6b39a2d7 100644 --- a/sysutils/xosview/Makefile +++ b/sysutils/xosview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/12/05 20:51:02 rillig Exp $ +# $NetBSD: Makefile,v 1.56 2005/12/05 23:55:20 rillig Exp $ DISTNAME= xosview-1.8.2 PKGREVISION= 1 @@ -15,7 +15,7 @@ USE_X11BASE= YES USE_LANGUAGES= c++ HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --x-includes=${X11BASE}/include CONFIGURE_ARGS+= --x-libraries=${X11BASE}/lib -- cgit v1.2.3