diff options
447 files changed, 1184 insertions, 1184 deletions
diff --git a/archivers/dact/Makefile b/archivers/dact/Makefile index 9c1d3877281..4238d3e3210 100644 --- a/archivers/dact/Makefile +++ b/archivers/dact/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/07 17:15:40 joerg Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:01 rillig Exp $ # DISTNAME= dact-0.8.3 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_TOOLS+= gmake -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= ac_cv_lib_mcrypt_main=no INSTALLATION_DIRS= bin man/man1 diff --git a/archivers/gcpio/Makefile b/archivers/gcpio/Makefile index 3c5d9ad39b3..849f0a91e7a 100644 --- a/archivers/gcpio/Makefile +++ b/archivers/gcpio/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/01 16:41:29 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:01 rillig Exp $ # DISTNAME= cpio-2.6 @@ -25,7 +25,7 @@ LIBS+= -lgnumalloc .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/archivers/gsharutils/Makefile b/archivers/gsharutils/Makefile index ca888043bda..d36f2c810fe 100644 --- a/archivers/gsharutils/Makefile +++ b/archivers/gsharutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/12/01 16:41:29 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:01 rillig Exp $ DISTNAME= sharutils-4.2.1 PKGNAME= g${DISTNAME} @@ -40,7 +40,7 @@ CPPFLAGS+= -D_nl_default_dirname=libintl_nl_default_dirname .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/archivers/gtar-base/Makefile b/archivers/gtar-base/Makefile index fec8c665f1e..a6893532272 100644 --- a/archivers/gtar-base/Makefile +++ b/archivers/gtar-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/12/01 16:41:29 rillig Exp $ +# $NetBSD: Makefile,v 1.47 2005/12/05 23:55:01 rillig Exp $ # DISTNAME= tar-1.15.1 @@ -30,7 +30,7 @@ GTAR_PROGRAM_PREFIX?= g # pax installs a "tar" also CONFLICTS+= pax-[0-9]* .else -CONFIGURE_ARGS+= --program-prefix=${GTAR_PROGRAM_PREFIX} +CONFIGURE_ARGS+= --program-prefix=${GTAR_PROGRAM_PREFIX:Q} .endif # lie to configure about gettext -- it does not need GNU gettext diff --git a/archivers/szip/Makefile b/archivers/szip/Makefile index 85d0dcaf374..b913027d124 100644 --- a/archivers/szip/Makefile +++ b/archivers/szip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/02/24 16:20:25 adam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:01 rillig Exp $ DISTNAME= szip-2.0 CATEGORIES= archivers @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} LICENSE= no-commercial-use INSTALLATION_DIRS= include lib diff --git a/audio/bmp/Makefile.common b/audio/bmp/Makefile.common index 21c68cfa32f..51479a275f8 100644 --- a/audio/bmp/Makefile.common +++ b/audio/bmp/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2005/10/19 15:09:37 minskim Exp $ +# $NetBSD: Makefile.common,v 1.16 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= bmp-0.9.7 @@ -60,7 +60,7 @@ CONFIGURE_ARGS+= --with-xmms-eq .if ${OPSYS} == "NetBSD" RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j -CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND} \ +CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND:Q} \ --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh} \ --with-cdda-dir=/cdrom/ diff --git a/audio/esound/Makefile b/audio/esound/Makefile index 1d77c12b84e..1325af8655e 100644 --- a/audio/esound/Makefile +++ b/audio/esound/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/12/05 20:49:47 rillig Exp $ +# $NetBSD: Makefile,v 1.59 2005/12/05 23:55:02 rillig Exp $ DISTNAME= esound-0.2.36 CATEGORIES= audio @@ -16,7 +16,7 @@ USE_LIBTOOL= YES PKGCONFIG_OVERRIDE= esound.pc.in GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/esound CONF_FILES= ${EGDIR}/esd.conf ${PKG_SYSCONFDIR}/esd.conf diff --git a/audio/icecast1/Makefile b/audio/icecast1/Makefile index 430c1c150bb..617172e7c9e 100644 --- a/audio/icecast1/Makefile +++ b/audio/icecast1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/12/05 20:49:48 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= icecast-1.3.12 @@ -19,7 +19,7 @@ PKG_SYSCONFSUBDIR= icecast CONFIGURE_ARGS+= --with-readline \ --with-libwrap \ --with-python \ - --sysconfdir=${PKG_SYSCONFDIR} + --sysconfdir=${PKG_SYSCONFDIR:Q} CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline CPPFLAGS+= ${BUILDLINK_CPPFLAGS.${PYPACKAGE}} LDFLAGS+= ${BUILDLINK_LDFLAGS.${PYPACKAGE}} diff --git a/audio/ices-mp3/Makefile b/audio/ices-mp3/Makefile index 7fa13fc23ee..745a33e12a5 100644 --- a/audio/ices-mp3/Makefile +++ b/audio/ices-mp3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 01:52:58 kim Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= ices-${ICES_VERSION} @@ -21,9 +21,9 @@ ICES_USE_PERL?= NO ICES_USE_PYTHON?= NO CONFIGURE_ARGS+= --program-suffix=-mp3 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-docdir=${DOCDIR} -CONFIGURE_ARGS+= --with-moddir=${MODDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-docdir=${DOCDIR:Q} +CONFIGURE_ARGS+= --with-moddir=${MODDIR:Q} PKG_SYSCONFSUBDIR= icecast #RCD_SCRIPTS= ${PKGBASE} @@ -59,11 +59,11 @@ do-install: .include "../../audio/libvorbis/buildlink3.mk" .if defined(ICES_USE_PERL) && (${ICES_USE_PERL} == "YES") .include "../../lang/perl5/buildlink3.mk" -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} .endif .if defined(ICES_USE_PYTHON) && (${ICES_USE_PYTHON} == "YES") .include "../../lang/python/application.mk" -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} .endif .include "../../textproc/libxml2/buildlink3.mk" diff --git a/audio/rplay/Makefile b/audio/rplay/Makefile index 4a8126b3117..945937b6913 100644 --- a/audio/rplay/Makefile +++ b/audio/rplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/12/05 20:49:49 rillig Exp $ +# $NetBSD: Makefile,v 1.51 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= rplay-3.3.2 @@ -14,7 +14,7 @@ COMMENT= Network audio player USE_PKGINSTALL= YES USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --build=BUILD USE_MAKEINFO= YES diff --git a/audio/timidity/Makefile b/audio/timidity/Makefile index 7debf9b2e8f..2fda3739ba3 100644 --- a/audio/timidity/Makefile +++ b/audio/timidity/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/04/11 21:44:57 tv Exp $ +# $NetBSD: Makefile,v 1.53 2005/12/05 23:55:02 rillig Exp $ DISTNAME= TiMidity++-2.13.2 PKGNAME= ${DISTNAME:S/TiMidity++/timidity/} @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --enable-gtk --enable-wrd --enable-xaw --enable-ncurses CONFIGURE_ARGS+= --with-libFLAC="${BUILDLINK_DIR}/include" CONFIGURE_ARGS+= --with-ogg="${BUILDLINK_DIR}/include" CONFIGURE_ARGS+= --with-vorbis="${BUILDLINK_DIR}/include" -CONFIGURE_ARGS+= --with-default-path="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --with-default-path=${PKG_SYSCONFDIR:Q} SUBST_CLASSES+= confdir SUBST_MESSAGE.confdir= "Configuring to use PKG_SYSCONFDIR." diff --git a/audio/ubs/Makefile b/audio/ubs/Makefile index 9eb1e6ce4c0..560f2ef90b3 100644 --- a/audio/ubs/Makefile +++ b/audio/ubs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:49:50 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= ubs-0.17 @@ -15,7 +15,7 @@ USE_PKGINSTALL= yes RCD_SCRIPTS= ubs PKG_SYSCONFSUBDIR= ubs -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/audio/wsoundserver/Makefile b/audio/wsoundserver/Makefile index 1bacaaca20f..08ff7f0561b 100644 --- a/audio/wsoundserver/Makefile +++ b/audio/wsoundserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/31 16:43:05 tv Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= WSoundServer-0.4.0 @@ -17,7 +17,7 @@ USE_LIBTOOL= YES USE_PKGINSTALL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} # not really needed +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # not really needed PKG_SYSCONFSUBDIR= WindowMaker EGDIR= ${PREFIX}/share/examples/wsoundserver CONF_FILES= ${EGDIR}/WMSound ${PKG_SYSCONFDIR}/WMSound diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common index d968ef8e2d6..5777db86b86 100644 --- a/audio/xmms/Makefile.common +++ b/audio/xmms/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.21 2005/12/05 20:49:50 rillig Exp $ +# $NetBSD: Makefile.common,v 1.22 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= xmms-1.2.10 @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --enable-ipv6 .if ${OPSYS} == "NetBSD" RAWPART_cmd= /sbin/sysctl -n kern.rawpartition | ${TR} 0-9 a-j -CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND} \ +CONFIGURE_ARGS+= --with-dev-dsp=${DEVOSSSOUND:Q} \ --with-cdda-device=/dev/rcd0${RAWPART_cmd:sh} \ --with-cdda-dir=/cdrom/ CPPFLAGS+= -DHAVE_NANOSLEEP=1 diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile index 7457263b78d..a22cf608deb 100644 --- a/audio/xmp/Makefile +++ b/audio/xmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/10/31 16:52:39 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:02 rillig Exp $ DISTNAME= xmp-2.0.4 PKGREVISION= 2 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+=--disable-alsa \ --disable-oss \ --disable-xmms \ - --sysconfdir=${PKG_SYSCONFDIR} + --sysconfdir=${PKG_SYSCONFDIR:Q} USE_TOOLS+= gmake diff --git a/audio/xsidplay/Makefile b/audio/xsidplay/Makefile index 4fc98909505..b5800d862d0 100644 --- a/audio/xsidplay/Makefile +++ b/audio/xsidplay/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.33 2005/12/05 20:49:50 rillig Exp $ +# $NetBSD: Makefile,v 1.34 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= xsidplay-1.6.5.1a @@ -17,7 +17,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake MAKE_ENV+= MACHINE_ARCH=${MACHINE_ARCH:Q} -CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} +CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} CONFIGURE_ENV+= DISABLE_ESD_TEST=yes CONFIGURE_ENV+= DISABLE_ARTSD_TEST=yes diff --git a/cad/sci-wcalc/Makefile b/cad/sci-wcalc/Makefile index bc7ecf5bcf6..a6d152687ef 100644 --- a/cad/sci-wcalc/Makefile +++ b/cad/sci-wcalc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/12/05 20:49:52 rillig Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 23:55:02 rillig Exp $ # .include "../../cad/wcalc/Makefile.common" @@ -15,7 +15,7 @@ CONFIGURE_ARGS+= --disable-libwcalc CONFIGURE_ARGS+= --disable-stdio CONFIGURE_ARGS+= --without-matlab CONFIGURE_ARGS+= --without-octave -CONFIGURE_ARGS+= --with-scilab=${SCI} +CONFIGURE_ARGS+= --with-scilab=${SCI:Q} PLIST_SUBST+= SCIVERSION=${SCIVERSION:Q} MESSAGE_SUBST+= SCIVERSION=${SCIVERSION} diff --git a/cad/wcalc/Makefile.common b/cad/wcalc/Makefile.common index bbb74deb593..da41a0bae72 100644 --- a/cad/wcalc/Makefile.common +++ b/cad/wcalc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:49:52 rillig Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= wcalc-0.9 @@ -34,9 +34,9 @@ WCALC_CGIPATH?= /cgi-wcalc/ # setup the directories and URI path CONFIGURE_ARGS+= --with-htmldir=${PREFIX}/${WCALC_HTMLDIR} -CONFIGURE_ARGS+= --with-htmlpath=${WCALC_HTMLPATH} +CONFIGURE_ARGS+= --with-htmlpath=${WCALC_HTMLPATH:Q} CONFIGURE_ARGS+= --with-cgibin=${PREFIX}/${WCALC_CGIDIR} -CONFIGURE_ARGS+= --with-cgipath=${WCALC_CGIPATH} +CONFIGURE_ARGS+= --with-cgipath=${WCALC_CGIPATH:Q} # make sure we can refer to these paths in the MESSAGE MESSAGE_SUBST+= WCALC_CGIDIR=${WCALC_CGIDIR} diff --git a/chat/bitlbee/Makefile b/chat/bitlbee/Makefile index 3b9dd616739..eca8ee73ffd 100644 --- a/chat/bitlbee/Makefile +++ b/chat/bitlbee/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= bitlbee-0.99 @@ -13,11 +13,11 @@ HAS_CONFIGURE= yes USE_TOOLS+= gmake pkg-config USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin -CONFIGURE_ARGS+= --etcdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --datadir=${DATADIR} -CONFIGURE_ARGS+= --config=${STATEDIR} +CONFIGURE_ARGS+= --etcdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --datadir=${DATADIR:Q} +CONFIGURE_ARGS+= --config=${STATEDIR:Q} CONFIGURE_ARGS+= --flood=1 CONFIGURE_ARGS+= --ssl=openssl diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile index e90df3e215b..4d768e8338a 100644 --- a/chat/centericq/Makefile +++ b/chat/centericq/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.56 2005/12/05 20:49:52 rillig Exp $ +# $NetBSD: Makefile,v 1.57 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= centericq-4.21.0 @@ -17,7 +17,7 @@ USE_TOOLS+= gmake perl:run USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-ssl --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config LIBS+= ${LDFLAGS} diff --git a/chat/dircproxy-devel/Makefile b/chat/dircproxy-devel/Makefile index 16084c4e29a..2843afb6348 100644 --- a/chat/dircproxy-devel/Makefile +++ b/chat/dircproxy-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:02 rillig Exp $ DISTNAME= dircproxy-1.1.0 CATEGORIES= chat @@ -16,7 +16,7 @@ CONFLICTS= dircproxy-1.0.[0-9]* REPLACE_PERL= contrib/log.pl contrib/privmsg-log.pl -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/dircproxy CONF_FILES= ${EGDIR}/dircproxyrc ${PKG_SYSCONFDIR}/dircproxyrc diff --git a/chat/dircproxy/Makefile b/chat/dircproxy/Makefile index 33a892aaf96..4f9df3bc44c 100644 --- a/chat/dircproxy/Makefile +++ b/chat/dircproxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:02 rillig Exp $ DISTNAME= dircproxy-1.0.5 PKGREVISION= 2 @@ -17,7 +17,7 @@ CONFLICTS= dircproxy-1.1.[0-9]* REPLACE_PERL= contrib/log.pl contrib/privmsg-log.pl -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/dircproxy CONF_FILES= ${EGDIR}/dircproxyrc ${PKG_SYSCONFDIR}/dircproxyrc diff --git a/chat/eggdrop/Makefile b/chat/eggdrop/Makefile index edb443ddf76..5e0f7d30241 100644 --- a/chat/eggdrop/Makefile +++ b/chat/eggdrop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:42 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:02 rillig Exp $ DISTNAME= eggdrop1.6.17 PKGNAME= eggdrop-1.6.17 @@ -13,7 +13,7 @@ COMMENT= IRC robot with TCL scripting and multi-channel ability USE_PKGINSTALL= yes GNU_CONFIGURE= yes BUILD_DEFS+= USE_INET6 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= TCLLIB="${PREFIX}/lib" TCLINC="${PREFIX}/include" .include "../../mk/bsd.prefs.mk" diff --git a/chat/gale/Makefile b/chat/gale/Makefile index 31aa7130891..e75be26ded7 100644 --- a/chat/gale/Makefile +++ b/chat/gale/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 20:49:52 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:02 rillig Exp $ DISTNAME= gale-0.99fruit PKGNAME= gale-0.99f @@ -15,7 +15,7 @@ USE_GNU_READLINE= yes # needs rl_named_function() USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig ${WRKSRC}/liboopltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= PROG_GLIB_CONFIG=${GLIB_CONFIG:Q} CPPFLAGS+= -I${BUILDLINK_PREFIX.rsaref}/include/rsaref diff --git a/chat/gnomeicu/Makefile b/chat/gnomeicu/Makefile index f3a5b699000..1ce0d901ce8 100644 --- a/chat/gnomeicu/Makefile +++ b/chat/gnomeicu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/08/10 20:56:13 jlam Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 23:55:02 rillig Exp $ DISTNAME= gnomeicu-0.99.5 CATEGORIES= chat gnome @@ -15,7 +15,7 @@ USE_TOOLS+= gmake pkg-config USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -CONFIGURE_ARGS+= --sysconfdir=${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q} EGDIR= ${PREFIX}/share/examples/gnomeicu CONF_FILES= ${EGDIR}/sound/events/GnomeICU.soundlist \ diff --git a/chat/gossip/Makefile b/chat/gossip/Makefile index bf400a5b9f1..909099c0280 100644 --- a/chat/gossip/Makefile +++ b/chat/gossip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/05 20:49:53 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:02 rillig Exp $ # DISTNAME= gossip-0.9 @@ -19,7 +19,7 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} GCONF2_SCHEMAS= gossip.schemas diff --git a/chat/ircII/Makefile b/chat/ircII/Makefile index b68e12eb16d..fb897c218cb 100644 --- a/chat/ircII/Makefile +++ b/chat/ircII/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/12/05 20:49:53 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 23:55:03 rillig Exp $ DISTNAME= ircii-${VERS} PKGNAME= ircII-${VERS} @@ -25,7 +25,7 @@ PLIST_SUBST+= VERS=${VERS:Q} WRKSRC= ${WRKDIR}/ircii-${VERS} GNU_CONFIGURE= yes .if defined(DEFAULT_IRC_SERVER) -CONFIGURE_ARGS+= --with-default-server=${DEFAULT_IRC_SERVER} +CONFIGURE_ARGS+= --with-default-server=${DEFAULT_IRC_SERVER:Q} .endif # Note: this pkg auto-detects IPv6 without regarding USE_INET6. diff --git a/chat/ircd-hybrid/Makefile b/chat/ircd-hybrid/Makefile index 8c256bd07b9..0931a65f7ad 100644 --- a/chat/ircd-hybrid/Makefile +++ b/chat/ircd-hybrid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 20:49:53 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:03 rillig Exp $ DISTNAME= ircd-hybrid-7.1.3 EXTRACT_SUFX= .tgz @@ -63,19 +63,19 @@ SUBST_SED.bpaths= -e "s|etc|etc/ircd-hybrid|g" \ -e "s|ETCPATH \"/ircd.pid\"|\"${VARBASE}/run/ircd-hybrid/ircd.pid\"|g" \ -e "s|messages|share/ircd-hybrid/messages|g" -CONFIGURE_ARGS+= --with-nicklen=${IRCD_HYBRID_NICLEN} -CONFIGURE_ARGS+= --with-topiclen=${IRCD_HYBRID_TOPICLEN} -CONFIGURE_ARGS+= --enable-syslog=${IRCD_HYBRID_SYSLOG_EVENTS} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-nicklen=${IRCD_HYBRID_NICLEN:Q} +CONFIGURE_ARGS+= --with-topiclen=${IRCD_HYBRID_TOPICLEN:Q} +CONFIGURE_ARGS+= --enable-syslog=${IRCD_HYBRID_SYSLOG_EVENTS:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/log/ircd-hybrid CONFIGURE_ARGS+= --enable-clobber .if defined(IRCD_HYBRID_SYSLOG_EVENTS) -CONFIGURE_ARGS+= --enable-syslog-facility=${IRCD_HYBRID_SYSLOG_FACILITY} +CONFIGURE_ARGS+= --enable-syslog-facility=${IRCD_HYBRID_SYSLOG_FACILITY:Q} .endif .if defined(IRCD_HYBRID_MAXCONN) -CONFIGURE_ARGS+= --with-maxconn=${IRCD_HYBRID_MAXCONN} +CONFIGURE_ARGS+= --with-maxconn=${IRCD_HYBRID_MAXCONN:Q} .endif .include "options.mk" diff --git a/chat/ircu/Makefile b/chat/ircu/Makefile index 52010b9e222..9b918fddf5d 100644 --- a/chat/ircu/Makefile +++ b/chat/ircu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/12/05 20:49:53 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= ircu2.10.11.07 @@ -18,7 +18,7 @@ GNU_CONFIGURE= YES CONFIGURE_ARGS+= --bindir=${PREFIX}/sbin CONFIGURE_ARGS+= --with-cpath=${PKG_SYSCONFDIR}/ircd.conf -CONFIGURE_ARGS+= --with-dpath=${DATADIR} +CONFIGURE_ARGS+= --with-dpath=${DATADIR:Q} CONFIGURE_ARGS+= --with-lpath=${DATADIR}/ircd.log CONFIGURE_ARGS+= --with-mode=555 CONFIGURE_ARGS+= --with-owner=0 diff --git a/chat/irssi/Makefile b/chat/irssi/Makefile index 08983247983..4e44b77def8 100644 --- a/chat/irssi/Makefile +++ b/chat/irssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/12/05 20:49:53 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 23:55:03 rillig Exp $ DISTNAME= ${IRSSI_DISTNAME} PKGREVISION= 7 @@ -20,7 +20,7 @@ USE_TOOLS+= pkg-config CONFIGURE_ARGS+= --with-terminfo \ --with-proxy \ --without-ncurses \ - --sysconfdir=${PKG_SYSCONFDIR} + --sysconfdir=${PKG_SYSCONFDIR:Q} # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE:Q} diff --git a/chat/jabberd2/Makefile b/chat/jabberd2/Makefile index 42f99d19799..886eee9923c 100644 --- a/chat/jabberd2/Makefile +++ b/chat/jabberd2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:49:53 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= jabberd-2.0s10 @@ -25,7 +25,7 @@ SUBST_MESSAGE.path= "Fixing configure script." SUBST_SED.path= -e "s,/usr/local,${PREFIX},g" \ -e "s,\$$sysconfdir/jabberd,\$$sysconfdir,g" -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --disable-mysql CONFIGURE_ARGS+= --enable-pipe CONFIGURE_ARGS+= --enable-anon diff --git a/chat/riece/Makefile b/chat/riece/Makefile index 9fa27f2c4cc..fe909dfa13f 100644 --- a/chat/riece/Makefile +++ b/chat/riece/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/08/28 04:25:28 uebayasi Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= riece-1.0.7a @@ -19,14 +19,14 @@ WRKSRC= ${WRKDIR}/${DISTNAME:C|[^0-9]$||} GNU_CONFIGURE= YES .if ${EMACS_FLAVOR} == "emacs" -CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN} +CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q} .elif ${EMACS_FLAVOR} == "xemacs" -CONFIGURE_ARGS+=--with-xemacs=${EMACS_BIN} +CONFIGURE_ARGS+=--with-xemacs=${EMACS_BIN:Q} CONFIGURE_ARGS+=--with-packagedir=${EMACS_LISPPREFIX:C|/lisp\$||} .elif ${EMACS_FLAVOR} == "xemacs" .endif # Riece digs sub directory. -CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX} +CONFIGURE_ARGS+=--with-lispdir=${EMACS_LISPPREFIX:Q} INFO_FILES= riece-ja.info diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile index 0345f7c591d..4857de4ad67 100644 --- a/chat/silc-client/Makefile +++ b/chat/silc-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/12/05 20:49:54 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= ${SILC_CLIENT_DISTNAME} @@ -33,9 +33,9 @@ CONF_FILES+= ${EGDIR}/silc.conf.default ${PKG_SYSCONFDIR}/silc.conf CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} CONFIGURE_ARGS+= --with-helpdir=${PREFIX}/share/${PKGBASE}/help CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE} -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules -CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-iconv=${BUILDLINK_DIR:Q} CONFIGURE_ARGS+= --with-terminfo CONFIGURE_ARGS+= --without-libtoolfix diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile index 38129f07d83..6357cdce461 100644 --- a/chat/silc-server/Makefile +++ b/chat/silc-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/12/05 20:49:54 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= silc-server-1.0 @@ -54,7 +54,7 @@ OWN_DIRS_PERMS+= ${VARBASE}/log/silcd ${SILCD_USER} ${SILCD_GROUP} 0700 CONFIGURE_ARGS+= --libdir=${PREFIX}/lib/${PKGBASE} CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/${PKGBASE} -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-silcd-config-file=${PKG_SYSCONFDIR}/silcd.conf CONFIGURE_ARGS+= --with-simdir=${PREFIX}/lib/${PKGBASE}/modules CONFIGURE_ARGS+= --with-logsdir=${VARBASE}/log/silcd diff --git a/chat/unrealircd/Makefile b/chat/unrealircd/Makefile index 5334bde0697..024f601f4e8 100644 --- a/chat/unrealircd/Makefile +++ b/chat/unrealircd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/01 18:09:37 adrianp Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:03 rillig Exp $ DISTNAME= Unreal3.2.3 PKGNAME= unrealircd-3.2.3 @@ -25,17 +25,17 @@ BUILDLINK_DEPENDS.tre+= tre-${TRE_NEEDED} CONFIGURE_ENV+= tre_version=${TRE_NEEDED:Q} CONFIGURE_ENV+= TRELIBS="-L${PREFIX}/lib -ltre" -CONFIGURE_ARGS+= --with-dpath=${UIRCD_HOME} +CONFIGURE_ARGS+= --with-dpath=${UIRCD_HOME:Q} CONFIGURE_ARGS+= --with-spath=${PREFIX}/sbin/ircd CONFIGURE_ARGS+= --with-permissions=0660 CONFIGURE_ARGS+= --enable-dynamic-linking -CONFIGURE_ARGS+= --with-hostname=${UIRCD_HOST} -CONFIGURE_ARGS+= --with-listen=${UIRCD_LISTEN} -CONFIGURE_ARGS+= --with-sendq=${UIRCD_SENDQ} -CONFIGURE_ARGS+= --with-bufferpool=${UIRCD_BUFFER} -CONFIGURE_ARGS+= --with-fd-setsize=${UIRCD_FDSIZE} -CONFIGURE_ARGS+= --with-nick-history=${UIRCD_NICKHIST} +CONFIGURE_ARGS+= --with-hostname=${UIRCD_HOST:Q} +CONFIGURE_ARGS+= --with-listen=${UIRCD_LISTEN:Q} +CONFIGURE_ARGS+= --with-sendq=${UIRCD_SENDQ:Q} +CONFIGURE_ARGS+= --with-bufferpool=${UIRCD_BUFFER:Q} +CONFIGURE_ARGS+= --with-fd-setsize=${UIRCD_FDSIZE:Q} +CONFIGURE_ARGS+= --with-nick-history=${UIRCD_NICKHIST:Q} CONFIGURE_ARGS+= --disable-inet6 .include "options.mk" diff --git a/chat/unrealircd/options.mk b/chat/unrealircd/options.mk index 4d4f63c3995..6a660d4dfee 100644 --- a/chat/unrealircd/options.mk +++ b/chat/unrealircd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/12/03 04:00:18 adrianp Exp $ +# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:03 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.unrealircd @@ -30,7 +30,7 @@ CONFIGURE_ENV+= ac_cv_ip6=no ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --enable-ssl=${SSLBASE} +CONFIGURE_ARGS+= --enable-ssl=${SSLBASE:Q} .endif ### @@ -62,7 +62,7 @@ CONFIGURE_ARGS+= --enable-ziplinks ### Compile in support for remote include files. ### .if !empty(PKG_OPTIONS:Munrealircd-remoteinc) -CONFIGURE_ARGS+= --enable-libcurl=${PREFIX} +CONFIGURE_ARGS+= --enable-libcurl=${PREFIX:Q} . include "../../www/curl/buildlink3.mk" . include "../../net/libcares/buildlink3.mk" .endif diff --git a/chat/xchat/options.mk b/chat/xchat/options.mk index 43209ca37de..add7bc91558 100644 --- a/chat/xchat/options.mk +++ b/chat/xchat/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2005/10/05 13:29:50 wiz Exp $ +# $NetBSD: options.mk,v 1.8 2005/12/05 23:55:03 rillig Exp $ .include "../../mk/bsd.prefs.mk" @@ -14,7 +14,7 @@ PKG_SUGGESTED_OPTIONS= ssl ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --enable-openssl=${SSLBASE} +CONFIGURE_ARGS+= --enable-openssl=${SSLBASE:Q} .else CONFIGURE_ARGS+= --enable-openssl=no .endif diff --git a/comms/binkd/Makefile b/comms/binkd/Makefile index 234f43fa682..762dd0362eb 100644 --- a/comms/binkd/Makefile +++ b/comms/binkd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/09/28 20:52:18 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= binkd098 @@ -16,7 +16,7 @@ COMMENT= FidoNet-over-IP transport program utilizing BINKP protocol WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} NOT_FOR_PLATFORM= *-*-alpha *-*-sparc64 diff --git a/comms/conserver/Makefile b/comms/conserver/Makefile index 6d4007198fb..f49c824e1de 100644 --- a/comms/conserver/Makefile +++ b/comms/conserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/06/03 20:07:23 wiz Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= conserver-7.2.7 @@ -16,9 +16,9 @@ GNU_CONFIGURE= YES USE_PKGINSTALL= YES CONFLICTS+= conserver8-[0-9]* -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST} -CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST:Q} +CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT:Q} CONFIGURE_ARGS+= --with-regex CONFIGURE_ARGS+= --with-libwrap CONFIGURE_ARGS+= --with-logfile=${VARBASE}/log/conserver diff --git a/comms/conserver8/Makefile b/comms/conserver8/Makefile index 1567a8594d5..effc56ad4ec 100644 --- a/comms/conserver8/Makefile +++ b/comms/conserver8/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/08/12 14:39:06 he Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= conserver-8.1.11 @@ -18,9 +18,9 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST} -CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-master=${CONSERVER_DEFAULTHOST:Q} +CONFIGURE_ARGS+= --with-port=${CONSERVER_DEFAULTPORT:Q} CONFIGURE_ARGS+= --with-regex CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} CONFIGURE_ARGS+= --with-logfile=${VARBASE}/log/conserver @@ -40,7 +40,7 @@ CONFIGURE_ARGS+= --with-uds .endif .if !empty(PKG_OPTIONS:Mssl) -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} . include "../../security/openssl/buildlink3.mk" .else CONFIGURE_ARGS+= --without-openssl diff --git a/comms/efax-gtk/Makefile b/comms/efax-gtk/Makefile index f9e3e68bc75..e49ab897aaa 100644 --- a/comms/efax-gtk/Makefile +++ b/comms/efax-gtk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/10/17 09:25:42 adam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:03 rillig Exp $ DISTNAME= efax-gtk-3.0.6.src PKGNAME= efax-gtk-3.0.6 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/spool/efax EGDIR= ${PREFIX}/share/examples diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile index a9140fee262..d008f786ae3 100644 --- a/comms/hylafax/Makefile +++ b/comms/hylafax/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/12/05 20:49:54 rillig Exp $ +# $NetBSD: Makefile,v 1.48 2005/12/05 23:55:03 rillig Exp $ VERS= 4.2.2 DISTNAME= hylafax-${VERS} @@ -20,7 +20,7 @@ USE_PKGINSTALL= yes USE_LANGUAGES= c c++ USE_TOOLS+= gs:run HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --with-MAKE=${MAKE_PROGRAM} +CONFIGURE_ARGS+= --with-MAKE=${MAKE_PROGRAM:Q} CONFIGURE_ARGS+= --with-INSTALL="" --nointeractive CONFIGURE_ARGS+= --with-ZLIBINC=-I${BUILDLINK_PREFIX.zlib}/include CONFIGURE_ARGS+= --with-LIBZ="-L${BUILDLINK_PREFIX.zlib}/lib -lz" diff --git a/comms/minicom/Makefile b/comms/minicom/Makefile index 58dff079e9a..5ce065dc65d 100644 --- a/comms/minicom/Makefile +++ b/comms/minicom/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/09/26 14:07:25 wiz Exp $ +# $NetBSD: Makefile,v 1.45 2005/12/05 23:55:03 rillig Exp $ DISTNAME= minicom-2.1 PKGREVISION= 1 @@ -20,7 +20,7 @@ USE_PKGLOCALEDIR= yes USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= minicom EGDIR= ${PREFIX}/share/examples/minicom diff --git a/comms/p5-pilot-link/Makefile b/comms/p5-pilot-link/Makefile index 1842687caf1..ca33be8e804 100644 --- a/comms/p5-pilot-link/Makefile +++ b/comms/p5-pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/08/08 21:25:20 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 23:55:03 rillig Exp $ # .include "../../comms/pilot-link/Makefile.common" @@ -12,7 +12,7 @@ BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS} USE_TOOLS+= gmake -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} PERL5_CONFIGURE= NO PERL5_PACKLIST= auto/PDA/Pilot/.packlist diff --git a/comms/pilot-link/Makefile b/comms/pilot-link/Makefile index 428fc70d542..cc5f398b972 100644 --- a/comms/pilot-link/Makefile +++ b/comms/pilot-link/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/07/16 19:10:38 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:03 rillig Exp $ .include "../../comms/pilot-link/Makefile.common" @@ -11,7 +11,7 @@ BUILDLINK_DEPENDS.pilot-link-libs= pilot-link-libs>=${PILOT_LINK_VERS} USE_TOOLS+= gmake perl:run USE_GNU_READLINE= YES -CONFIGURE_ARGS+= --with-perl5=${PERL5} +CONFIGURE_ARGS+= --with-perl5=${PERL5:Q} CONFIGURE_ARGS+= --with-readline21 CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl} CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk} diff --git a/comms/plptools/Makefile b/comms/plptools/Makefile index cb8fb6f5d07..1fd12b70f9b 100644 --- a/comms/plptools/Makefile +++ b/comms/plptools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:07:44 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:03 rillig Exp $ # DISTNAME= plptools-0.12 @@ -18,7 +18,7 @@ USE_PKGLOCALEDIR= YES PTHREAD_OPTS+= require GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE} +CONFIGURE_ARGS+= --with-serial=${DEFAULT_SERIAL_DEVICE:Q} LIBS+= -ltermcap .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/converters/psiconv/Makefile b/converters/psiconv/Makefile index 9a594a7a68f..3deb42a4e08 100644 --- a/converters/psiconv/Makefile +++ b/converters/psiconv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/20 13:10:06 adam Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:03 rillig Exp $ DISTNAME= psiconv-0.9.7 CATEGORIES= converters @@ -12,7 +12,7 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-imagemagick -CONFIGURE_ARGS+= --with-etcdir=${EGDIR} +CONFIGURE_ARGS+= --with-etcdir=${EGDIR:Q} EGDIR= ${PREFIX}/share/examples/psiconv CONF_FILES+= ${EGDIR}/psiconv.conf ${PKG_SYSCONFDIR}/psiconv.conf diff --git a/cross/h8300-hms-binutils/Makefile b/cross/h8300-hms-binutils/Makefile index c16ab021464..7ce46d4680e 100644 --- a/cross/h8300-hms-binutils/Makefile +++ b/cross/h8300-hms-binutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:03 rillig Exp $ DISTNAME= binutils-2.12.1 PKGNAME= cross-h8300-hms-binutils-2.12.1 @@ -16,7 +16,7 @@ WRKSRC= ${WRKDIR}/objdir USE_TOOLS+= gmake USE_MAKEINFO= yes HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${H8300_PREFIX} +CONFIGURE_ARGS+= --prefix=${H8300_PREFIX:Q} CONFIGURE_ARGS+= --infodir=${H8300_PREFIX}/binutils CONFIGURE_ARGS+= --target=h8300-hms CONFIGURE_SCRIPT= ${SRCDIR}/configure diff --git a/cross/h8300-hms-gcc/Makefile b/cross/h8300-hms-gcc/Makefile index ac9655f5ca1..24eb72a0b2e 100644 --- a/cross/h8300-hms-gcc/Makefile +++ b/cross/h8300-hms-gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/05/22 20:07:45 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:04 rillig Exp $ DISTNAME= gcc-core-3.1 PKGNAME= cross-h8300-hms-gcc-3.1 @@ -22,7 +22,7 @@ H8300_PREFIX= ${LOCALBASE}/libexec/cross-h8300-hms WRKSRC= ${WRKDIR}/objdir USE_TOOLS+= gmake HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${H8300_PREFIX} +CONFIGURE_ARGS+= --prefix=${H8300_PREFIX:Q} CONFIGURE_ARGS+= --infodir=${H8300_PREFIX}/gcc CONFIGURE_ARGS+= --target=h8300-hms CONFIGURE_ARGS+= --enable-languages=c 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 diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common index 79ae105a054..347f1cd247f 100644 --- a/devel/GConf2/Makefile.common +++ b/devel/GConf2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.34 2005/10/08 17:15:48 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.35 2005/12/05 23:55:05 rillig Exp $ # DISTNAME= GConf-2.12.0 @@ -28,7 +28,7 @@ PKGCONFIG_OVERRIDE= gconf-2.0.pc.in PKG_SYSCONFSUBDIR= gconf -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-sysconfsubdir= CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ARGS+= --disable-gtk-doc diff --git a/devel/GConf2/schemas.mk b/devel/GConf2/schemas.mk index 78420df3b09..abba0ba0832 100644 --- a/devel/GConf2/schemas.mk +++ b/devel/GConf2/schemas.mk @@ -1,4 +1,4 @@ -# $NetBSD: schemas.mk,v 1.11 2005/12/05 20:50:01 rillig Exp $ +# $NetBSD: schemas.mk,v 1.12 2005/12/05 23:55:05 rillig Exp $ # # This Makefile fragment is intended to be included by packages that install # GConf2 schema files. It takes care of registering them in the GConf2 @@ -37,7 +37,7 @@ GCONF2_SCHEMAS_DIR= ${BUILDLINK_PREFIX.GConf2}/share/gconf/schemas .if defined(GNU_CONFIGURE) && !empty(GNU_CONFIGURE:M[Yy][Ee][Ss]) CONFIGURE_ARGS+= --disable-schemas-install -CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${GCONF2_SCHEMAS_DIR} +CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${GCONF2_SCHEMAS_DIR:Q} .endif .if (defined(GCONF2_SCHEMAS) && !empty(GCONF2_SCHEMAS)) || \ diff --git a/devel/buildtool/buildlink3.mk b/devel/buildtool/buildlink3.mk index 8fd661f1843..3be21ffb927 100644 --- a/devel/buildtool/buildlink3.mk +++ b/devel/buildtool/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.6 2005/12/05 20:50:02 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.7 2005/12/05 23:55:05 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ BUILDTOOL_BUILDLINK3_MK:= ${BUILDTOOL_BUILDLINK3_MK}+ @@ -29,7 +29,7 @@ CONFIGURE_ENV+= BT_PROG_CC=${CC:Q} CONFIGURE_ENV+= BT_PROG_CXX=${CXX:Q} CONFIGURE_ENV+= BT_PROG_LD=${LD:Q} CONFIGURE_ENV+= BT_PROG_M4=${TOOLS_M4:Q} -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} .if !target(do-build) do-build: diff --git a/devel/cvs/options.mk b/devel/cvs/options.mk index da066cb6423..7291d6a931a 100644 --- a/devel/cvs/options.mk +++ b/devel/cvs/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/05/31 21:28:22 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:05 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cvs PKG_SUPPORTED_OPTIONS= kerberos @@ -26,8 +26,8 @@ CONFIGURE_ARGS+= --disable-ipv6 .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --enable-encryption -CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE} -CONFIGURE_ARGS+= --with-krb4=${KRB5BASE} +CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE:Q} +CONFIGURE_ARGS+= --with-krb4=${KRB5BASE:Q} . if ${OPSYS} == "Darwin" LDFLAGS+= -framework Kerberos . endif diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile index 52173eea26f..246c293331b 100644 --- a/devel/cvsgraph/Makefile +++ b/devel/cvsgraph/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:03 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:05 rillig Exp $ # DISTNAME= cvsgraph-1.5.1 @@ -12,7 +12,7 @@ COMMENT= Graphically represents CVS/RCS branches and file revisions USE_TOOLS+= lex USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/devel/diffutils/Makefile b/devel/diffutils/Makefile index 12c6fbb1dbd..d188b493b49 100644 --- a/devel/diffutils/Makefile +++ b/devel/diffutils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:03 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:05 rillig Exp $ # DISTNAME= diffutils-2.8.1 @@ -17,7 +17,7 @@ INFO_FILES= diff.info .include "../../mk/bsd.prefs.mk" .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/devel/distcc/Makefile.common b/devel/distcc/Makefile.common index 9920a9e346b..4f7c3302ded 100644 --- a/devel/distcc/Makefile.common +++ b/devel/distcc/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2005/10/10 12:15:47 jmmv Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/12/05 23:55:05 rillig Exp $ # ### XXX: See the other 'XXX' comment below when updating this package. @@ -20,7 +20,7 @@ USE_PKGINSTALL= yes USE_TOOLS+= gmake CONFIGURE_ARGS+= --enable-rfc2553 -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} SUBST_CLASSES+= doc SUBST_STAGE.doc= post-patch diff --git a/devel/gdbada/Makefile b/devel/gdbada/Makefile index 0669def72d3..9f0f2d8aea3 100644 --- a/devel/gdbada/Makefile +++ b/devel/gdbada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/13 14:16:05 shannonjr Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:05 rillig Exp $ DISTNAME= gdbada-6.3 #PKGREVISION= 1 @@ -24,10 +24,10 @@ USE_TOOLS+= gmake TEST_TARGET= check INFO_DIR= ${GDB_PREFIX}/info LIB_DIR= ${GDB_PREFIX}/lib -CONFIGURE_ARGS+= --prefix=${GDB_PREFIX} -CONFIGURE_ARGS+= --exec-prefix=${GDB_PREFIX} -CONFIGURE_ARGS+= --infodir=${INFO_DIR} -CONFIGURE_ARGS+= --libdir=${LIB_DIR} +CONFIGURE_ARGS+= --prefix=${GDB_PREFIX:Q} +CONFIGURE_ARGS+= --exec-prefix=${GDB_PREFIX:Q} +CONFIGURE_ARGS+= --infodir=${INFO_DIR:Q} +CONFIGURE_ARGS+= --libdir=${LIB_DIR:Q} CONFIGURE_ARGS+= --includedir=${GDB_PREFIX}/include CONFIGURE_ARGS+= --mandir=${GDB_PREFIX}/man CONFIGURE_ARGS+= --datadir=${GDB_PREFIX}/share diff --git a/devel/gmake/Makefile b/devel/gmake/Makefile index 1806d73f713..58be32f96aa 100644 --- a/devel/gmake/Makefile +++ b/devel/gmake/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.61 2005/12/05 20:50:04 rillig Exp $ +# $NetBSD: Makefile,v 1.62 2005/12/05 23:55:06 rillig Exp $ DISTNAME= make-3.80 PKGNAME= gmake-3.80 @@ -24,7 +24,7 @@ TEST_TARGET= check .include "../../mk/bsd.prefs.mk" .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/devel/its4/Makefile b/devel/its4/Makefile index 8d16085b67a..7a8390de0f8 100644 --- a/devel/its4/Makefile +++ b/devel/its4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/16 06:57:46 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= its4-1.1.1 @@ -14,7 +14,7 @@ LICENSE= no-commercial-use WRKSRC= ${WRKDIR}/its4 HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/share/its4 INSTALLATION_DIRS= bin man/man1 diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile index 62716f37bf3..1ad12892e86 100644 --- a/devel/libbonobo/Makefile +++ b/devel/libbonobo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:05 rillig Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:06 rillig Exp $ DISTNAME= libbonobo-2.10.1 CATEGORIES= devel gnome @@ -20,7 +20,7 @@ USE_TOOLS+= bison gmake perl:run pkg-config PKGCONFIG_OVERRIDE= bonobo/libbonobo-2.0.pc.in PKGCONFIG_OVERRIDE+= bonobo-activation/bonobo-activation-2.0.pc.in -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc CONFIGURE_ENV+= PERL_PATH=${TOOLS_PERL5:Q} diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile index b96750980a3..75bc3a06297 100644 --- a/devel/libgnome/Makefile +++ b/devel/libgnome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:05 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= libgnome-2.12.0.1 @@ -24,8 +24,8 @@ USE_PKGINSTALL= YES PKGCONFIG_OVERRIDE= libgnome/libgnome-2.0.pc.in CONFIGURE_ARGS= --enable-gtk-doc=no -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc INSTALL_MAKE_FLAGS+= soundlistdir=${PREFIX}/share/examples/libgnome/sound/events diff --git a/devel/libsmi/Makefile b/devel/libsmi/Makefile index 9971c23144b..114e853b96a 100644 --- a/devel/libsmi/Makefile +++ b/devel/libsmi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2004/10/03 00:13:30 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= libsmi-0.1.6 @@ -15,7 +15,7 @@ MIBDIR= ${PREFIX}/share/libsmi/mibs USE_LIBTOOL= YES LTCONFIG_OVERRIDE=${WRKSRC}/ltconfig GNU_CONFIGURE= YES -CONFIGURE_ARGS+=--with-mibdir="${MIBDIR}" +CONFIGURE_ARGS+=--with-mibdir=${MIBDIR:Q} # this might make it easier to use scotty's and ucd-snmp's mibs, # and local ones too CONFIGURE_ARGS+=--with-smipath="${MIBDIR}:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/tnm2.1.8/mibs:/usr/local/share/snmp/mibs" diff --git a/devel/m4/Makefile b/devel/m4/Makefile index afca729db11..145acf9a501 100644 --- a/devel/m4/Makefile +++ b/devel/m4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:05 rillig Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 23:55:06 rillig Exp $ DISTNAME= m4-1.4.4 CATEGORIES= devel @@ -18,7 +18,7 @@ TEST_TARGET= check .include "../../mk/bsd.prefs.mk" .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/devel/patch/Makefile b/devel/patch/Makefile index d2faadd6c4c..efe22f70d37 100644 --- a/devel/patch/Makefile +++ b/devel/patch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:06 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= patch-2.5.4 @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" .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/devel/py-pqueue/Makefile b/devel/py-pqueue/Makefile index 9b519cde26a..c504802535e 100644 --- a/devel/py-pqueue/Makefile +++ b/devel/py-pqueue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:07 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= PQueue-0.2 @@ -13,7 +13,7 @@ COMMENT= Priority-queues using fibonacci heaps WRKSRC= ${WRKDIR}/PQueue GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} BUILD_TARGET= default PY_PATCHPLIST= yes diff --git a/devel/rt3/Makefile b/devel/rt3/Makefile index fe8ad801e12..6eaae3612ce 100644 --- a/devel/rt3/Makefile +++ b/devel/rt3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/21 21:23:46 cube Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:06 rillig Exp $ DISTNAME= rt-3.2.3 PKGREVISION= 2 @@ -85,10 +85,10 @@ PKG_SYSCONFSUBDIR= rt3 PKG_GROUPS= ${RT_GROUP} CONFIGURE_ARGS+= --enable-layout=pkgsrc -CONFIGURE_ARGS+= --with-rt-group=${RT_GROUP} -CONFIGURE_ARGS+= --with-db-type=${_RT_DB_TYPE} -CONFIGURE_ARGS+= --with-web-user=${APACHE_USER} -CONFIGURE_ARGS+= --with-web-group=${APACHE_GROUP} +CONFIGURE_ARGS+= --with-rt-group=${RT_GROUP:Q} +CONFIGURE_ARGS+= --with-db-type=${_RT_DB_TYPE:Q} +CONFIGURE_ARGS+= --with-web-user=${APACHE_USER:Q} +CONFIGURE_ARGS+= --with-web-group=${APACHE_GROUP:Q} MESSAGE_SUBST+= HOMEPAGE=${HOMEPAGE} MESSAGE_SUBST+= RT_GROUP=${RT_GROUP} diff --git a/devel/swig-perl/Makefile b/devel/swig-perl/Makefile index 7f31e141cae..8fd8029b8bf 100644 --- a/devel/swig-perl/Makefile +++ b/devel/swig-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:08 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:06 rillig Exp $ PKGNAME= swig-perl-${SWIG_VERSION} PKGREVISION= 2 @@ -8,7 +8,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews .include "../../devel/swig-build/Makefile.common" -CONFIGURE_ARGS+= --with-perl5=${PERL5} +CONFIGURE_ARGS+= --with-perl5=${PERL5:Q} BUILD_TARGET= runtime INSTALL_TARGET= install-runtime diff --git a/devel/swig-python/Makefile b/devel/swig-python/Makefile index b6523b892e5..dd3b97ce60f 100644 --- a/devel/swig-python/Makefile +++ b/devel/swig-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:08 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:06 rillig Exp $ PKGNAME= swig-python-${SWIG_VERSION} PKGREVISION= 1 @@ -8,7 +8,7 @@ COMMENT= Simplified Wrapper and Interface Generator, Python runtime PYTHON_VERSIONS_INCOMPATIBLE= 21 21pth 20 15 -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} BUILD_TARGET= runtime INSTALL_TARGET= install-runtime diff --git a/devel/tla/Makefile b/devel/tla/Makefile index da0628d4b02..a55f1880a4c 100644 --- a/devel/tla/Makefile +++ b/devel/tla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:08 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= tla-1.3.3 @@ -22,7 +22,7 @@ USE_TOOLS+= gmake HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ../configure -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --with-gnu-diff=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff CONFIGURE_ARGS+= --with-gnu-diff3=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}diff3 CONFIGURE_ARGS+= --with-gnu-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch diff --git a/editors/elvis/Makefile.common b/editors/elvis/Makefile.common index 45572d82b65..f2e0f3d6677 100644 --- a/editors/elvis/Makefile.common +++ b/editors/elvis/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/04/11 21:45:40 tv Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= elvis-2.2_0 @@ -14,7 +14,7 @@ DISTINFO_FILE= ${.CURDIR}/../elvis/distinfo USE_PKGINSTALL= YES HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --docdir=${PREFIX}/share/doc/elvis PKG_SYSCONFSUBDIR?= elvis diff --git a/editors/emacs/Makefile b/editors/emacs/Makefile index 4a75af91898..6d258c07c21 100644 --- a/editors/emacs/Makefile +++ b/editors/emacs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.88 2005/12/05 20:50:09 rillig Exp $ +# $NetBSD: Makefile,v 1.89 2005/12/05 23:55:06 rillig Exp $ DISTNAME= emacs-${EMACSVERSION}a PKGREVISION= 1 @@ -11,7 +11,7 @@ CONFLICTS+= emacs-nox11-[0-9]* CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --with-x-toolkit=athena -CONFIGURE_ARGS+= --srcdir=${WRKSRC} +CONFIGURE_ARGS+= --srcdir=${WRKSRC:Q} .include "../../graphics/xpm/buildlink3.mk" CONFIGURE_ARGS+= --with-xpm diff --git a/editors/emacs20/Makefile b/editors/emacs20/Makefile index 7b57a418f34..bfd30b1beab 100644 --- a/editors/emacs20/Makefile +++ b/editors/emacs20/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:09 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:06 rillig Exp $ DISTNAME= emacs-20.7 PKGREVISION= 5 @@ -60,7 +60,7 @@ CONFIGURE_ARGS+=--with-pop BUILD_DEFS+= EMACS_USE_X EMACS_USE_X_TOOLKIT CONFIGURE_ARGS+= --with-x=yes .if defined(EMACS_USE_X_TOOLKIT) -CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT} +CONFIGURE_ARGS+= --with-x-toolkit=${EMACS_USE_X_TOOLKIT:Q} .if ${EMACS_USE_X_TOOLKIT} == "lucid" || ${EMACS_USE_X_TOOLKIT} == "athena" .include "../../mk/xaw.buildlink3.mk" .elif ${EMACS_USE_X_TOOLKIT} == "motif" diff --git a/editors/gconf-editor/Makefile b/editors/gconf-editor/Makefile index b38a7ceb880..acf719be37c 100644 --- a/editors/gconf-editor/Makefile +++ b/editors/gconf-editor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/10/16 12:11:33 jmmv Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 23:55:06 rillig Exp $ # DISTNAME= gconf-editor-2.12.0 @@ -18,7 +18,7 @@ USE_LIBTOOL= YES USE_PKGLOCALEDIR= YES USE_TOOLS+= gmake pkg-config -CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE} +CONFIGURE_ARGS+= --with-gconf-defaults-source=${GCONF2_CONFIG_SOURCE:Q} CONFIGURE_ARGS+= --with-gconf-mandatory-source=${GCONF2_CONFIG_SOURCE:S/gconf.xml.defaults/gconf.xml.mandatory/g} GCONF2_SCHEMAS= gconf-editor.schemas diff --git a/editors/lyx-qt/Makefile b/editors/lyx-qt/Makefile index 49c42f0fd6e..36d8f04596c 100644 --- a/editors/lyx-qt/Makefile +++ b/editors/lyx-qt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/11/18 16:47:35 reed Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:06 rillig Exp $ # .include "./Makefile.common" @@ -11,7 +11,7 @@ COMMENT+= (QT version) CONFLICTS+= lyx-xforms-[0-9]* CONFIGURE_ARGS+= --with-extra-prefix=${BUILDLINK_PREFIX.qt3-libs} \ - --with-qt-dir=${QTDIR} \ + --with-qt-dir=${QTDIR:Q} \ --with-qt-includes=${BUILDLINK_PREFIX.qt3-libs}/qt3/include \ --with-qt-libraries=${BUILDLINK_PREFIX.qt3-libs}/qt3/lib \ --with-frontend=qt diff --git a/editors/vile/Makefile b/editors/vile/Makefile index daf8b9bc02a..bf5a87dd3eb 100644 --- a/editors/vile/Makefile +++ b/editors/vile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/09/28 20:52:20 rillig Exp $ +# $NetBSD: Makefile,v 1.45 2005/12/05 23:55:06 rillig Exp $ DISTNAME= vile-9.5 CATEGORIES= editors @@ -12,8 +12,8 @@ COMMENT= VI Like Emacs. a vi "workalike", with many additional features GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-perl -CONFIGURE_ARGS+= --datadir=${DATADIR} -CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR} +CONFIGURE_ARGS+= --datadir=${DATADIR:Q} +CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} USE_TOOLS+= perl:run CPPFLAGS.NetBSD+= -DMISSING_EXTERN_ENVIRON diff --git a/editors/xemacs-current/Makefile b/editors/xemacs-current/Makefile index a51fae9576f..296a6d5ff26 100644 --- a/editors/xemacs-current/Makefile +++ b/editors/xemacs-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/06/01 18:02:46 jlam Exp $ +# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:06 rillig Exp $ DISTNAME= xemacs-21.5.19 @@ -45,14 +45,14 @@ INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info HAS_CONFIGURE= YES CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --with-clash-detection CONFIGURE_ARGS+= --error-checking=none CONFIGURE_ARGS+= --with-mule=yes CONFIGURE_ARGS+= --without-ncurses CONFIGURE_ARGS+= --without-msw CONFIGURE_ARGS+= ${WITH_WIDGETS} -CONFIGURE_ARGS+= --infopath="${INFOPATH}" +CONFIGURE_ARGS+= --infopath=${INFOPATH:Q} CONFIGURE_ARGS+= --site-includes=${PREFIX}/include:${WRKDIR} CONFIGURE_ARGS+= --site-libraries=${PREFIX}/lib diff --git a/editors/xemacs/Makefile.common b/editors/xemacs/Makefile.common index 934c08337cb..7133c52fe96 100644 --- a/editors/xemacs/Makefile.common +++ b/editors/xemacs/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.12 2005/12/05 20:50:10 rillig Exp $ +# $NetBSD: Makefile.common,v 1.13 2005/12/05 23:55:06 rillig Exp $ DISTNAME= xemacs-21.4.17 CATEGORIES= editors @@ -83,7 +83,7 @@ INFOPATH= ${PREFIX}/info:${X11BASE}/info:/usr/local/info HAS_CONFIGURE= YES CONFIGURE_ARGS+= ${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --with-clash-detection CONFIGURE_ARGS+= --with-mule=yes .if ${OPSYS} != "Linux" @@ -91,7 +91,7 @@ CONFIGURE_ARGS+= --with-ncurses=no .endif CONFIGURE_ARGS+= --with-msw=no CONFIGURE_ARGS+= ${WITH_DIALOGS} -CONFIGURE_ARGS+= --infopath="${INFOPATH}" +CONFIGURE_ARGS+= --infopath=${INFOPATH:Q} CFLAGS+= -Dunix diff --git a/editors/xvile/Makefile b/editors/xvile/Makefile index 4ba33b70dd1..8b5f5e851bd 100644 --- a/editors/xvile/Makefile +++ b/editors/xvile/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/09/28 20:52:20 rillig Exp $ +# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:07 rillig Exp $ DISTNAME= vile-9.5 PKGNAME= xvile-9.5 @@ -14,8 +14,8 @@ COMMENT= VI Like Emacs, X11 version -- a fully "X aware" vi work-alike GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-perl -CONFIGURE_ARGS+= --datadir=${DATADIR} -CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR} +CONFIGURE_ARGS+= --datadir=${DATADIR:Q} +CONFIGURE_ARGS+= --with-libdir-path=${FILTERDIR:Q} MAKEFILE= makefile INSTALL_TARGET= install install-perl diff --git a/emulators/aranym/Makefile b/emulators/aranym/Makefile index 2f3431d3ef8..240a5ba5dfa 100644 --- a/emulators/aranym/Makefile +++ b/emulators/aranym/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/01 18:02:46 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= aranym-0.8.9beta @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --enable-fullmmu CONFIGURE_ARGS+= --enable-dsp-disasm CONFIGURE_ARGS+= --enable-blitsdlblit CONFIGURE_ARGS+= --enable-fixedvideoram -CONFIGURE_ARGS+= --enable-fixedfastram=${FIXED_FASTRAM} +CONFIGURE_ARGS+= --enable-fixedfastram=${FIXED_FASTRAM:Q} CONFIGURE_ARGS+= --enable-blitmemmove .include "../../mk/bsd.prefs.mk" diff --git a/emulators/p11/Makefile b/emulators/p11/Makefile index 0a16cb8dc4e..a7ee1d1c967 100644 --- a/emulators/p11/Makefile +++ b/emulators/p11/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/05/22 20:07:58 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= p11-2.10a @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org COMMENT= PDP11 emulator GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-begemot=${PREFIX} +CONFIGURE_ARGS+= --with-begemot=${PREFIX:Q} USE_LIBTOOL= yes USE_TOOLS+= gmake diff --git a/emulators/qemu/Makefile b/emulators/qemu/Makefile index 0b1ac7747e4..7f33c6db4f1 100644 --- a/emulators/qemu/Makefile +++ b/emulators/qemu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/04 21:10:42 dbj Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= qemu-0.7.2 @@ -18,7 +18,7 @@ HAS_CONFIGURE= yes GCC_REQD+= 3.0 -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --interp-prefix=${PREFIX}/share/qemu SUBST_CLASSES+= snd diff --git a/fonts/fontconfig/Makefile b/fonts/fontconfig/Makefile index 5aa1aef07f8..200dfcb71ab 100644 --- a/fonts/fontconfig/Makefile +++ b/fonts/fontconfig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/09/05 15:18:42 hira Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= fontconfig-2.3.2 @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --with-default-fonts=${LOCALBASE}/lib/X11/fonts CONFIGURE_ARGS+= --with-freetype-config=${BUILDLINK_PREFIX.freetype2}/bin/freetype-config CONFIGURE_ARGS+= --with-expat-includes=${BUILDLINK_PREFIX.expat}/include CONFIGURE_ARGS+= --with-expat-lib=${BUILDLINK_PREFIX.expat}/lib -CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-x CONFIGURE_ARGS+= --enable-docs CONFIGURE_ENV+= HASDOCBOOK=no diff --git a/fonts/ja-shinonome/Makefile b/fonts/ja-shinonome/Makefile index 656b5189efc..766544198b8 100644 --- a/fonts/ja-shinonome/Makefile +++ b/fonts/ja-shinonome/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:14 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= shinonome-0.9.10-src @@ -26,9 +26,9 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL FILES_SUBST+= FONTDIR=${FONTDIR:Q} FILES_SUBST+= ALIAS_SHINONOME=${ALIAS_SHINONOME:Q} -CONFIGURE_ARGS+= --with-fontdir=${FONTDIR} +CONFIGURE_ARGS+= --with-fontdir=${FONTDIR:Q} CONFIGURE_ARGS+= --disable-progressbar -CONFIGURE_ARGS+= --with-foundry=${FOUNDRY} +CONFIGURE_ARGS+= --with-foundry=${FOUNDRY:Q} .include "../../mk/x11.buildlink3.mk" diff --git a/fonts/ttf2pk/Makefile b/fonts/ttf2pk/Makefile index c7c5e047424..02510fa6a94 100644 --- a/fonts/ttf2pk/Makefile +++ b/fonts/ttf2pk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/11/20 06:27:24 minskim Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:07 rillig Exp $ # .include "../../graphics/freetype-lib/Makefile.common" @@ -12,7 +12,7 @@ HOMEPAGE= http://www.freetype.org/ COMMENT= TrueType to TeX PK font converter GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${LOCALBASE} +CONFIGURE_ARGS+= --prefix=${LOCALBASE:Q} CONFIGURE_ARGS+= --with-kpathsea-dir=${PREFIX}/lib T2PSRC= ${WRKSRC}/contrib/ttf2pk diff --git a/games/d2x/Makefile b/games/d2x/Makefile index d907dbc1222..ab61e272422 100644 --- a/games/d2x/Makefile +++ b/games/d2x/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/20 19:16:21 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= d2x-0.2.5 @@ -22,8 +22,8 @@ MESSAGE_SUBST+= D2X_DATA=${D2X_DATA} # support # CONFIGURE_ARGS+= --disable-network -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --with-sharepath=${D2X_DATA} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} +CONFIGURE_ARGS+= --with-sharepath=${D2X_DATA:Q} .include "../../devel/SDL/buildlink3.mk" .include "../../graphics/SDL_image/buildlink3.mk" diff --git a/games/gnome2-games/Makefile b/games/gnome2-games/Makefile index f61cbf735b4..e68cd726cec 100644 --- a/games/gnome2-games/Makefile +++ b/games/gnome2-games/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2005/12/05 20:50:16 rillig Exp $ +# $NetBSD: Makefile,v 1.55 2005/12/05 23:55:07 rillig Exp $ DISTNAME= gnome-games-2.12.1 PKGREVISION= 1 @@ -27,10 +27,10 @@ INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL GNU_CONFIGURE= yes CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} # This package installs files in sysconfdir but does not read them directly, # so the following configuration argument is safe. -CONFIGURE_ARGS+= --sysconfdir=${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q} EGDIR= ${PREFIX}/share/examples/gnome2-games CONF_FILES= diff --git a/games/powermanga/Makefile b/games/powermanga/Makefile index fb9497d63d8..a37c580feea 100644 --- a/games/powermanga/Makefile +++ b/games/powermanga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:17 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= powermanga-0.79 @@ -12,7 +12,7 @@ COMMENT= Arcade 2D shoot-em-up game GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} MAKE_ENV+= TOUCH=${TOUCH:Q} WRKSRC=${WRKSRC:Q} .include "../../audio/SDL_mixer/buildlink3.mk" diff --git a/games/scummvm/Makefile b/games/scummvm/Makefile index 2b905df3ba8..c8af6bd93ab 100644 --- a/games/scummvm/Makefile +++ b/games/scummvm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/10/31 09:05:34 adam Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:07 rillig Exp $ DISTNAME= scummvm-0.8.0 CATEGORIES= games @@ -12,7 +12,7 @@ COMMENT= LucasArts Script Creation Utility for Maniac Mansion USE_DIRS+= xdg-1.1 USE_TOOLS+= gmake HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} UNLIMIT_RESOURCES= datasize diff --git a/games/wesnoth/Makefile b/games/wesnoth/Makefile index 9259ea12e4c..beef8cdcd7c 100644 --- a/games/wesnoth/Makefile +++ b/games/wesnoth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:18 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:07 rillig Exp $ DISTNAME= wesnoth-1.0.1 CATEGORIES= games @@ -10,7 +10,7 @@ COMMENT= Fantasy turn-based strategy game USE_TOOLS+= pkg-config HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} UNLIMIT_RESOURCES+= datasize diff --git a/geography/mapserver/Makefile b/geography/mapserver/Makefile index 193b9cab67f..ee504d09d35 100644 --- a/geography/mapserver/Makefile +++ b/geography/mapserver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:56 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= mapserver-4.0 @@ -14,8 +14,8 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_LANGUAGES= c c++ -CONFIGURE_ARGS+= --with-gd=${PREFIX} \ - --with-libiconv=${PREFIX} \ +CONFIGURE_ARGS+= --with-gd=${PREFIX:Q} \ + --with-libiconv=${PREFIX:Q} \ --with-zlib=${BUILDLINK_PREFIX.zlib} INSTALLATION_DIRS= bin include lib diff --git a/graphics/blender/options.mk b/graphics/blender/options.mk index 47f61edfa6e..eb627e2cbc9 100644 --- a/graphics/blender/options.mk +++ b/graphics/blender/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/10/05 13:29:49 wiz Exp $ +# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:07 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.blender PKG_SUPPORTED_OPTIONS= @@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --disable-exppython .endif .if !empty(PKG_OPTIONS:Mogg) -CONFIGURE_ARGS+= --with-ogg=${PREFIX} +CONFIGURE_ARGS+= --with-ogg=${PREFIX:Q} .include "../../multimedia/libogg/buildlink3.mk" .else CONFIGURE_ARGS+= --without-ogg --disable-oggtest @@ -28,7 +28,7 @@ CONFIGURE_ARGS+= --enable-openal .endif .if !empty(PKG_OPTIONS:Mvorbis) -CONFIGURE_ARGS+= --with-vorbis=${PREFIX} +CONFIGURE_ARGS+= --with-vorbis=${PREFIX:Q} .include "../../audio/libvorbis/buildlink3.mk" .else CONFIGURE_ARGS+= --without-vorbis --disable-vorbistest diff --git a/graphics/cal3d-examples/Makefile b/graphics/cal3d-examples/Makefile index cc48e0f744e..802163211a7 100644 --- a/graphics/cal3d-examples/Makefile +++ b/graphics/cal3d-examples/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/18 01:31:54 kristerw Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:07 rillig Exp $ # PKGNAME= cal3d-examples-${CAL3D_VERSION} @@ -13,8 +13,8 @@ COMMENT= Tools and demos for cal3d library USE_TOOLS+= automake -CONFIGURE_ARGS+= --with-cal3d=${PREFIX} -CONFIGURE_ARGS+= --with-glut=${PREFIX} +CONFIGURE_ARGS+= --with-cal3d=${PREFIX:Q} +CONFIGURE_ARGS+= --with-glut=${PREFIX:Q} CONFIGURE_DIRS= ${WRKSRC}/examples/cally \ ${WRKSRC}/examples/miniviewer_gl \ ${WRKSRC}/tools/converter diff --git a/graphics/fnlib/Makefile b/graphics/fnlib/Makefile index e41d7911489..f163f4cd643 100644 --- a/graphics/fnlib/Makefile +++ b/graphics/fnlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/06/01 18:02:55 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:07 rillig Exp $ # DISTNAME= fnlib-0.5 @@ -20,7 +20,7 @@ USE_LIBTOOL= YES LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/fnlib CONF_FILES= ${EGDIR}/fnrc ${PKG_SYSCONFDIR}/fnrc diff --git a/graphics/geomview/Makefile b/graphics/geomview/Makefile index cb335ab1cb5..ab3dbf5079e 100644 --- a/graphics/geomview/Makefile +++ b/graphics/geomview/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/04/11 21:46:03 tv Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:08 rillig Exp $ DISTNAME= geomview-1.8.1 PKGREVISION= 4 @@ -14,7 +14,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --without-xforms CONFIGURE_ARGS+= --with-opengl=${BUILDLINK_PREFIX.Mesa} -CONFIGURE_ARGS+= --with-motif=${MOTIFBASE} +CONFIGURE_ARGS+= --with-motif=${MOTIFBASE:Q} CPPFLAGS+= -Dunix -Dalloca=__builtin_alloca INFO_FILES= geomview diff --git a/graphics/gimp/Makefile b/graphics/gimp/Makefile index b76914584c3..936b9c26b39 100644 --- a/graphics/gimp/Makefile +++ b/graphics/gimp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.127 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.128 2005/12/05 23:55:08 rillig Exp $ DISTNAME= gimp-2.2.9 PKGREVISION= 1 @@ -40,7 +40,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-perl #CONFIGURE_ARGS+= --disable-print CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/${PKGNAME_NOREV} CONFIGURE_ARGS+= --with-gimpprint-prefix=${BUILDLINK_PREFIX.gimp-print-lib} diff --git a/graphics/gimp1-base/Makefile b/graphics/gimp1-base/Makefile index 2c3ec2ce205..1b94e4a18b6 100644 --- a/graphics/gimp1-base/Makefile +++ b/graphics/gimp1-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:20 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:08 rillig Exp $ # DISTNAME= gimp-1.2.5 @@ -24,7 +24,7 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python # The "print" plugin gets built separately (../../print/gimp-print) diff --git a/graphics/gimp24/Makefile b/graphics/gimp24/Makefile index 9896144fc6e..5d05b286f31 100644 --- a/graphics/gimp24/Makefile +++ b/graphics/gimp24/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:08 rillig Exp $ DISTNAME= gimp-2.3.4 PKGREVISION= 1 @@ -40,7 +40,7 @@ BUILDLINK_DEPENDS.lcms+= lcms>=1.12 GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-perl CONFIGURE_ARGS+= --disable-python -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc/html/${PKGNAME_NOREV} CONFIGURE_ARGS+= --with-gimpprint-prefix=${BUILDLINK_PREFIX.gimp-print-lib} diff --git a/graphics/gnuplot/Makefile.common b/graphics/gnuplot/Makefile.common index 144e7439c1a..1e5511cbd35 100644 --- a/graphics/gnuplot/Makefile.common +++ b/graphics/gnuplot/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/06/17 04:49:47 jlam Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 23:55:08 rillig Exp $ # DISTNAME= gnuplot-4.0.0 @@ -21,7 +21,7 @@ USE_MAKEINFO= YES INFO_FILES= gnuplot.info CONFIGURE_ARGS+= --with-pdf -CONFIGURE_ARGS+= --with-plot=${PREFIX} +CONFIGURE_ARGS+= --with-plot=${PREFIX:Q} CONFIGURE_ARGS+= --with-readline=${BUILDLINK_PREFIX.readline} CONFIGURE_ARGS+= --without-lisp-files diff --git a/graphics/imlib/Makefile b/graphics/imlib/Makefile index 08e27821ab0..08c33072c15 100644 --- a/graphics/imlib/Makefile +++ b/graphics/imlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.95 2005/12/05 20:50:20 rillig Exp $ +# $NetBSD: Makefile,v 1.96 2005/12/05 23:55:08 rillig Exp $ DISTNAME= imlib-1.9.15 PKGREVISION= 2 @@ -21,7 +21,7 @@ UNLIMIT_RESOURCES= datasize CPPFLAGS+= -DENABLE_NLS CONFIGURE_ENV+= ac_cv_path_CONVERT_PROG="${LOCALBASE}/bin/convert" CONFIGURE_ENV+= X_LDFLAGS=${X_LDFLAGS:Q} -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= imlib EGDIR= ${PREFIX}/share/examples/imlib diff --git a/graphics/libggi/Makefile b/graphics/libggi/Makefile index 5031d41d32c..1392f7d435c 100644 --- a/graphics/libggi/Makefile +++ b/graphics/libggi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 23:55:08 rillig Exp $ # DISTNAME= libggi-2.1.1.src @@ -20,7 +20,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-debug CONFIGURE_ARGS+= --with-x -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= ggi EGDIR= ${PREFIX}/share/examples/ggi diff --git a/graphics/libgii/Makefile b/graphics/libgii/Makefile index 59f04fed764..82a8bd5fab3 100644 --- a/graphics/libgii/Makefile +++ b/graphics/libgii/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/06/01 18:02:56 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:09 rillig Exp $ DISTNAME= libgii-0.9.1.src PKGNAME= ${DISTNAME:S/.src//} @@ -19,7 +19,7 @@ TEST_TARGET= check GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-x -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= ggi EGDIR= ${PREFIX}/share/examples/ggi diff --git a/graphics/mpgtx/Makefile b/graphics/mpgtx/Makefile index a2e27e5df24..989281a5657 100644 --- a/graphics/mpgtx/Makefile +++ b/graphics/mpgtx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/06/16 06:57:58 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:09 rillig Exp $ # DISTNAME= mpgtx-1.3.1 @@ -10,8 +10,8 @@ HOMEPAGE= http://mpgtx.sourceforge.net/ COMMENT= Split and join MPEG files in various ways HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} \ - --manprefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \ + --manprefix=${PREFIX:Q} BUILD_TARGET= mpgtx PLINKS= mpgjoin mpgcat mpgsplit mpginfo mpgdemux tagmp3 MLINKS= mpgcat.1 mpgjoin.1 mpginfo.1 mpgsplit.1 mpgdemux.1 diff --git a/graphics/p5-PerlMagick/Makefile b/graphics/p5-PerlMagick/Makefile index a5fcb22ca0a..820dddbc5fe 100644 --- a/graphics/p5-PerlMagick/Makefile +++ b/graphics/p5-PerlMagick/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/11/03 00:47:11 reed Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 23:55:09 rillig Exp $ .include "../../graphics/ImageMagick/Makefile.common" @@ -28,7 +28,7 @@ PERL5_CONFIGURE_DIRS= ${WRKSRC}/PerlMagick BUILD_DIRS= ${PERL5_CONFIGURE_DIRS} # Some configure_args come from Makefile.common -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} post-configure: perl5-configure diff --git a/graphics/php-gd/Makefile b/graphics/php-gd/Makefile index 7dfc77bcbdb..d46fb2a8883 100644 --- a/graphics/php-gd/Makefile +++ b/graphics/php-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:22 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:09 rillig Exp $ MODNAME= gd CATEGORIES+= graphics @@ -9,10 +9,10 @@ COMMENT= PHP extension for GD graphics library # PHP, such as CLI/CGI version or ap-php on Apache 1.x. CONFIGURE_ARGS+= --with-${MODNAME} -CONFIGURE_ARGS+= --with-jpeg-dir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-png-dir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_DIR} -CONFIGURE_ARGS+= --with-freetype-dir=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-jpeg-dir=${BUILDLINK_DIR:Q} +CONFIGURE_ARGS+= --with-png-dir=${BUILDLINK_DIR:Q} +CONFIGURE_ARGS+= --with-zlib-dir=${BUILDLINK_DIR:Q} +CONFIGURE_ARGS+= --with-freetype-dir=${BUILDLINK_DIR:Q} CONFIGURE_ARGS+= --enable-${MODNAME}-native-ttf CONFIGURE_ARGS+= --enable-${MODNAME}-jis-conv CONFIGURE_ARGS+= --without-t1lib diff --git a/graphics/povray/Makefile b/graphics/povray/Makefile index eee0e97a13f..d8ca2698d33 100644 --- a/graphics/povray/Makefile +++ b/graphics/povray/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/12/05 20:50:22 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:09 rillig Exp $ DISTNAME= povray-3.6.1 PKGREVISION= 2 @@ -20,7 +20,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-optimiz CONFIGURE_ARGS+= --enable-strip -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= COMPILED_BY="The NetBSD Packages Collection" .include "../../mk/bsd.prefs.mk" diff --git a/graphics/ruby-gd/Makefile b/graphics/ruby-gd/Makefile index 36b09cd1cbd..74d865b81ba 100644 --- a/graphics/ruby-gd/Makefile +++ b/graphics/ruby-gd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/11/02 09:48:33 taca Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:09 rillig Exp $ DISTNAME= ruby-GD-${VER}-1 PKGNAME= ${RUBY_PKGPREFIX}-gd-${VER}.1 @@ -15,11 +15,11 @@ USE_RUBY_EXTCONF= yes WRKSRC= ${WRKDIR}/ruby-GD-${VER} VER= 0.7.4 -CONFIGURE_ARGS+= --with-gd-dir=${PREFIX} +CONFIGURE_ARGS+= --with-gd-dir=${PREFIX:Q} CONFIGURE_ARGS+= --with-ttf -CONFIGURE_ARGS+= --with-ttf-dir=${PREFIX} +CONFIGURE_ARGS+= --with-ttf-dir=${PREFIX:Q} CONFIGURE_ARGS+= --with-freetype -CONFIGURE_ARGS+= --with-freetype-dir=${PREFIX} +CONFIGURE_ARGS+= --with-freetype-dir=${PREFIX:Q} CONFIGURE_ARGS+= --enable-gd2_0 post-install: diff --git a/graphics/ruby-opengl/Makefile b/graphics/ruby-opengl/Makefile index 674209dece7..1b3952f461c 100644 --- a/graphics/ruby-opengl/Makefile +++ b/graphics/ruby-opengl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/11/03 05:29:03 taca Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:09 rillig Exp $ DISTNAME= rbogl-${VERSION} PKGNAME= ${RUBY_PKGPREFIX}-opengl-${VERSION} @@ -14,8 +14,8 @@ USE_RUBY_EXTCONF= yes WRKSRC= ${WRKDIR}/opengl-${VERSION} VERSION= 0.32g INSTALL_TARGET= site-install -CONFIGURE_ARGS+= --with-ruby-dir="${LOCALBASE}" \ - --with-x11-dir="${X11BASE}" +CONFIGURE_ARGS+= --with-ruby-dir=${LOCALBASE:Q} \ + --with-x11-dir=${X11BASE:Q} post-install: ${INSTALL_DATA_DIR} ${RUBY_EXAMPLESDIR}/opengl diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile index 801d4a1a88a..8e24354ba36 100644 --- a/lang/drscheme/Makefile +++ b/lang/drscheme/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/12/05 20:50:24 rillig Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 23:55:09 rillig Exp $ # DISTNAME= plt-${DRSCHEME_VERSION}-src-unix @@ -72,7 +72,7 @@ post-install: .include "../../mk/bsd.pkg.mk" # See comment above. -CONFIGURE_ARGS+= --prefix=${PLT_HOME} +CONFIGURE_ARGS+= --prefix=${PLT_HOME:Q} # XXX: Gack. Ugly hackery to have the install process run with the regular # PATH. diff --git a/lang/gauche/Makefile b/lang/gauche/Makefile index 9e02d90fb99..5efd191d545 100644 --- a/lang/gauche/Makefile +++ b/lang/gauche/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/04/11 21:46:13 tv Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:09 rillig Exp $ # DISTNAME= Gauche-0.8.3 @@ -40,7 +40,7 @@ INFO_FILES= gauche-refe.info gauche-refj.info .include "../../mk/bsd.pkg.mk" .if !empty(_WITH_ICONV_LIB) -CONFIGURE_ARGS+= --with-iconv-lib=${_WITH_ICONV_LIB} +CONFIGURE_ARGS+= --with-iconv-lib=${_WITH_ICONV_LIB:Q} .else BUILDLINK_TRANSFORM+= rm:-liconv .endif diff --git a/lang/gauche/options.mk b/lang/gauche/options.mk index a9e185c40d8..89841cce70c 100644 --- a/lang/gauche/options.mk +++ b/lang/gauche/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/05/31 10:01:37 dillo Exp $ +# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:09 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.gauche PKG_SUPPORTED_OPTIONS= gdbm multibyte @@ -23,7 +23,7 @@ PLIST_SUBST+= USE_GDBM='@comment ' ### Multibyte extension. ### .if !empty(PKG_OPTIONS:Mmultibyte) && defined(GAUCHE_MULTIBYTE) -CONFIGURE_ARGS+= --enable-multibyte=${GAUCHE_MULTIBYTE} +CONFIGURE_ARGS+= --enable-multibyte=${GAUCHE_MULTIBYTE:Q} .endif .if defined(PKG_DEVELOPER) diff --git a/lang/gcc-ssp/Makefile b/lang/gcc-ssp/Makefile index 71d9e562b23..13321b2ded2 100644 --- a/lang/gcc-ssp/Makefile +++ b/lang/gcc-ssp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 23:55:09 rillig Exp $ DISTNAME= gcc-2.95.3 PKGNAME= gcc-ssp-2.95.3.13 @@ -34,8 +34,8 @@ USE_TOOLS+= gmake HAS_CONFIGURE= YES CONFIGURE_SCRIPT= ${WRKSRC}/configure -CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --enable-shared USE_TOOLS+= chmod diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 16580743bd5..0537090b2a3 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:09 rillig Exp $ DISTNAME= gcc-2.95.3 PKGREVISION= 6 @@ -23,8 +23,8 @@ MAKEFLAGS+= GMAKE_LOCALE=no HAS_CONFIGURE= YES CONFIGURE_SCRIPT= ${WRKSRC}/configure -CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --enable-shared USE_TOOLS+= chmod diff --git a/lang/gcc3/Makefile.common b/lang/gcc3/Makefile.common index 3fea3b23d81..d12fdace65a 100644 --- a/lang/gcc3/Makefile.common +++ b/lang/gcc3/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.18 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile.common,v 1.19 2005/12/05 23:55:09 rillig Exp $ GCC_VERSION= 3.3.5 DISTNAME= gcc-${GCC_VERSION} @@ -30,7 +30,7 @@ GCC3_PKGMODIF= _${GCC3_INSTALLTO_SUBPREFIX} GCC_SUBPREFIX= ${GCC3_INSTALLTO_SUBPREFIX} GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} -CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} +CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX:Q} FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX:Q} FILES_SUBST+= PKGNAME=${PKGNAME:Q} @@ -56,7 +56,7 @@ PTHREAD_OPTS+= require native .else GCC_PLATFORM= ${MACHINE_GNU_PLATFORM} .endif -CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q} PLIST_SUBST+= GCC_PLATFORM=${GCC_PLATFORM:Q} .if ${OPSYS} == "AIX" diff --git a/lang/gcc34-ada/Makefile b/lang/gcc34-ada/Makefile index b2e5415c5ad..03b4a35ca70 100644 --- a/lang/gcc34-ada/Makefile +++ b/lang/gcc34-ada/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:09 rillig Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -91,14 +91,14 @@ GCC34_PKGMODIF= ${GCC34_INSTALLTO_SUBPREFIX} GCC_SUBPREFIX= ${GCC34_INSTALLTO_SUBPREFIX} GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//} -CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q} GCC_ARCHSUBDIR= ${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION} GCC_ARCHDIR= ${PREFIX}/${GCC_ARCHSUBDIR} PLIST_SUBST+= GCC_SUBPREFIX=${GCC_SUBPREFIX:Q} FILES_SUBST+= GCC_PREFIX=${GCC_PREFIX:Q} FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} -CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} +CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} PTHREAD_OPTS+= require native CPPFLAGS+= -I${BUILDLINK_DIR}/include CFLAGS+= -I${BUILDLINK_DIR}/include diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile index 7e4b7f1a6ad..b34fa106215 100644 --- a/lang/gcc34/Makefile +++ b/lang/gcc34/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:09 rillig Exp $ # DISTNAME= gcc-${GCC_VERSION} @@ -78,12 +78,12 @@ LANGS+='java' .if !empty(BUILD_OBJC:M[Yy][Ee][Ss]) LANGS+='objc' .endif -CONFIGURE_ARGS+= --enable-languages="${LANGS}" +CONFIGURE_ARGS+= --enable-languages=${LANGS:Q} CONFIGURE_ARGS+= --with-system-zlib CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-__cxa_atexit CONFIGURE_ARGS+= --enable-long-long -CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX} +CONFIGURE_ARGS+= --with-local-prefix=${GCC_PREFIX:Q} CONFIGURE_ARGS+= --with-libiconv-prefix=${BUILDLINK_PREFIX.iconv} MAKE_ENV+= ICONVPREFIX=${BUILDLINK_PREFIX.iconv} @@ -144,13 +144,13 @@ GCC_SUBPREFIX= gcc34 GCC_PREFIX= ${PREFIX}/${GCC_SUBPREFIX} FILES_SUBST+= PKGNAME=${PKGNAME:Q} MESSAGE_SUBST+= GCC_PREFIX=${GCC_PREFIX} -CONFIGURE_ARGS+= --prefix=${GCC_PREFIX} +CONFIGURE_ARGS+= --prefix=${GCC_PREFIX:Q} CPPFLAGS+= -I${BUILDLINK_DIR}/include CFLAGS+= -I${BUILDLINK_DIR}/include .if ${OPSYS} == "NetBSD" # thread / crtbegin / __cxa_atexit support depend on a "netbsd2" OS name GCC_PLATFORM= ${LOWER_ARCH}--${LOWER_OPSYS}${APPEND_ELF}${LOWER_OS_VERSION:C/[_a-z].*//} -CONFIGURE_ARGS+= --host=${GCC_PLATFORM} +CONFIGURE_ARGS+= --host=${GCC_PLATFORM:Q} ABI_BASELINE_PAIR= ${GCC_PLATFORM:C/--/-/} MAKE_ENV+= ABI_BASELINE_PAIR=${ABI_BASELINE_PAIR:Q} .endif # NetBSD diff --git a/lang/gpc/Makefile b/lang/gpc/Makefile index d01b9e9c1a6..2b34b946872 100644 --- a/lang/gpc/Makefile +++ b/lang/gpc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:09 rillig Exp $ DISTNAME= gpc-2.1 PKGREVISION= 3 @@ -41,8 +41,8 @@ GPC_SUBPREFIX= ${_GCC_SUBPREFIX}/ HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/configure -CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM} -CONFIGURE_ARGS+= --prefix=${GPC_PREFIX} +CONFIGURE_ARGS+= --host=${MACHINE_GNU_PLATFORM:Q} +CONFIGURE_ARGS+= --prefix=${GPC_PREFIX:Q} CONFIGURE_ARGS+= --infodir=${PREFIX}/info CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-languages=pascal diff --git a/lang/jdk-openjit/Makefile.common b/lang/jdk-openjit/Makefile.common index e4ebbf662e7..b00837fbf5a 100644 --- a/lang/jdk-openjit/Makefile.common +++ b/lang/jdk-openjit/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.9 2005/12/05 20:50:25 rillig Exp $ +# $NetBSD: Makefile.common,v 1.10 2005/12/05 23:55:10 rillig Exp $ OPENJIT_VERSION=1.1.16 @@ -16,7 +16,7 @@ USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" .include "../../mk/java-vm.mk" -CONFIGURE_ARGS+=--with-jdk=${PKG_JAVA_HOME} +CONFIGURE_ARGS+=--with-jdk=${PKG_JAVA_HOME:Q} PLIST_SUBST+= CLASSDIR=${CLASSDIR:Q} JRELIB=${JRELIB:Q} JAVADIR=${PKG_JAVA_HOME:C|^${PREFIX}/||} diff --git a/lang/nhc98/Makefile b/lang/nhc98/Makefile index 86a7400d853..18d625b68ed 100644 --- a/lang/nhc98/Makefile +++ b/lang/nhc98/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:26 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:10 rillig Exp $ DISTNAME= nhc98src-1.18.tar.gz PKGNAME= nhc98-1.18 @@ -21,7 +21,7 @@ INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-K]*-* HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX} \ +CONFIGURE_ARGS+= --buildwith=gcc --installdir=${PREFIX:Q} \ +docs --docdir=${PREFIX}/share/doc/nhc98 USE_TOOLS+= gmake diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index cd65d16d33b..a88d22d723f 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.105 2005/10/19 04:40:23 jlam Exp $ +# $NetBSD: Makefile,v 1.106 2005/12/05 23:55:10 rillig Exp $ # The following two variables should have empty values unless we're # building a perl snapshot or release candidate. @@ -91,7 +91,7 @@ CONFIGURE_SCRIPT= ./Configure CONFIGURE_ARGS+= -sde CONFIGURE_ARGS+= -Darchname="${MACHINE_ARCH}-${LOWER_OPSYS}" CONFIGURE_ARGS+= -Dcc=${CC:Q} -CONFIGURE_ARGS+= -Doptimize=${CFLAGS:Q} +CONFIGURE_ARGS+= -Doptimize=${CFLAGS:M*:Q} CONFIGURE_ARGS+= -Duseshrplib CONFIGURE_ARGS+= -Ui_malloc CONFIGURE_ARGS+= -Uusemymalloc diff --git a/lang/php5/Makefile.php b/lang/php5/Makefile.php index 3dfc50fd3be..4a9323ac1e3 100644 --- a/lang/php5/Makefile.php +++ b/lang/php5/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.16 2005/12/05 20:50:26 rillig Exp $ +# $NetBSD: Makefile.php,v 1.17 2005/12/05 23:55:10 rillig Exp $ # .include "../../lang/php5/Makefile.common" @@ -17,7 +17,7 @@ PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-regex=system @@ -33,7 +33,7 @@ CONFIGURE_ARGS+= --disable-dom CONFIGURE_ARGS+= --disable-pdo CONFIGURE_ARGS+= --enable-xml -CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX} +CONFIGURE_ARGS+= --with-libxml-dir=${PREFIX:Q} .include "../../textproc/libxml2/buildlink3.mk" # Note: This expression is the same as ${PKGBASE}, but the latter is diff --git a/lang/ruby/modules.mk b/lang/ruby/modules.mk index 8d62c1d4107..e6320ec7033 100644 --- a/lang/ruby/modules.mk +++ b/lang/ruby/modules.mk @@ -1,4 +1,4 @@ -# $NetBSD: modules.mk,v 1.13 2005/12/05 20:50:27 rillig Exp $ +# $NetBSD: modules.mk,v 1.14 2005/12/05 23:55:10 rillig Exp $ .if !defined(_RUBY_MODULE_MK) _RUBY_MODULE_MK= # defined @@ -31,7 +31,7 @@ CONFIGURE_ENV+= RUBY=${RUBY:Q} RDOC=${RDOC:Q} RUBY_EXTCONF?= extconf.rb INSTALL_TARGET?= site-install -CONFIGURE_ARGS+= --with-opt-dir="${PREFIX}" +CONFIGURE_ARGS+= --with-opt-dir=${PREFIX:Q} RUBY_EXTCONF_CHECK?= yes RUBY_EXTCONF_MAKEFILE?= Makefile diff --git a/lang/ruby18-base/Makefile b/lang/ruby18-base/Makefile index 4fe874c1475..6996959adc6 100644 --- a/lang/ruby18-base/Makefile +++ b/lang/ruby18-base/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:27 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:10 rillig Exp $ # DISTNAME= ${RUBY_DISTNAME} @@ -39,7 +39,7 @@ MAKE_DIRS+= ${RUBY_SITERIDIR} .include "../../lang/ruby/rubyversion.mk" .if !empty(RUBY_SUFFIX) -CONFIGURE_ARGS+= --program-suffix="${RUBY_SUFFIX}" +CONFIGURE_ARGS+= --program-suffix=${RUBY_SUFFIX:Q} .endif FILES_SUBST+= DATE=${DATE:Q} diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile index c227ea53007..f30ccc86569 100644 --- a/mail/bogofilter/Makefile +++ b/mail/bogofilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/11/22 18:15:56 wiz Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:10 rillig Exp $ DISTNAME= bogofilter-0.96.6 CATEGORIES= mail @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/bogofilter CONF_FILES= ${EGDIR}/bogofilter.cf ${PKG_SYSCONFDIR}/bogofilter.cf diff --git a/mail/clamav/Makefile b/mail/clamav/Makefile index ecf82ee0d6f..7d9d9da4a6a 100644 --- a/mail/clamav/Makefile +++ b/mail/clamav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/12/05 20:50:28 rillig Exp $ +# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:10 rillig Exp $ DISTNAME= clamav-${CLAMAV_VERSION} PKGNAME= clamav-${CLAMAV_VERSION:S/-/./} @@ -17,10 +17,10 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --disable-clamav -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-dbdir=${VIRUSDBDIR} -CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER} -CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-dbdir=${VIRUSDBDIR:Q} +CONFIGURE_ARGS+= --with-uid=${CLAMAV_USER:Q} +CONFIGURE_ARGS+= --with-group=${CLAMAV_GROUP:Q} CONFIGURE_ARGS+= --with-tcpwrappers CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile index cb85576f192..aad13f2dc72 100644 --- a/mail/courier-imap/Makefile +++ b/mail/courier-imap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/12/05 20:50:29 rillig Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 23:55:10 rillig Exp $ DISTNAME= courier-imap-4.0.6 CATEGORIES= mail @@ -22,7 +22,7 @@ PKGNAME= ${DISTNAME} CONFIGURE_ARGS+= --datadir=${PREFIX}/share/courier CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/courier -CONFIGURE_ARGS+= --with-mailuser=${ROOT_USER} +CONFIGURE_ARGS+= --with-mailuser=${ROOT_USER:Q} CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//' CONFIGURE_ENV+= OPENSSL=${SSLBASE}/bin/openssl diff --git a/mail/courier-maildir/Makefile.common b/mail/courier-maildir/Makefile.common index f3c8a67d4b4..72fe5a4ddc5 100644 --- a/mail/courier-maildir/Makefile.common +++ b/mail/courier-maildir/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.7 2005/11/11 07:42:08 rillig Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/12/05 23:55:10 rillig Exp $ # # Package Makefiles should include this file after setting PKGNAME and # PKG_SUPPORTED_OPTIONS. @@ -14,8 +14,8 @@ EGDIR= ${PREFIX}/share/examples/courier .include "../../mk/bsd.prefs.mk" GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --disable-root-check CONFIGURE_ARGS+= --enable-unicode diff --git a/mail/cue/Makefile b/mail/cue/Makefile index 4af82d9fdc6..19ce398e731 100644 --- a/mail/cue/Makefile +++ b/mail/cue/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/10/05 13:29:50 wiz Exp $ +# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:10 rillig Exp $ DISTNAME= cue-snap-20050131 PKGNAME= cue-20050131 @@ -34,7 +34,7 @@ CONFIGURE_ARGS+= --without-canna CONFIGURE_ARGS+= --enable-idea .endif -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} INSTALLATION_DIRS= bin diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index 65641bd6994..cee91ae037e 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2005/12/05 20:50:29 rillig Exp $ +# $NetBSD: Makefile,v 1.58 2005/12/05 23:55:10 rillig Exp $ DISTNAME= cyrus-imapd-2.2.12 PKGREVISION= 2 @@ -30,14 +30,14 @@ BUILD_DEFS+= CYRUS_USER CYRUS_GROUP FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} -CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER:Q} +CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP:Q} CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} CONFIGURE_ENV+= ac_cv_lib_wrap_request_init=yes @@ -66,7 +66,7 @@ CONFIGURE_ARGS+= --with-krb=/usr .elif !empty(PKG_OPTIONS:Mgssapi) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-auth=krb5 -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} GSSIMPL.heimdal= heimdal GSSIMPL.mit-krb5= mit @@ -99,7 +99,7 @@ BUILD_DEFS+= CYRUS_IDLE (${CYRUS_IDLE} != "no") PKG_FAIL_REASON+= "CYRUS_IDLE must be poll, idled or no" .endif -CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE} +CONFIGURE_ARGS+= --with-idle=${CYRUS_IDLE:Q} .if ${CYRUS_IDLE} == "idled" PLIST_SUBST+= IDLED= .else diff --git a/mail/cyrus-imapd21/Makefile b/mail/cyrus-imapd21/Makefile index 49522ffc666..d93daa7b9b0 100644 --- a/mail/cyrus-imapd21/Makefile +++ b/mail/cyrus-imapd21/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.36 2005/12/05 20:50:29 rillig Exp $ +# $NetBSD: Makefile,v 1.37 2005/12/05 23:55:10 rillig Exp $ DISTNAME= cyrus-imapd-2.1.18 SVR4_PKGNAME= cimap @@ -32,13 +32,13 @@ BUILD_DEFS+= CYRUS_USER CYRUS_GROUP FILES_SUBST+= CYRUS_USER=${CYRUS_USER:Q} FILES_SUBST+= CYRUS_GROUP=${CYRUS_GROUP:Q} -CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER} -CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP} +CONFIGURE_ARGS+= --with-cyrus-user=${CYRUS_USER:Q} +CONFIGURE_ARGS+= --with-cyrus-group=${CYRUS_GROUP:Q} CONFIGURE_ARGS+= --with-cyrus-prefix=${PREFIX}/cyrus CONFIGURE_ARGS+= --with-statedir=${VARBASE}/run -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers} CONFIGURE_ENV+= ac_cv_lib_wrap_request_init=yes @@ -95,7 +95,7 @@ CONFIGURE_ARGS+= --with-krb=/usr .elif !empty(PKG_OPTIONS:Mgssapi) . include "../../mk/krb5.buildlink3.mk" CONFIGURE_ARGS+= --with-auth=unix -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} GSSIMPL.heimdal= heimdal GSSIMPL.mit-krb5= mit diff --git a/mail/dovecot/Makefile b/mail/dovecot/Makefile index 5a80b8c5528..63823394da4 100644 --- a/mail/dovecot/Makefile +++ b/mail/dovecot/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/08/23 11:48:48 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:10 rillig Exp $ DISTNAME= dovecot-0.99.14 PKGREVISION= 1 @@ -16,9 +16,9 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --with-ssldir=${SSLCERTS} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --with-ssldir=${SSLCERTS:Q} .include "../../mk/bsd.prefs.mk" .include "options.mk" diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile index b8728b6d92e..0013c2baf9c 100644 --- a/mail/dspam/Makefile +++ b/mail/dspam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/12/05 20:50:29 rillig Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:10 rillig Exp $ DISTNAME= dspam-3.6.2 CATEGORIES= mail @@ -57,15 +57,15 @@ DSPAM_PIDDIR?= ${VARBASE}/run/dspam DSPAM_WWWUSER?= ${APACHE_USER} DSPAM_WWWGROUP?= ${APACHE_GROUP} -CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE} -CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME} \ - --with-dspam-home-owner=${DSPAM_USER} \ - --with-dspam-home-group=${DSPAM_GROUP} \ - --with-dspam-owner=${DSPAM_USER} \ - --with-dspam-group=${DSPAM_GROUP} \ - --with-dspam-mode=${DSPAM_BINMODE} \ - --with-logdir=${DSPAM_LOGDIR} \ - --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-signature-life=${DSPAM_SIGNATURE_LIFE:Q} +CONFIGURE_ARGS+= --with-dspam-home=${DSPAM_HOME:Q} \ + --with-dspam-home-owner=${DSPAM_USER:Q} \ + --with-dspam-home-group=${DSPAM_GROUP:Q} \ + --with-dspam-owner=${DSPAM_USER:Q} \ + --with-dspam-group=${DSPAM_GROUP:Q} \ + --with-dspam-mode=${DSPAM_BINMODE:Q} \ + --with-logdir=${DSPAM_LOGDIR:Q} \ + --sysconfdir=${PKG_SYSCONFDIR:Q} .include "options.mk" .include "../../mk/pthread.buildlink3.mk" diff --git a/mail/esmtp/Makefile b/mail/esmtp/Makefile index 80748d14dd7..a10092adc73 100644 --- a/mail/esmtp/Makefile +++ b/mail/esmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/11/12 17:55:59 minskim Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 23:55:10 rillig Exp $ # DISTNAME= esmtp-0.5.1 @@ -16,7 +16,7 @@ USE_PKGINSTALL= yes USE_TOOLS+= bison flex PTHREAD_OPTS+= require -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} SUBST_CLASSES+= paths SUBST_MESSAGE.paths= "Fixing hardcoded paths." diff --git a/mail/fetchmail/options.mk b/mail/fetchmail/options.mk index 86307d57e40..c304cd60949 100644 --- a/mail/fetchmail/options.mk +++ b/mail/fetchmail/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.13 2005/10/25 17:52:38 scottr Exp $ +# $NetBSD: options.mk,v 1.14 2005/12/05 23:55:10 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.fetchmail PKG_SUPPORTED_OPTIONS= inet6 kerberos4 kerberos gssapi ssl @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --enable-inet6 ### Authentication via GSSAPI (currently only over Kerberos V) support. ### .if !empty(PKG_OPTIONS:Mgssapi) -CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-gssapi=${KRB5BASE:Q} .else CONFIGURE_ARGS+= --with-gssapi=no .endif @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --with-kerberos=no .if !empty(PKG_OPTIONS:Mkerberos) || !empty(PKG_OPTIONS:Mgssapi) . include "../../mk/krb5.buildlink3.mk" PKG_USE_KERBEROS= yes -CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} +CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} .else CONFIGURE_ARGS+= --with-kerberos5=no .endif @@ -54,7 +54,7 @@ CONFIGURE_ARGS+= --with-kerberos5=no ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} .else CONFIGURE_ARGS+= --without-ssl .endif diff --git a/mail/libspf-alt/Makefile b/mail/libspf-alt/Makefile index d936e8fa59d..c2de7692f96 100644 --- a/mail/libspf-alt/Makefile +++ b/mail/libspf-alt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:46:20 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:11 rillig Exp $ DISTNAME= libspf_alt-0.4.0 PKGREVISION= 2 @@ -12,7 +12,7 @@ COMMENT= Sender Permitted Framework (SPF) library BUILDLINK_DEPENDS.bind+= bind>=9.2.3nb3 HAS_CONFIGURE= YES -CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind} --prefix=${PREFIX} +CONFIGURE_ARGS+=--with-bind=${BUILDLINK_PREFIX.bind} --prefix=${PREFIX:Q} .include "../../devel/gettext-lib/buildlink3.mk" .include "../../net/bind9/buildlink3.mk" diff --git a/mail/mail-notification/Makefile b/mail/mail-notification/Makefile index 62e7c2805d4..b87a98ad587 100644 --- a/mail/mail-notification/Makefile +++ b/mail/mail-notification/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/10/05 13:29:50 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:11 rillig Exp $ # DISTNAME= mail-notification-1.0 @@ -16,7 +16,7 @@ USE_TOOLS+= gmake pkg-config USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} GCONF2_SCHEMAS= mail-notification.schemas diff --git a/mail/maildrop/Makefile b/mail/maildrop/Makefile index 1290e09bfe5..fed018a270d 100644 --- a/mail/maildrop/Makefile +++ b/mail/maildrop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/11/11 07:34:30 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:11 rillig Exp $ DISTNAME= maildrop-2.0.1 CATEGORIES= security @@ -29,12 +29,12 @@ PKGNAME= ${DISTNAME} # MAILDROP_TRUSTED_USERS?= ${ROOT_USER} ${COURIER_USER} qmaild -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-maildirquota -CONFIGURE_ARGS+= --enable-maildrop-uid=${ROOT_USER} -CONFIGURE_ARGS+= --enable-maildrop-gid=${COURIER_GROUP} -CONFIGURE_ARGS+= --enable-trusted-users='${MAILDROP_TRUSTED_USERS}' -CONFIGURE_ARGS+= --enable-trusted-groups='${COURIER_GROUP}' +CONFIGURE_ARGS+= --enable-maildrop-uid=${ROOT_USER:Q} +CONFIGURE_ARGS+= --enable-maildrop-gid=${COURIER_GROUP:Q} +CONFIGURE_ARGS+= --enable-trusted-users=${MAILDROP_TRUSTED_USERS:Q} +CONFIGURE_ARGS+= --enable-trusted-groups=${COURIER_GROUP:Q} CONFIGURE_ARGS+= --enable-syslog=1 .if !empty(PKG_OPTIONS:Mauthlib) diff --git a/mail/mailman/Makefile b/mail/mailman/Makefile index 1bd395f3dfe..d45d84e0769 100644 --- a/mail/mailman/Makefile +++ b/mail/mailman/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:33 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:11 rillig Exp $ DISTNAME= mailman-2.1.6 CATEGORIES= mail www @@ -72,15 +72,15 @@ PYTHON_PATCH_SCRIPTS+= admin/bin/faq2ht.py PYTHON_PATCH_SCRIPTS+= admin/bin/mm2do PYTHON_PATCH_SCRIPTS+= bin/msgfmt.py -CONFIGURE_ARGS+= --with-cgi-gid=${MAILMAN_CGIGROUP} +CONFIGURE_ARGS+= --with-cgi-gid=${MAILMAN_CGIGROUP:Q} .if ${MAILMAN_CGIEXT} != "none" -CONFIGURE_ARGS+= --with-cgi-ext=${MAILMAN_CGIEXT} +CONFIGURE_ARGS+= --with-cgi-ext=${MAILMAN_CGIEXT:Q} .endif -CONFIGURE_ARGS+= --with-groupname=${MAILMAN_GROUP} -CONFIGURE_ARGS+= --with-mail-gid=${MAILMAN_MAILGROUP} -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} -CONFIGURE_ARGS+= --with-username=${MAILMAN_USER} -CONFIGURE_ARGS+= --with-var-prefix=${MAILMAN_DATADIR} +CONFIGURE_ARGS+= --with-groupname=${MAILMAN_GROUP:Q} +CONFIGURE_ARGS+= --with-mail-gid=${MAILMAN_MAILGROUP:Q} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} +CONFIGURE_ARGS+= --with-username=${MAILMAN_USER:Q} +CONFIGURE_ARGS+= --with-var-prefix=${MAILMAN_DATADIR:Q} CONFIGURE_ARGS+= --without-permcheck # Put in externally invalid defaults (MESSAGE directs how to fix it) diff --git a/mail/mairix/Makefile b/mail/mairix/Makefile index afd148680d6..abe17c23081 100644 --- a/mail/mairix/Makefile +++ b/mail/mairix/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:50:33 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:11 rillig Exp $ # DISTNAME= mairix-0.16.1 @@ -12,7 +12,7 @@ COMMENT= Program for indexing and searching email messages BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} USE_MAKEINFO= YES INFO_FILES= mairix.info diff --git a/mail/milter-greylist/Makefile b/mail/milter-greylist/Makefile index c2ca9f1cf45..cc02f8f4d20 100644 --- a/mail/milter-greylist/Makefile +++ b/mail/milter-greylist/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/10/21 22:26:59 tron Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:11 rillig Exp $ DISTNAME= milter-greylist-2.0.2 CATEGORIES= mail @@ -13,8 +13,8 @@ USE_PKGINSTALL= YES HAS_CONFIGURE= YES CONFIGURE_ARGS+=--with-user=smmsp -CONFIGURE_ARGS+=--with-libspf_alt=${PREFIX} -CONFIGURE_ARGS+=--prefix=${PREFIX} +CONFIGURE_ARGS+=--with-libspf_alt=${PREFIX:Q} +CONFIGURE_ARGS+=--prefix=${PREFIX:Q} BUILD_TARGET= milter-greylist PKG_GROUPS= smmsp diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile index e153e73d4d6..398a209801f 100644 --- a/mail/mimedefang/Makefile +++ b/mail/mimedefang/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 20:50:34 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:11 rillig Exp $ DISTNAME= mimedefang-2.52 PKGREVISION= 1 @@ -46,12 +46,12 @@ OWN_DIRS_PERMS+= ${DEFANG_SPOOLDIR} ${DEFANG_USER} ${DEFANG_GROUP} 0700 CONF_FILES+= ${EGDIR}/mimedefang-filter ${PKG_SYSCONFDIR}/mimedefang-filter CONF_FILES+= ${EGDIR}/sa-mimedefang.cf ${PKG_SYSCONFDIR}/sa-mimedefang.cf -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-confsubdir= CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib -CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR} -CONFIGURE_ARGS+= --with-quarantinedir=${DEFANG_SPOOLDIR} +CONFIGURE_ARGS+= --with-spooldir=${DEFANG_SPOOLDIR:Q} +CONFIGURE_ARGS+= --with-quarantinedir=${DEFANG_SPOOLDIR:Q} # CONFIGURE_ARGS+= --disable-anti-virus # list the paths where they _would_ be installed, so they # can be found at runtime. -- they have to be listed diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile index 36a97ef3b2b..18597fdf4b3 100644 --- a/mail/mutt-devel/Makefile +++ b/mail/mutt-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:34 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $ DISTNAME= mutt-1.5.11 PKGREVISION= 2 @@ -23,7 +23,7 @@ USE_TOOLS+= perl:run REPLACE_PERL= *.pl */*.pl GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ --with-docdir=${PREFIX}/share/doc/mutt \ --without-included-gettext \ --enable-pop \ diff --git a/mail/mutt-devel/options.mk b/mail/mutt-devel/options.mk index ffd0e8f2c90..1c662836fc1 100644 --- a/mail/mutt-devel/options.mk +++ b/mail/mutt-devel/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2005/10/04 15:37:32 tonio Exp $ +# $NetBSD: options.mk,v 1.11 2005/12/05 23:55:11 rillig Exp $ # Global and legacy options @@ -35,7 +35,7 @@ CONFIGURE_ARGS+= --with-sasl=${BUILDLINK_PREFIX.cyrus-sasl} ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} .else CONFIGURE_ARGS+= --without-ssl .endif diff --git a/mail/mutt/Makefile b/mail/mutt/Makefile index 605a01a16f7..230c4a648fc 100644 --- a/mail/mutt/Makefile +++ b/mail/mutt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.129 2005/12/05 20:50:34 rillig Exp $ +# $NetBSD: Makefile,v 1.130 2005/12/05 23:55:11 rillig Exp $ DISTNAME= mutt-1.4.2.1i PKGNAME= ${DISTNAME:C/i$//} @@ -22,7 +22,7 @@ BUILD_USES_MSGFMT= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ --with-docdir=${PREFIX}/share/doc/mutt \ --without-included-gettext \ --enable-pop \ diff --git a/mail/mutt/options.mk b/mail/mutt/options.mk index 9b22cdc1be7..d0390af0eef 100644 --- a/mail/mutt/options.mk +++ b/mail/mutt/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.7 2005/05/31 10:01:38 dillo Exp $ +# $NetBSD: options.mk,v 1.8 2005/12/05 23:55:11 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.mutt PKG_SUPPORTED_OPTIONS= slang ncurses ssl buffy-size @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-curses=${BUILDLINK_PREFIX.ncurses} ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} .else CONFIGURE_ARGS+= --without-ssl .endif diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile index cf2236f0854..88ec858eae6 100644 --- a/mail/nmh/Makefile +++ b/mail/nmh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2005/12/05 20:50:34 rillig Exp $ +# $NetBSD: Makefile,v 1.60 2005/12/05 23:55:11 rillig Exp $ DISTNAME= nmh-1.0.4 PKGREVISION= 6 @@ -29,16 +29,16 @@ GNU_CONFIGURE= yes USE_PKGINSTALL= yes CONFIGURE_ARGS+= --libdir=${PREFIX}/libexec/nmh -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-nmh-pop -CONFIGURE_ARGS+= --with-mts=${NMH_MTA} +CONFIGURE_ARGS+= --with-mts=${NMH_MTA:Q} .if defined(NMH_EDITOR) -CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR} +CONFIGURE_ARGS+= --with-editor=${NMH_EDITOR:Q} .endif .if defined(NMH_PAGER) -CONFIGURE_ARGS+= --with-pager=${NMH_PAGER} +CONFIGURE_ARGS+= --with-pager=${NMH_PAGER:Q} .endif .if defined(KERBEROS) diff --git a/mail/nullmailer/Makefile b/mail/nullmailer/Makefile index cfd33e11411..acf0da9f272 100644 --- a/mail/nullmailer/Makefile +++ b/mail/nullmailer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:34 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:11 rillig Exp $ DISTNAME= nullmailer-1.00 CATEGORIES= mail @@ -11,7 +11,7 @@ COMMENT= Simple relay-only mail transport agent USE_LANGUAGES= c++ USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/spool CONFIGURE_ARGS+= --bindir=${PREFIX}/libexec/nullmailer CONFIGURE_ARGS+= --sbindir=${PREFIX}/libexec/nullmailer diff --git a/mail/pine-pgp-filters/Makefile b/mail/pine-pgp-filters/Makefile index beffd21dbd3..5136addd006 100644 --- a/mail/pine-pgp-filters/Makefile +++ b/mail/pine-pgp-filters/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/02/07 15:54:04 abs Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:11 rillig Exp $ # DISTNAME= pine-pgp-filters-1.1 @@ -11,7 +11,7 @@ HOMEPAGE= http://dougbarton.net/FreeBSD/Downloads/ COMMENT= Filters to integrate Pine with gnupg or pgp HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} DOCDIR= ${PREFIX}/share/doc/pine-pgp-filters DOCFILES= BUGS CHANGES INSTALL LICENSE README diff --git a/mail/qpopper/Makefile b/mail/qpopper/Makefile index 46dab7713b5..51a158d4b16 100644 --- a/mail/qpopper/Makefile +++ b/mail/qpopper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.52 2005/12/05 14:13:05 taca Exp $ +# $NetBSD: Makefile,v 1.53 2005/12/05 23:55:11 rillig Exp $ # DISTNAME= qpopper${VERSION} @@ -16,8 +16,8 @@ COMMENT= Qualcomm's POP server for Eudora .include "Makefile.common" -CONFIGURE_ARGS+= --enable-apop=${QPOPPER_APOP_AUTH} \ - --enable-popuid=${QPOPPER_USER} \ +CONFIGURE_ARGS+= --enable-apop=${QPOPPER_APOP_AUTH:Q} \ + --enable-popuid=${QPOPPER_USER:Q} \ --disable-update-abort --without-gdbm .include "options.mk" @@ -28,7 +28,7 @@ QPOPPER_APOP_AUTH?= ${PKG_SYSCONFDIR}/apop.auth DB_SUFFIX?= db .if defined(QPOPPER_SPOOL_DIR) -CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR} +CONFIGURE_ARGS+= --enable-spool-dir=${QPOPPER_SPOOL_DIR:Q} .endif USE_PKGINSTALL= yes diff --git a/mail/qpopper/Makefile.common b/mail/qpopper/Makefile.common index db912af49fc..a3a9dfbbeaa 100644 --- a/mail/qpopper/Makefile.common +++ b/mail/qpopper/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.17 2005/06/13 16:53:47 taca Exp $ +# $NetBSD: Makefile.common,v 1.18 2005/12/05 23:55:11 rillig Exp $ QPOPPER_MASTER_SITES+= ftp://ftp.qualcomm.com/eudora/servers/unix/popper/ \ http://core.ring.gr.jp/archives/net/mail/qpopper/ @@ -10,6 +10,6 @@ VERSION= 4.0.8 QPOPPER_FAC?= LOCAL1 GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ --enable-log-facility=LOG_${QPOPPER_FAC} LIBS+= ${LDFLAGS} diff --git a/mail/qpopper/options.mk b/mail/qpopper/options.mk index 6adfc1b98d0..2c19ce21476 100644 --- a/mail/qpopper/options.mk +++ b/mail/qpopper/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.10 2005/12/05 14:13:05 taca Exp $ +# $NetBSD: options.mk,v 1.11 2005/12/05 23:55:11 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.qpopper PKG_SUPPORTED_OPTIONS= drac inet6 kerberos pam qpopper-servermode ssl @@ -10,7 +10,7 @@ PKG_OPTIONS_LEGACY_VARS+= QPOPPER_USE_DRAC:drac .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .else CONFIGURE_ARGS+= --without-ssl .endif diff --git a/mail/spamassassin/Makefile b/mail/spamassassin/Makefile index 40fc789f50f..9953024b733 100644 --- a/mail/spamassassin/Makefile +++ b/mail/spamassassin/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.65 2005/12/05 20:50:35 rillig Exp $ +# $NetBSD: Makefile,v 1.66 2005/12/05 23:55:11 rillig Exp $ DISTNAME= Mail-SpamAssassin-3.1.0 PKGNAME= spamassassin-3.1.0 @@ -47,7 +47,7 @@ PLIST_SRC= ${PKGDIR}/PLIST ${PLIST_ADD} PERL5_PACKLIST= auto/Mail/SpamAssassin/.packlist GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_DIRS= ${WRKSRC}/spamc BUILD_DIRS= ${WRKSRC} PERL5_CONFIGURE= NO # we need the default "do-configure" target diff --git a/mail/spamprobe/options.mk b/mail/spamprobe/options.mk index 6073bde1d2a..5d863c13cf9 100644 --- a/mail/spamprobe/options.mk +++ b/mail/spamprobe/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/06/29 00:06:58 hubertf Exp $ +# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:11 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.spamprobe PKG_SUPPORTED_OPTIONS= bdb @@ -9,6 +9,6 @@ PKG_SUGGESTED_OPTIONS= bdb .if !empty(PKG_OPTIONS:Mbdb) BDB_ACCEPTED= db4 # db3 db2 (not tested) .include "../../mk/bdb.buildlink3.mk" -CONFIGURE_ARGS+= --with-db=${BDBBASE} +CONFIGURE_ARGS+= --with-db=${BDBBASE:Q} .endif diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile index 8066541a16a..59063e380ec 100644 --- a/mail/sqwebmail/Makefile +++ b/mail/sqwebmail/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/12/05 20:50:35 rillig Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $ DISTNAME= sqwebmail-5.0.6 CATEGORIES= mail www @@ -41,22 +41,22 @@ MIME_TYPES= ${PKG_SYSCONFDIR}/mime.types:${PKG_SYSCONFBASEDIR}/httpd/mime.types # This is used by the sqwebmail configure script to set the location of # the sqwebmaild socket file and lockfile. # -CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR} +CONFIGURE_ARGS+= --localstatedir=${SQWEBMAIL_STATEDIR:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/share/courier CONFIGURE_ARGS+= --program-transform-name='s/\.rc$$//' CONFIGURE_ARGS+= --enable-cgibindir=${PREFIX}/libexec/cgi-bin CONFIGURE_ARGS+= --enable-https=auto -CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR} -CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL} -CONFIGURE_ARGS+= --enable-mimetypes="${MIME_TYPES}" -CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR} -CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER} -CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR} +CONFIGURE_ARGS+= --enable-imagedir=${SQWEBMAIL_IMAGEDIR:Q} +CONFIGURE_ARGS+= --enable-imageurl=${SQWEBMAIL_IMAGEURL:Q} +CONFIGURE_ARGS+= --enable-mimetypes=${MIME_TYPES:Q} +CONFIGURE_ARGS+= --with-cachedir=${SQWEBMAIL_CACHEDIR:Q} +CONFIGURE_ARGS+= --with-cacheowner=${ROOT_USER:Q} +CONFIGURE_ARGS+= --with-calendardir=${SQWEBMAIL_CALENDARDIR:Q} CONFIGURE_ARGS+= --with-ispell="${LOCALBASE}/bin/ispell" CONFIGURE_ARGS+= --with-mailer="${SENDMAIL} -oi -t" -CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP} +CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP:Q} CONFIGURE_ARGS+= --with-piddir=${VARBASE}/run CONFIGURE_ENV+= GPG="${LOCALBASE}/bin/gpg" diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile index 64c61ca5085..b2769ed4ae9 100644 --- a/mail/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/05/22 20:08:12 jlam Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:11 rillig Exp $ # # TLS functionality needs testing. Please let me know the result, # and preferably info about your system. @@ -19,7 +19,7 @@ WRKSRC= ${WRKDIR}/${PKGNAME_NOREV:S/.orig$//} USE_TOOLS+= gmake USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} .include "options.mk" diff --git a/mail/sylpheed-claws/Makefile b/mail/sylpheed-claws/Makefile index f87e8006d75..b492ef587d4 100644 --- a/mail/sylpheed-claws/Makefile +++ b/mail/sylpheed-claws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/06/01 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:11 rillig Exp $ .include "Makefile.common" @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --disable-spamassassin-plugin CONFIGURE_ARGS+= --disable-mathml-viewer-plugin PKG_SYSCONFSUBDIR= sylpheed -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/mail/sylpheed-devel/Makefile b/mail/sylpheed-devel/Makefile index 44af5aae571..d3916e43eb7 100644 --- a/mail/sylpheed-devel/Makefile +++ b/mail/sylpheed-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/12/02 07:48:27 xtraeme Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:12 rillig Exp $ DISTNAME= sylpheed-2.1.8 CATEGORIES= mail news x11 @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-ssl CONFIGURE_ARGS+= --enable-compface PKG_SYSCONFSUBDIR= sylpheed -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/sylpheed CONF_FILES= ${EGDIR}/mime.types ${PKG_SYSCONFDIR}/mime.types diff --git a/mail/sylpheed/Makefile b/mail/sylpheed/Makefile index fd2b83dedb4..cb1cbbff46a 100644 --- a/mail/sylpheed/Makefile +++ b/mail/sylpheed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/11/27 19:27:20 salo Exp $ +# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:11 rillig Exp $ DISTNAME= sylpheed-2.0.4 CATEGORIES= mail news x11 @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --enable-gpgme CONFIGURE_ARGS+= --enable-compface PKG_SYSCONFSUBDIR= sylpheed -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_OPTIONS_VAR= PKG_OPTIONS.sylpheed PKG_SUPPORTED_OPTIONS= jpilot ldap inet6 diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile index c8e6ca9fe1e..cc6f334c174 100644 --- a/mail/sympa/Makefile +++ b/mail/sympa/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/10/07 18:42:33 wiz Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= sympa-4.1.2 @@ -35,13 +35,13 @@ OPSYSVARS+= DEPENDS USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-cgidir=${SYMPA_BIN} +CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-cgidir=${SYMPA_BIN:Q} CONFIGURE_ARGS+= --with-iconsdir=${SYMPA_PREFIX}/httpd/icons -CONFIGURE_ARGS+= --with-bindir=${SYMPA_BIN} -CONFIGURE_ARGS+= --with-sbindir=${SYMPA_BIN} -CONFIGURE_ARGS+= --with-libexecdir=${SYMPA_BIN} -CONFIGURE_ARGS+= --with-libdir=${SYMPA_BIN} +CONFIGURE_ARGS+= --with-bindir=${SYMPA_BIN:Q} +CONFIGURE_ARGS+= --with-sbindir=${SYMPA_BIN:Q} +CONFIGURE_ARGS+= --with-libexecdir=${SYMPA_BIN:Q} +CONFIGURE_ARGS+= --with-libdir=${SYMPA_BIN:Q} CONFIGURE_ARGS+= --with-datadir=${SYMPA_BIN}/etc CONFIGURE_ARGS+= --with-expldir=${SYMPA_VARBASE}/expl CONFIGURE_ARGS+= --with-mandir=${PREFIX}/${PKGMANDIR} @@ -50,14 +50,14 @@ CONFIGURE_ARGS+= --with-piddir=${SYMPA_VARBASE}/run CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR}/sympa CONFIGURE_ARGS+= --with-nlsdir=${SYMPA_PREFIX}/nls CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/html/sympa -CONFIGURE_ARGS+= --with-scriptdir=${SYMPA_BIN} +CONFIGURE_ARGS+= --with-scriptdir=${SYMPA_BIN:Q} CONFIGURE_ARGS+= --with-sampledir=${PREFIX}/share/examples/sympa -CONFIGURE_ARGS+= --with-spooldir=${SYMPA_SPOOL} -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-spooldir=${SYMPA_SPOOL:Q} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-mhonarc=${MHONARC_PREFIX}/bin/mhonarc CONFIGURE_ARGS+= --with-openssl=${SSLBASE}/bin/openssl -CONFIGURE_ARGS+= --with-user=${SYMPA_USER} -CONFIGURE_ARGS+= --with-group=${SYMPA_GROUP} +CONFIGURE_ARGS+= --with-user=${SYMPA_USER:Q} +CONFIGURE_ARGS+= --with-group=${SYMPA_GROUP:Q} MHONARC_PREFIX_DEFAULT= ${LOCALBASE} EVAL_PREFIX+= MHONARC_PREFIX=mhonarc diff --git a/mail/teapop/Makefile b/mail/teapop/Makefile index 294352872d7..b5df6bcd489 100644 --- a/mail/teapop/Makefile +++ b/mail/teapop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:46:28 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:12 rillig Exp $ DISTNAME= teapop-0.3.8 PKGREVISION= 2 @@ -14,7 +14,7 @@ USE_PKGINSTALL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-flock -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-piddir=${VARBASE}/run EGDIR= ${PREFIX}/share/examples/teapop diff --git a/mail/yatsvrs/Makefile b/mail/yatsvrs/Makefile index f417a44cdb4..605240fcdf4 100644 --- a/mail/yatsvrs/Makefile +++ b/mail/yatsvrs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:36 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= yatsvrs-5.00p6 @@ -21,9 +21,9 @@ EXAMPLES= yatrc2 yatsvrrc EXAMPLESDIR= ${PREFIX}/share/examples/yatsvr5 CONFIGURE_ARGS+= --enable-popper-xmit -CONFIGURE_ARGS+= --with-log-facility=${YATSVR_LOGFAC} -CONFIGURE_ARGS+= --with-yat-sys-dir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR} +CONFIGURE_ARGS+= --with-log-facility=${YATSVR_LOGFAC:Q} +CONFIGURE_ARGS+= --with-yat-sys-dir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-yat-sys-old-dir-v4=${OLDCONFDIR:Q} CONFIGURE_ARGS+= --enable-shadow-password DEINSTALL_FILE= ${WRKDIR}/DEINSTALL diff --git a/math/mpfr/Makefile b/math/mpfr/Makefile index 516f2f93f75..e2618988ab8 100644 --- a/math/mpfr/Makefile +++ b/math/mpfr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/11/04 11:12:29 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= mpfr-2.0.3 @@ -13,7 +13,7 @@ COMMENT= GMP-based library for multiple-precision floating-point computations USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-gmp-include=${GMP_DIR} +CONFIGURE_ARGS+= --with-gmp-include=${GMP_DIR:Q} CONFIGURE_DIRS= ${GMP_DIR} ${WRKSRC} BUILD_DIRS= ${WRKSRC} diff --git a/math/pari/Makefile b/math/pari/Makefile index e4d28e67eff..a078b46099f 100644 --- a/math/pari/Makefile +++ b/math/pari/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:37 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:12 rillig Exp $ DISTNAME= pari-2.1.6 CATEGORIES= math @@ -18,7 +18,7 @@ USE_TOOLS+= perl:run HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${WRKSRC}/Configure CONFIGURE_ARGS+= --graphic=X11 -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --share-prefix=${PREFIX}/share CONFIGURE_ENV+= LOCALBASE=${LOCALBASE:Q} CONFIGURE_ENV+= PERL5=${PERL5:Q} diff --git a/math/udunits/Makefile b/math/udunits/Makefile index e58262523b0..88f6c0504ce 100644 --- a/math/udunits/Makefile +++ b/math/udunits/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/08/08 18:13:13 jlam Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:12 rillig Exp $ DISTNAME= udunits PKGNAME= udunits-1.12.1 @@ -16,7 +16,7 @@ DIST_SUBDIR= ${PKGNAME_NOREV} USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CPPFLAGS+= -Df2cFortran -Dunix PERL5_CONFIGURE= no diff --git a/math/xmgr/Makefile b/math/xmgr/Makefile index 04c468c965e..c47a61cb949 100644 --- a/math/xmgr/Makefile +++ b/math/xmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:37 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:12 rillig Exp $ DISTNAME= xmgr-4.1.2 PKGREVISION= 1 @@ -19,7 +19,7 @@ BUILD_DEPENDS+= bison-[0-9]*:../../devel/bison USE_X11BASE= YES USE_LANGUAGES= fortran GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --enable-acegr-home="${PREFIX}" +CONFIGURE_ARGS+= --enable-acegr-home=${PREFIX:Q} BUILD_TARGET= # empty INSTALL_TARGET= install diff --git a/mbone/vat/Makefile b/mbone/vat/Makefile index 513eac8053b..6f0465c4aa3 100644 --- a/mbone/vat/Makefile +++ b/mbone/vat/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.49 2005/06/01 18:03:04 jlam Exp $ +# $NetBSD: Makefile,v 1.50 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= vatsrc-4.0b2 @@ -12,7 +12,7 @@ COMMENT= The Visual Audio Tool - multicast audioconferencing WRKSRC= ${WRKDIR}/${PKGNAME_NOREV} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-tcl=${PREFIX} --with-tk=${PREFIX} +CONFIGURE_ARGS+= --with-tcl=${PREFIX:Q} --with-tk=${PREFIX:Q} CPPFLAGS+= -I${LOCALBASE}/include -I${LOCALBASE}/include/gsm diff --git a/meta-pkgs/kde3/kde3.mk b/meta-pkgs/kde3/kde3.mk index 8575a984f37..e6a5a153911 100644 --- a/meta-pkgs/kde3/kde3.mk +++ b/meta-pkgs/kde3/kde3.mk @@ -1,4 +1,4 @@ -# $NetBSD: kde3.mk,v 1.10 2005/12/05 20:50:37 rillig Exp $ +# $NetBSD: kde3.mk,v 1.11 2005/12/05 23:55:12 rillig Exp $ # # This Makefile fragment is included by packages that use the KDE3 # configure-and-build process. @@ -54,9 +54,9 @@ KDEDIR?= ${PREFIX} QTDIR?= ${PREFIX}/qt3 CONFIGURE_ARGS+= --datadir="${KDEDIR}/share/kde" -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" -CONFIGURE_ARGS+= --with-qt-dir="${QTDIR}" -CONFIGURE_ARGS+= --with-extra-includes="${_KDE3_EXTRA_INCLUDES}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} +CONFIGURE_ARGS+= --with-extra-includes=${_KDE3_EXTRA_INCLUDES:Q} CONFIGURE_ARGS+= --disable-rpath CONFIGURE_ARGS+= --disable-debug .if exists(${X11BASE}/lib/libXinerama.so) diff --git a/misc/bottlerocket/Makefile b/misc/bottlerocket/Makefile index 5e2cb5fc2df..2a841ceaa3f 100644 --- a/misc/bottlerocket/Makefile +++ b/misc/bottlerocket/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/05/22 20:08:14 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:12 rillig Exp $ DISTNAME= bottlerocket-0.04c CATEGORIES= misc @@ -13,7 +13,7 @@ GNU_CONFIGURE= yes BUILD_TARGET= br X10_PORT?= ${DEFAULT_SERIAL_DEVICE} -CONFIGURE_ARGS+=--with-x10port=${X10_PORT} +CONFIGURE_ARGS+=--with-x10port=${X10_PORT:Q} BUILD_DEFS+= X10_PORT .include "../../mk/bsd.pkg.mk" diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common index 80f40dda62e..7f76ccc0c67 100644 --- a/misc/celestia/Makefile.common +++ b/misc/celestia/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.20 2005/12/05 20:50:38 rillig Exp $ +# $NetBSD: Makefile.common,v 1.21 2005/12/05 23:55:12 rillig Exp $ DISTNAME= celestia-${CELESTIA_VERS} CATEGORIES= misc x11 @@ -18,7 +18,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-lua --with-glut .if defined(CELESTIA_PROGPREFIX) -CONFIGURE_ARGS+= --program-prefix=${CELESTIA_PROGPREFIX} +CONFIGURE_ARGS+= --program-prefix=${CELESTIA_PROGPREFIX:Q} .endif GCC_REQD+= 3.0 diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile index d4bfbf80fff..aada939aa27 100644 --- a/misc/dpkg/Makefile +++ b/misc/dpkg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:38 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= ${PKGNAME:S,-,_,} @@ -27,7 +27,7 @@ ADMIN_DIR= ${PREFIX}/var/db CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --with-start-stop-daemon=no CONFIGURE_ARGS+= --with-sgml-doc=no -CONFIGURE_ARGS+= --with-admindir=${ADMIN_DIR} +CONFIGURE_ARGS+= --with-admindir=${ADMIN_DIR:Q} CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/dpkg .include "../../converters/libiconv/buildlink3.mk" diff --git a/misc/less/Makefile b/misc/less/Makefile index 61a9ba4ebbc..e03a7371ef5 100644 --- a/misc/less/Makefile +++ b/misc/less/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:46:38 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= less-382 @@ -12,6 +12,6 @@ COMMENT= Pager similar to more and pg GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.pkg.mk" diff --git a/misc/libutf/Makefile b/misc/libutf/Makefile index 1cfa80df79e..ec54dba1843 100644 --- a/misc/libutf/Makefile +++ b/misc/libutf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/30 08:54:59 agc Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= libutf-2.10 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes BUILD_TARGET= tst -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/libutf CONF_FILES= ${EGDIR}/langcoll.utf ${PKG_SYSCONFDIR}/langcoll.utf diff --git a/misc/pinfo/Makefile b/misc/pinfo/Makefile index a6d8a283314..c70afdc64fc 100644 --- a/misc/pinfo/Makefile +++ b/misc/pinfo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:40 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= pinfo-0.6.1 @@ -20,7 +20,7 @@ INFO_FILES= pinfo.info CPPFLAGS+= -DDFLT_INFOPATH="\"/usr/share/info:${X11BASE}/info:${LOCALBASE}/info:/usr/local/info\"" -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES= ${PREFIX}/share/examples/pinfo/pinforc ${PKG_SYSCONFDIR}/pinforc diff --git a/misc/ppower/Makefile b/misc/ppower/Makefile index 3614a4a6fe8..ab346f52c2f 100644 --- a/misc/ppower/Makefile +++ b/misc/ppower/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/04/11 21:46:39 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= ppower-0.1.5 @@ -13,7 +13,7 @@ COMMENT= X10 controller software for the CM11A interface GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/ppower diff --git a/misc/qterm/Makefile b/misc/qterm/Makefile index b3d99386b3b..38b1f28f77e 100644 --- a/misc/qterm/Makefile +++ b/misc/qterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/30 08:55:00 agc Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:12 rillig Exp $ # DISTNAME= qterm-ac-1.0 @@ -14,7 +14,7 @@ COMMENT= Utility to recognise terminal type automatically USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/qterm CONF_FILES= ${EGDIR}/qtermtab ${PKG_SYSCONFDIR}/qtermtab diff --git a/misc/xtide/Makefile b/misc/xtide/Makefile index a5b8c409c10..787568fab28 100644 --- a/misc/xtide/Makefile +++ b/misc/xtide/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:41 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:12 rillig Exp $ DISTNAME= xtide-2.4 PKGREVISION= 3 @@ -16,7 +16,7 @@ XTIDE_SRC= ${DISTNAME}${EXTRACT_SUFX} USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/xtide CONF_FILES= ${EGDIR}/xtide.conf ${PKG_SYSCONFDIR}/xtide.conf diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index f9dad02bb21..78709536ce5 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:41 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:12 rillig Exp $ DISTNAME= ffmpeg-0.4.8 PKGREVISION= 3 @@ -22,7 +22,7 @@ MAKE_ENV+= EXTRA_LIBS=${BUILDLINK_LDADD.getopt:Q} \ LOCALBASE=${LOCALBASE:Q} CONFIGURE_ARGS+= --cc=${CC:Q} -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --enable-pp CONFIGURE_ARGS+= --disable-vhook CONFIGURE_ARGS+= --disable-debug diff --git a/multimedia/mplayer-share/Makefile.common b/multimedia/mplayer-share/Makefile.common index 3fb3ee69713..c358452d180 100644 --- a/multimedia/mplayer-share/Makefile.common +++ b/multimedia/mplayer-share/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.25 2005/12/05 20:50:43 rillig Exp $ +# $NetBSD: Makefile.common,v 1.26 2005/12/05 23:55:13 rillig Exp $ MPLAYER_DIST_VERSION= 1.0pre7 @@ -38,7 +38,7 @@ HAS_CONFIGURE= YES PTHREAD_OPTS+= require -CONFIGURE_ARGS+= --prefix="${PREFIX}" \ +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \ --with-extraincdir="${LOCALBASE}/include:${LOCALBASE}/include/faad2" \ --with-extralibdir="${LOCALBASE}/lib" \ --with-x11incdir="${X11BASE}/include" \ diff --git a/multimedia/ogmtools/Makefile b/multimedia/ogmtools/Makefile index 95b035c3410..49bf7908fa9 100644 --- a/multimedia/ogmtools/Makefile +++ b/multimedia/ogmtools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:42 tv Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= ogmtools-1.5 @@ -13,7 +13,7 @@ COMMENT= Ogg Media files manipulation tools USE_LANGUAGES= c c++ GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-dvdread-includes=${BUILDLINK_DIR} +CONFIGURE_ARGS+= --with-dvdread-includes=${BUILDLINK_DIR:Q} .include "../../audio/libvorbis/buildlink3.mk" .include "../../multimedia/libdvdread/buildlink3.mk" diff --git a/net/GeoIP/Makefile b/net/GeoIP/Makefile index 799844fe625..53b04f9c5ea 100644 --- a/net/GeoIP/Makefile +++ b/net/GeoIP/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/10/22 21:50:58 heinz Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= GeoIP-1.3.14 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USE_LIBTOOL= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/GeoIP CONF_FILES= ${EGDIR}/GeoIP.conf.default ${PKG_SYSCONFDIR}/GeoIP.conf diff --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index 2c210b48776..b2ad5156170 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/11/13 10:23:26 wiz Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= ORBit2-2.12.4 @@ -19,7 +19,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES #TEST_TARGET= check -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc PKGCONFIG_OVERRIDE= ORBit-2.0.pc.in diff --git a/net/arla/Makefile b/net/arla/Makefile index 6ab79be58d1..37b74a6d228 100644 --- a/net/arla/Makefile +++ b/net/arla/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.46 2005/12/05 20:50:44 rillig Exp $ +# $NetBSD: Makefile,v 1.47 2005/12/05 23:55:13 rillig Exp $ DISTNAME= arla-0.38 PKGREVISION= 2 @@ -32,8 +32,8 @@ PKG_FAIL_REASON+= "${PKGNAME} requires kernel sources available under \$$BSDSRCD . endif .endif -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-arlacachedir=${ARLA_CACHE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-arlacachedir=${ARLA_CACHE:Q} CONFIGURE_ARGS+= --enable-shared=no # Enable one or more of the following kernel compile options as required: diff --git a/net/bind9/Makefile b/net/bind9/Makefile index 928638ba5ee..ced7c0a5c41 100644 --- a/net/bind9/Makefile +++ b/net/bind9/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.73 2005/12/05 20:50:44 rillig Exp $ +# $NetBSD: Makefile,v 1.74 2005/12/05 23:55:13 rillig Exp $ DISTNAME= bind-${BIND_VERSION} CATEGORIES= net @@ -21,11 +21,11 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+=--with-libtool=yes \ --sysconfdir=/etc \ - --localstatedir=${VARBASE} + --localstatedir=${VARBASE:Q} #LDFLAGS+= ${COMPILER_RPATH_FLAG}${LOCALBASE}/pthreads/lib -L${LOCALBASE}/pthreads/lib # use external OpenSSL. comment out the following line and the buildlink # include at the bottom to use OpenSSL shipped with BIND9. -CONFIGURE_ARGS+=--with-openssl=${SSLBASE} +CONFIGURE_ARGS+=--with-openssl=${SSLBASE:Q} PKG_USERS= ${BIND_USER}:${BIND_GROUP}::Named\ pseudo-user:${BIND_DIR}:${NOLOGIN} PKG_GROUPS= ${BIND_GROUP} diff --git a/net/bmon/Makefile b/net/bmon/Makefile index 277379a29c2..b02d22d20bb 100644 --- a/net/bmon/Makefile +++ b/net/bmon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:23 jlam Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= bmon-2.0.1 @@ -21,7 +21,7 @@ USE_PKGINSTALL= YES # 3rd party ncurses library in NetBSD 1.6.x. INCOMPAT_CURSES= NetBSD-1.6*-* -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/bmon CONF_FILES= ${EGDIR}/bmon.conf ${PKG_SYSCONFDIR}/bmon.conf diff --git a/net/bounce/Makefile b/net/bounce/Makefile index 03b0bdbedeb..c1a7120a838 100644 --- a/net/bounce/Makefile +++ b/net/bounce/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:05 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= bounce-0.0 @@ -10,7 +10,7 @@ COMMENT= Tool to forward TCP connection from one IP to another WRKSRC= ${WRKDIR}/bounce HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} BUILD_TARGET= bounce diff --git a/net/chrony/Makefile b/net/chrony/Makefile index 6af527bb98c..aacde1b22b4 100644 --- a/net/chrony/Makefile +++ b/net/chrony/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:44 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:13 rillig Exp $ DISTNAME= chrony-1.20 PKGREVISION= 1 @@ -12,7 +12,7 @@ COMMENT= Daemon for maintaining the accuracy of computer clocks USE_PKGINSTALL= YES USE_TOOLS+= gmake HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} EGDIR= ${PREFIX}/share/examples/chrony EGFILES= chrony.conf.example chrony.keys.example diff --git a/net/echoping/Makefile b/net/echoping/Makefile index 2c4f56c85d9..fbff46e3642 100644 --- a/net/echoping/Makefile +++ b/net/echoping/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/04/11 21:46:46 tv Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= echoping-5.2.0 @@ -12,7 +12,7 @@ COMMENT= Test performance of a remote TCP service GNU_CONFIGURE= YES CONFIGURE_ARGS+= --enable-icp -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-libidn=${BUILDLINK_PREFIX.libidn} .include "../../devel/libidn/buildlink3.mk" diff --git a/net/entropy/Makefile b/net/entropy/Makefile index cfcfa35339b..69f151880ad 100644 --- a/net/entropy/Makefile +++ b/net/entropy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:45 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= entropy_rsa-${ENTROPY_VERSION} @@ -47,7 +47,7 @@ ENTROPY_STORE_TYPE?= tree .if ${ENTROPY_STORE_TYPE} == "tree" CONFIGURE_ARGS+= --with-tree .elif ${ENTROPY_STORE_TYPE} == "mysql" -CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} +CONFIGURE_ARGS+= --with-mysql=${LOCALBASE:Q} .include "../../mk/mysql.buildlink3.mk" .elif ${ENTROPY_STORE_TYPE} != "monolithic" PKG_FAIL_REASON+= "unknown ENTROPY_STORE_TYPE: "${ENTROPY_STORE_TYPE:Q}"" @@ -55,7 +55,7 @@ PKG_FAIL_REASON+= "unknown ENTROPY_STORE_TYPE: "${ENTROPY_STORE_TYPE:Q}"" # maximum allowed peer connections (and child processes); default 64 .if defined(ENTROPY_MAX_PEERS) -CONFIGURE_ARGS+= --enable-max-peers=${ENTROPY_MAX_PEERS} +CONFIGURE_ARGS+= --enable-max-peers=${ENTROPY_MAX_PEERS:Q} .endif .include "../../devel/zlib/buildlink3.mk" diff --git a/net/etherape/Makefile b/net/etherape/Makefile index dc1cf5039ec..7c992645ef6 100644 --- a/net/etherape/Makefile +++ b/net/etherape/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/08/10 20:56:21 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:13 rillig Exp $ DISTNAME= etherape-0.9.1 PKGREVISION= 1 @@ -19,7 +19,7 @@ PKG_SYSCONFSUBDIR= etherape # XXX: $localedir defaults to $libdir/locale CONFIGURE_ARGS+= --libdir=${PREFIX}/${PKGLOCALEDIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/etherape diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile index 13a0ff9ef7e..1e4f01dbe90 100644 --- a/net/ethereal/Makefile +++ b/net/ethereal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.119 2005/12/05 20:50:45 rillig Exp $ +# $NetBSD: Makefile,v 1.120 2005/12/05 23:55:13 rillig Exp $ DISTNAME= ethereal-0.10.13 PKGREVISION= 1 @@ -32,7 +32,7 @@ CONFIGURE_ARGS+= --enable-gtk2 CONFIGURE_ARGS+= --enable-static=no CONFIGURE_ARGS+= --enable-threads CONFIGURE_ARGS+= --with-gtk-prefix=${BUILDLINK_PREFIX.gtk2} -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} CONFIGURE_ARGS+= --with-net-snmp CONFIGURE_ARGS+= --with-pcap=${BUILDLINK_PREFIX.libpcap} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} diff --git a/net/flow-tools/Makefile b/net/flow-tools/Makefile index 163e32e44cb..ae2e1a30f49 100644 --- a/net/flow-tools/Makefile +++ b/net/flow-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/10/05 13:29:50 wiz Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:13 rillig Exp $ DISTNAME= flow-tools-0.68 PKGREVISION= 1 @@ -13,7 +13,7 @@ GNU_CONFIGURE= YES USE_PKGINSTALL= YES PKG_SYSCONFSUBDIR= flow-tools -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/flow-tools MAKE_DIRS+= ${PKG_SYSCONFDIR}/sym @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} # PostgreSQL support. .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX:Q} .endif # Python scripts support. diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile index 19a03ab463b..1ce546819df 100644 --- a/net/freeradius/Makefile +++ b/net/freeradius/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:45 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:13 rillig Exp $ DISTNAME= freeradius-1.0.5 PKGREVISION= 2 @@ -31,8 +31,8 @@ BUILDLINK_DEPENDS.openssl+= openssl>=0.9.7 #LIBTOOL_OVERRIDE= libtool CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} CONFIGURE_ARGS+= --disable-ltdl-install CONFIGURE_ARGS+= --with-ltdl-lib=${PREFIX}/lib CONFIGURE_ARGS+= --with-ltdl-include=${PREFIX}/include diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile index f8d7942070d..d870c431b66 100644 --- a/net/freewais-sf/Makefile +++ b/net/freewais-sf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:45 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= freeWAIS-sf-2.2.12 @@ -19,7 +19,7 @@ USE_TOOLS+= perl:run HAS_CONFIGURE= yes CONFIGURE_ENV+= PREFIX=${PREFIX:Q} CONFIGURE_SCRIPT= ./Configure -CONFIGURE_ARGS+= -sde -Dprefix=${PREFIX} \ +CONFIGURE_ARGS+= -sde -Dprefix=${PREFIX:Q} \ -Darchname=${MACHINE_ARCH}-${LOWER_OPSYS} CONFIGURE_ENV+= PERL5=${PERL5:Q} INSTALL_TARGET= install install.man diff --git a/net/gofish/Makefile b/net/gofish/Makefile index 8ea7c595f50..ce3bc39c0ed 100644 --- a/net/gofish/Makefile +++ b/net/gofish/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:46 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:13 rillig Exp $ DISTNAME= gofish-1.1 PKGREVISION= 1 @@ -14,8 +14,8 @@ USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ - --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ + --localstatedir=${VARBASE:Q} EGDIR= ${PREFIX}/share/examples/gofish RUNTIMEDIR= ${VARBASE}/gopher diff --git a/net/gopher/Makefile b/net/gopher/Makefile index 60393c6e13c..666e977463a 100644 --- a/net/gopher/Makefile +++ b/net/gopher/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/10/30 16:54:03 adrianp Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= gopher_3.0.11 @@ -20,7 +20,7 @@ USE_PKGINSTALL= yes USE_TOOLS+= gmake CONFIGURE_ARGS+= --disable-auth -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES+= ${EGDIR}/gopher.hlp ${PKG_SYSCONFDIR}/gopher.hlp CONF_FILES+= ${EGDIR}/gopher.rc ${PKG_SYSCONFDIR}/gopher.rc diff --git a/net/hesiod/Makefile b/net/hesiod/Makefile index 6f1090903c1..46f1d2e0f11 100644 --- a/net/hesiod/Makefile +++ b/net/hesiod/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:50:46 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:13 rillig Exp $ DISTNAME= hesiod-3.0.2 CATEGORIES= net @@ -14,7 +14,7 @@ PKG_SKIP_REASON+= "${PKGNAME} is part of your ${OPSYS} distribution" .endif GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CFLAGS.Darwin+= -DBIND_8_COMPAT diff --git a/net/httptunnel/Makefile b/net/httptunnel/Makefile index ec9a985be56..e8a532021d2 100644 --- a/net/httptunnel/Makefile +++ b/net/httptunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2004/11/27 00:34:51 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:13 rillig Exp $ # DISTNAME= httptunnel-3.0.5 @@ -10,6 +10,6 @@ HOMEPAGE= http://www.nocrew.org/software/httptunnel.html COMMENT= Encapsulate TCP/IP connections in HTTP requests HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} .include "../../mk/bsd.pkg.mk" diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile index cc2e46c8282..ec73e0eef36 100644 --- a/net/ja-samba/Makefile +++ b/net/ja-samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:46 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 23:55:14 rillig Exp $ DISTNAME= samba-${SAMBA_VERSION}-ja-${JA_VERSION} PKGNAME= ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION} @@ -41,13 +41,13 @@ FILES_SUBST+= SAMBA_PIDDIR=${SAMBA_PIDDIR:Q} FILES_SUBST+= SAMBA_PRIVATE=${SAMBA_PRIVATE:Q} FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} -CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR:Q} +CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR:Q} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR:Q} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR:Q} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR:Q} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q} CONFIGURE_ARGS+= --with-codepagedir=${SAMBA_LIBDIR}/codepages CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat diff --git a/net/ja-samba/options.mk b/net/ja-samba/options.mk index 044647dc121..518cf3d4879 100644 --- a/net/ja-samba/options.mk +++ b/net/ja-samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/06/19 18:38:40 taca Exp $ +# $NetBSD: options.mk,v 1.5 2005/12/05 23:55:14 rillig Exp $ # Global and legacy options @@ -60,7 +60,7 @@ PLIST_SUBST+= SMBMOUNT="@comment " .if !empty(PKG_OPTIONS:Mssl) .include "../../security/openssl/buildlink3.mk" CONFIGURE_ARGS+= --with-ssl -CONFIGURE_ARGS+= --with-sslinc=${SSLBASE} +CONFIGURE_ARGS+= --with-sslinc=${SSLBASE:Q} CFLAGS+= -I${SSLBASE}/include/openssl # ssl.h, err.h .else CONFIGURE_ARGS+= --without-ssl diff --git a/net/jwhois/Makefile b/net/jwhois/Makefile index 6293067067d..c94d3f00b93 100644 --- a/net/jwhois/Makefile +++ b/net/jwhois/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.55 2005/10/03 21:18:55 agc Exp $ +# $NetBSD: Makefile,v 1.56 2005/12/05 23:55:14 rillig Exp $ # DISTNAME= jwhois-3.2.2 @@ -13,7 +13,7 @@ COMMENT= Configurable WHOIS client USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/db LIBS.SunOS+= -lnsl -lsocket diff --git a/net/lftp/Makefile b/net/lftp/Makefile index 71441465dd0..da061c9edc7 100644 --- a/net/lftp/Makefile +++ b/net/lftp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.60 2005/12/05 20:50:47 rillig Exp $ +# $NetBSD: Makefile,v 1.61 2005/12/05 23:55:14 rillig Exp $ DISTNAME= lftp-3.3.5 CATEGORIES= net @@ -26,7 +26,7 @@ SHLIBTOOL_OVERRIDE= libtool PLIST_SRC+= ${PKGDIR}/PLIST -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-modules CONFIGURE_ENV+= F77=${FALSE:Q} diff --git a/net/lftp/options.mk b/net/lftp/options.mk index 1dfb270806f..77707e1cabc 100644 --- a/net/lftp/options.mk +++ b/net/lftp/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/12/04 22:12:07 salo Exp $ +# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:14 rillig Exp $ # PKG_OPTIONS_VAR= PKG_OPTIONS.lftp @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --without-openssl . include "../../security/gnutls/buildlink3.mk" .elif !empty(PKG_OPTIONS:Mssl) CONFIGURE_ARGS+= --without-gnutls -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} . include "../../security/openssl/buildlink3.mk" .else CONFIGURE_ARGS+= --without-gnutls diff --git a/net/mydns-pgsql/Makefile.common b/net/mydns-pgsql/Makefile.common index 9918abbc44e..e5e3d3289ef 100644 --- a/net/mydns-pgsql/Makefile.common +++ b/net/mydns-pgsql/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/11/05 12:24:35 wiz Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/12/05 23:55:14 rillig Exp $ DISTNAME= mydns-1.0.0 CATEGORIES= net @@ -12,7 +12,7 @@ GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} MYDNS_USER?= mydns MYDNS_GROUP?= mydns diff --git a/net/net-snmp/Makefile b/net/net-snmp/Makefile index bf18dced952..457f3f25f1a 100644 --- a/net/net-snmp/Makefile +++ b/net/net-snmp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/12/05 20:50:47 rillig Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:14 rillig Exp $ DISTNAME= net-snmp-5.2.1.2 PKGREVISION= 1 @@ -45,8 +45,8 @@ NET_SNMP_MIBDIRS?= \$$HOME/.snmp/mibs:${PREFIX}/share/snmp/mibs:${PREFIX}/lib/t CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --with-defaults CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp_wrappers}/lib -CONFIGURE_ARGS+= --with-sys-contact="${NET_SNMP_SYS_CONTACT}" -CONFIGURE_ARGS+= --with-sys-location="${NET_SNMP_SYS_LOCATION}" +CONFIGURE_ARGS+= --with-sys-contact=${NET_SNMP_SYS_CONTACT:Q} +CONFIGURE_ARGS+= --with-sys-location=${NET_SNMP_SYS_LOCATION:Q} # # NOTE: if you specify a logfile then this file will be written to by # default and although it can be disabled on the command line, the @@ -54,9 +54,9 @@ CONFIGURE_ARGS+= --with-sys-location="${NET_SNMP_SYS_LOCATION}" # will use '-s' to enable standard syslog logging anyway. # CONFIGURE_ARGS+= --with-logfile=none -CONFIGURE_ARGS+= --with-persistent-directory="${NET_SNMP_PERSISTENTDIR}" +CONFIGURE_ARGS+= --with-persistent-directory=${NET_SNMP_PERSISTENTDIR:Q} .if !empty(NET_SNMP_MIBDIRS) -CONFIGURE_ARGS+= --with-mibdirs="${NET_SNMP_MIBDIRS}" +CONFIGURE_ARGS+= --with-mibdirs=${NET_SNMP_MIBDIRS:Q} .endif CONFIGURE_ARGS+= --with-mib-modules="smux host" .if (${OPSYS} == "Darwin") diff --git a/net/netatalk/Makefile b/net/netatalk/Makefile index 3fabe0e8d22..c0cd91742a4 100644 --- a/net/netatalk/Makefile +++ b/net/netatalk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.45 2005/07/31 13:19:55 markd Exp $ +# $NetBSD: Makefile,v 1.46 2005/12/05 23:55:14 rillig Exp $ DISTNAME= netatalk-2.0.3 PKGREVISION= 1 @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-netbsd \ --enable-timelord \ --libexecdir=${PREFIX}/libexec/netatalk \ --sbindir=${PREFIX}/libexec/netatalk \ - --with-pkgconfdir=${PKG_SYSCONFDIR} \ + --with-pkgconfdir=${PKG_SYSCONFDIR:Q} \ --with-message-dir=${PKG_SYSCONFDIR}/msg \ --localstatedir=${VARBASE}/netatalk \ --with-uams-path=${PREFIX}/libexec/netatalk/uams \ diff --git a/net/netatalk1/Makefile b/net/netatalk1/Makefile index c4fb021a152..16b730f1e32 100644 --- a/net/netatalk1/Makefile +++ b/net/netatalk1/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/05 23:40:56 taca Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:14 rillig Exp $ DISTNAME= netatalk-1.6.4a CATEGORIES= net print @@ -27,7 +27,7 @@ CONFIGURE_ARGS+= --enable-netbsd \ --with-did=last \ --with-tcp-wrappers \ --sbindir=${PREFIX}/libexec/netatalk \ - --sysconfdir=${PKG_SYSCONFDIR} \ + --sysconfdir=${PKG_SYSCONFDIR:Q} \ --localstatedir=${VARBASE}/netatalk \ --with-nls-dir=${PREFIX}/share/netatalk/nls \ --with-uams-path=${PREFIX}/libexec/netatalk/uams diff --git a/net/netsaint-base/Makefile.common b/net/netsaint-base/Makefile.common index e6a1f6cc221..0cd9ce8fd31 100644 --- a/net/netsaint-base/Makefile.common +++ b/net/netsaint-base/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.10 2005/08/23 11:48:50 rillig Exp $ +# $NetBSD: Makefile.common,v 1.11 2005/12/05 23:55:14 rillig Exp $ # CATEGORIES= net sysutils @@ -20,13 +20,13 @@ USE_TOOLS+= gmake perl:run PKG_SYSCONFSUBDIR= netsaint -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --localstatedir=/var CONFIGURE_ARGS+= --datadir=${PREFIX}/share/netsaint CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/netsaint CONFIGURE_ARGS+= --with-lockfile=var/run/netsaint/netsaint.lock -CONFIGURE_ARGS+= --with-netsaint-user=${NETSAINT_USER} -CONFIGURE_ARGS+= --with-netsaint-grp=${NETSAINT_GROUP} +CONFIGURE_ARGS+= --with-netsaint-user=${NETSAINT_USER:Q} +CONFIGURE_ARGS+= --with-netsaint-grp=${NETSAINT_GROUP:Q} CONFIGURE_ARGS+= --with-init-dir=${PREFIX}/etc/rc.d .include "../../mk/x11.buildlink3.mk" diff --git a/net/netsaint-plugins/Makefile b/net/netsaint-plugins/Makefile index b780c7756a8..9690073b624 100644 --- a/net/netsaint-plugins/Makefile +++ b/net/netsaint-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/09/27 16:09:50 wiz Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:14 rillig Exp $ # DISTNAME= netsaint-plugins-1.2.9-4 @@ -16,7 +16,7 @@ DEPENDS+= netsaint-base-[0-9]*:../../net/netsaint-base DEPENDS+= {ssh{,6}-[0-9]*,openssh-[0-9]*}:../../security/openssh .endif -CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX:Q} CPPFLAGS+= -I${PGSQL_PREFIX}/include/postgresql .include "../../net/netsaint-base/Makefile.common" diff --git a/net/ntop/Makefile b/net/ntop/Makefile index 1b64a0b71bf..29482de9e32 100644 --- a/net/ntop/Makefile +++ b/net/ntop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/10/26 15:43:08 adam Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:14 rillig Exp $ DISTNAME= ntop-3.2 CATEGORIES= net @@ -15,7 +15,7 @@ USE_LIBTOOL= yes USE_PKGLOCALEDIR= yes USE_TOOLS+= gawk gmake GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --sysconfdir=${PREFIX}/share/ntop CONFIGURE_ARGS+= --with-gd-root=${BUILDLINK_PREFIX.gd} CONFIGURE_ARGS+= --with-gdbm-root=${BUILDLINK_PREFIX.gdbm} diff --git a/net/ntp4/Makefile b/net/ntp4/Makefile index d2298756989..74811b5ad02 100644 --- a/net/ntp4/Makefile +++ b/net/ntp4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.44 2005/12/05 20:50:47 rillig Exp $ +# $NetBSD: Makefile,v 1.45 2005/12/05 23:55:14 rillig Exp $ # DISTNAME= ntp-4.2.0 @@ -21,7 +21,7 @@ USE_PKGINSTALL= YES CONFIGURE_ENV+= PATH_PERL=${PERL5:Q} ac_cv_header_sys_soundcard_h=no -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} DOCDIR= ${PREFIX}/share/doc/html EXAMPLESDIR= ${PREFIX}/share/examples diff --git a/net/oidentd/Makefile b/net/oidentd/Makefile index 38f5c767303..81cb1ceaf4d 100644 --- a/net/oidentd/Makefile +++ b/net/oidentd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/08/07 12:51:32 tron Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:14 rillig Exp $ DISTNAME= oidentd-2.0.7 PKGREVISION= 4 @@ -10,7 +10,7 @@ HOMEPAGE= http://dev.ojnk.net/ COMMENT= Configurable IDENT server that supports NAT/IP masq GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} USE_PKGINSTALL= YES RCD_SCRIPTS= oidentd OSVERSION_SPECIFIC= YES diff --git a/net/openafs/Makefile b/net/openafs/Makefile index 6c22c9b9c62..67204449385 100644 --- a/net/openafs/Makefile +++ b/net/openafs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/11/04 07:28:47 gendalia Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:14 rillig Exp $ DISTNAME= openafs-1.4.0-src PKGREVISION= 1 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --enable-largefile-fileserver CONFIGURE_ARGS+= --disable-kernel-module CONFIGURE_ARGS+= --enable-namei-fileserver CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} USE_GNU_CONFIGURE_HOST= no diff --git a/net/openslp/Makefile b/net/openslp/Makefile index b56563611fe..849528fa4e2 100644 --- a/net/openslp/Makefile +++ b/net/openslp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/06/01 20:08:01 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:14 rillig Exp $ DISTNAME= openslp-1.2.1 CATEGORIES= net @@ -15,8 +15,8 @@ USE_TOOLS+= automake bison lex USE_PKGINSTALL= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --enable-slpv2-security INSTALL_MAKE_FLAGS= ${MAKE_FLAGS} sysconfdir=${EGDIR} DOC_DIR=${DOCDIR} diff --git a/net/openvpn/Makefile b/net/openvpn/Makefile index fe45eae6b33..d1964ad7611 100644 --- a/net/openvpn/Makefile +++ b/net/openvpn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/12/05 20:50:48 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:14 rillig Exp $ # DISTNAME= openvpn-2.0.5 @@ -23,7 +23,7 @@ DOCDIR= ${PREFIX}/share/doc/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} RCD_SCRIPTS= openvpn -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-pthread CONFIGURE_ARGS+= --enable-password-save CONFIGURE_ARGS+= --disable-dependency-tracking diff --git a/net/pen/Makefile b/net/pen/Makefile index 59dd8838646..0f099b1571c 100644 --- a/net/pen/Makefile +++ b/net/pen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/09/26 21:46:27 xtraeme Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:14 rillig Exp $ # DISTNAME= pen-0.15.0 @@ -15,7 +15,7 @@ GNU_CONFIGURE= YES # Avoid pen complaining on NetBSD CONFIGURE_ARGS+= --with-fd_setsize=2048 CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/pen -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/proftpd/Makefile b/net/proftpd/Makefile index 2b835133899..8d7be6bbbf3 100644 --- a/net/proftpd/Makefile +++ b/net/proftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/11/03 19:09:46 martti Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 23:55:14 rillig Exp $ DISTNAME= proftpd-1.3.0rc3 #PKGREVISION= 1 @@ -19,8 +19,8 @@ GNU_CONFIGURE= yes USE_PKGINSTALL= yes USE_TOOLS+= gmake -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --disable-sendfile CONFIGURE_ARGS+= --enable-ctrls diff --git a/net/pure-ftpd/Makefile b/net/pure-ftpd/Makefile index 043e92eb01b..a5b869e7450 100644 --- a/net/pure-ftpd/Makefile +++ b/net/pure-ftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/11/03 16:59:47 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:14 rillig Exp $ DISTNAME= pure-ftpd-1.0.20 PKGREVISION= 1 @@ -20,7 +20,7 @@ USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-everything \ - --sysconfdir=${PKG_SYSCONFDIR} + --sysconfdir=${PKG_SYSCONFDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 4ead4467dd6..936328fb541 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:48 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:15 rillig Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp # @@ -17,7 +17,7 @@ USE_TOOLS+= gmake perl USE_LIBTOOL= YES PKG_SYSCONFSUBDIR?= zebra -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-exampledir=${PREFIX}/share/examples/quagga #CONFIGURE_ARGS+= --enable-pkgsrcrcdir=${PREFIX}/${RCD_SCRIPTS_EXAMPLEDIR} CONFIGURE_ARGS+= --localstatedir=${VARBASE}/run/zebra diff --git a/net/rdesktop/Makefile b/net/rdesktop/Makefile index ff074f6f35c..5dd9edd292f 100644 --- a/net/rdesktop/Makefile +++ b/net/rdesktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/06/01 18:03:08 jlam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= rdesktop-1.4.1 @@ -10,8 +10,8 @@ HOMEPAGE= http://www.rdesktop.org/ COMMENT= Open-source Remote Desktop Protocol client GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-x=${X11BASE} -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-x=${X11BASE:Q} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} LDFLAGS+= ${LIBOSSAUDIO} diff --git a/net/rp-l2tp/Makefile b/net/rp-l2tp/Makefile index 006271b3984..a4efa542c39 100644 --- a/net/rp-l2tp/Makefile +++ b/net/rp-l2tp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/11/08 16:58:17 tv Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= rp-l2tp-0.3 @@ -12,7 +12,7 @@ COMMENT= User-space implementation of layer 2 tunnelling protocol NOT_FOR_PLATFORM+= Interix-*-* # no userland protocol stack support GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} USE_TOOLS+= gmake post-patch: diff --git a/net/samba/Makefile b/net/samba/Makefile index eecc237f690..3d3eb491ca6 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.151 2005/12/05 20:50:49 rillig Exp $ +# $NetBSD: Makefile,v 1.152 2005/12/05 23:55:15 rillig Exp $ .include "Makefile.mirrors" @@ -47,14 +47,14 @@ FILES_SUBST+= SAMBA_STATEDIR=${SAMBA_STATEDIR:Q} FILES_SUBST+= SAMBA_VARDIR=${SAMBA_VARDIR:Q} FILES_SUBST+= WINBINDD_RCD_SCRIPT=${WINBINDD_RCD_SCRIPT:Q} -CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR} -CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR} -CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR} -CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR} -CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR} -CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE} -CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR} -CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR} +CONFIGURE_ARGS+= --with-configdir=${SAMBA_ETCDIR:Q} +CONFIGURE_ARGS+= --with-libdir=${SAMBA_LIBDIR:Q} +CONFIGURE_ARGS+= --with-lockdir=${SAMBA_LOCKDIR:Q} +CONFIGURE_ARGS+= --with-logfilebase=${SAMBA_LOGDIR:Q} +CONFIGURE_ARGS+= --with-piddir=${SAMBA_PIDDIR:Q} +CONFIGURE_ARGS+= --with-privatedir=${SAMBA_PRIVATE:Q} +CONFIGURE_ARGS+= --with-statedir=${SAMBA_STATEDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${SAMBA_VARDIR:Q} CONFIGURE_ARGS+= --with-swatdir=${PREFIX}/share/samba/swat CONFIGURE_ARGS+= --with-libsmbclient diff --git a/net/samba/options.mk b/net/samba/options.mk index c3f2793eb31..84eeae193d3 100644 --- a/net/samba/options.mk +++ b/net/samba/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.11 2005/11/15 13:58:14 jlam Exp $ +# $NetBSD: options.mk,v 1.12 2005/12/05 23:55:15 rillig Exp $ # Recommended package options for various setups: # @@ -25,7 +25,7 @@ SAMBA_STATIC_MODULES:= # empty PKG_OPTIONS+= ldap . endif CONFIGURE_ARGS+= --with-ads -CONFIGURE_ARGS+= --with-krb5=${KRB5BASE} +CONFIGURE_ARGS+= --with-krb5=${KRB5BASE:Q} .else CONFIGURE_ARGS+= --without-ads CONFIGURE_ARGS+= --without-krb5 diff --git a/net/snort-pgsql/Makefile b/net/snort-pgsql/Makefile index 355d44eab31..1f1ff74bfd9 100644 --- a/net/snort-pgsql/Makefile +++ b/net/snort-pgsql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2004/07/24 22:45:15 recht Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:15 rillig Exp $ .include "../../net/snort/Makefile.common" @@ -14,7 +14,7 @@ FILESDIR= ${PKGDIR}/files PATCHDIR= ${PKGDIR}/patches DISTINFO_FILE= ${PKGDIR}/distinfo -CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --with-postgresql=${PGSQL_PREFIX:Q} .include "../../mk/pgsql.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/net/snort/Makefile.common b/net/snort/Makefile.common index 80f4031afae..23c12b38a6c 100644 --- a/net/snort/Makefile.common +++ b/net/snort/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.28 2005/12/05 20:50:49 rillig Exp $ +# $NetBSD: Makefile.common,v 1.29 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= snort-2.4.3 @@ -13,7 +13,7 @@ HOMEPAGE= http://www.snort.org/ USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-libpcap-includes=${BUILDLINK_PREFIX.libpcap}/include CONFIGURE_ARGS+= --with-libpcap-libraries=${BUILDLINK_PREFIX.libpcap}/lib diff --git a/net/speedtouch/Makefile b/net/speedtouch/Makefile index 85d08a120f2..2cb805eaf17 100644 --- a/net/speedtouch/Makefile +++ b/net/speedtouch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:49 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:15 rillig Exp $ DISTNAME= speedtouch-1.3.1 PKGREVISION= 3 @@ -25,7 +25,7 @@ DEPENDS+= userppp>=001107:../../net/userppp USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PLIST_SUBST+= PKG_SYSCONFDIR=${PKG_SYSCONFDIR:Q} RCD_SCRIPTS= adsl diff --git a/net/tnftpd/Makefile b/net/tnftpd/Makefile index d105eb3d103..738d597bbbf 100644 --- a/net/tnftpd/Makefile +++ b/net/tnftpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/02 17:03:54 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= tnftpd-20040810 @@ -16,7 +16,7 @@ GNU_CONFIGURE= YES MANCOMPRESSED_IF_MANZ= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES+= ${EXAMPLEDIR}/ftpd.conf ${PKG_SYSCONFDIR}/ftpd.conf CONF_FILES+= ${EXAMPLEDIR}/ftpusers ${PKG_SYSCONFDIR}/ftpusers diff --git a/net/tor/Makefile b/net/tor/Makefile index a684bac6a87..3dd6120399b 100644 --- a/net/tor/Makefile +++ b/net/tor/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:50 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= tor-0.1.0.15 @@ -26,7 +26,7 @@ USER_GROUP= ${TOR_USER} ${TOR_GROUP} OWN_DIR_PERMS+= ${PKG_HOME} ${USER_GROUP} 0755 -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONF_FILES+= ${PREFIX}/share/examples/tor/tor-tsocks.conf \ ${PKG_SYSCONFDIR}/tor/tor-tsocks.conf diff --git a/net/totd/Makefile b/net/totd/Makefile index a810d0b0f7f..2659839cdba 100644 --- a/net/totd/Makefile +++ b/net/totd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/11/03 16:55:46 tv Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= totd-1.4 @@ -10,7 +10,7 @@ HOMEPAGE= http://www.vermicelli.pasta.cs.uit.no/ipv6/software.html COMMENT= DNS proxy that supports IPv6 <==> IPv4 record translation GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/totd diff --git a/net/trickle/Makefile b/net/trickle/Makefile index 2498ea0e539..ee39392d770 100644 --- a/net/trickle/Makefile +++ b/net/trickle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/09/16 14:46:43 tv Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= trickle-1.06 @@ -14,7 +14,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/trickle CONF_FILES= ${EGDIR}/trickled.conf ${PKG_SYSCONFDIR}/trickled.conf diff --git a/net/vtun/Makefile b/net/vtun/Makefile index 153dfffa5f6..a5596cf6e58 100644 --- a/net/vtun/Makefile +++ b/net/vtun/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/06/17 03:50:29 jlam Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 23:55:15 rillig Exp $ DISTNAME= vtun-2.6 PKGREVISION= 6 @@ -19,8 +19,8 @@ DEINSTALL_EXTRA_TMPL+= ${.CURDIR}/DEINSTALL INSTALL_EXTRA_TMPL+= ${.CURDIR}/INSTALL GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-ssl-headers=${SSLBASE}/include/openssl CONFIGURE_ARGS+= --with-ssl-lib=${SSLBASE}/lib CONFIGURE_ARGS+= --with-lzo-headers=${BUILDLINK_PREFIX.liblzo}/include diff --git a/net/wget/Makefile b/net/wget/Makefile index b21355c6e87..b384c8cd44b 100644 --- a/net/wget/Makefile +++ b/net/wget/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.85 2005/10/14 10:12:12 adam Exp $ +# $NetBSD: Makefile,v 1.86 2005/12/05 23:55:15 rillig Exp $ DISTNAME= wget-1.10.2 CATEGORIES= net @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES USE_OLD_DES_API= YES USE_PKGLOCALEDIR= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= ac_cv_func_sigsetjmp=yes EGDIR= ${PREFIX}/share/examples/wget diff --git a/net/wget/options.mk b/net/wget/options.mk index 179c679bc16..c93710150f4 100644 --- a/net/wget/options.mk +++ b/net/wget/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.3 2005/10/05 13:29:49 wiz Exp $ +# $NetBSD: options.mk,v 1.4 2005/12/05 23:55:15 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.wget PKG_SUPPORTED_OPTIONS= inet6 ssl @@ -20,7 +20,7 @@ CONFIGURE_ARGS+= --disable-ipv6 ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+=--with-ssl=${SSLBASE} +CONFIGURE_ARGS+=--with-ssl=${SSLBASE:Q} .else CONFIGURE_ARGS+=--without-ssl .endif diff --git a/net/xtraceroute/Makefile b/net/xtraceroute/Makefile index 4991b0a73dd..6e50dfaa9bf 100644 --- a/net/xtraceroute/Makefile +++ b/net/xtraceroute/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.41 2005/06/01 18:03:08 jlam Exp $ +# $NetBSD: Makefile,v 1.42 2005/12/05 23:55:15 rillig Exp $ # DISTNAME= xtraceroute-0.8.14 @@ -21,7 +21,7 @@ CONFIGURE_ARGS+= --with-gtk-prefix="${BUILDLINK_PREFIX.gtk}" # XXX Actually, Mesa's in X11PREFIX too, but as our tiff is in LOCALBASE # and xtraceroute doesn't have a switch to tell it so (yet?), we abuse # the --with-GL-prefix switch for this. -CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE} +CONFIGURE_ARGS+= --with-GL-prefix=${LOCALBASE:Q} CONFIGURE_ARGS+= --with-lib-MesaGL .include "../../mk/bsd.prefs.mk" diff --git a/net/ytalk/Makefile.common b/net/ytalk/Makefile.common index eadc76b5382..9a3cddacd6a 100644 --- a/net/ytalk/Makefile.common +++ b/net/ytalk/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.1 2004/03/06 12:01:32 grant Exp $ +# $NetBSD: Makefile.common,v 1.2 2005/12/05 23:55:15 rillig Exp $ DISTNAME= ytalk-3.1.1 CATEGORIES= net @@ -11,7 +11,7 @@ COMMENT= Multi-user replacement for UNIX talk GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/ytalk CONF_FILES= ${EGDIR}/ytalkrc ${PKG_SYSCONFDIR}/ytalkrc diff --git a/net/zebra/Makefile b/net/zebra/Makefile index 11e75a276fa..c4033cd312f 100644 --- a/net/zebra/Makefile +++ b/net/zebra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.70 2005/12/05 20:50:50 rillig Exp $ +# $NetBSD: Makefile,v 1.71 2005/12/05 23:55:15 rillig Exp $ # Based on KAME Id: Makefile,v 1.1.2.1.2.1.10.2 1999/01/05 11:03:50 itojun Exp DISTNAME= zebra-0.95 @@ -13,7 +13,7 @@ COMMENT= Free multithreaded routing daemon software USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --infodir=${PREFIX}/${INFO_DIR} PKG_SYSCONFSUBDIR?= zebra diff --git a/news/inn/Makefile b/news/inn/Makefile index 6987dd79844..b86e5180021 100644 --- a/news/inn/Makefile +++ b/news/inn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.74 2005/12/05 20:50:50 rillig Exp $ +# $NetBSD: Makefile,v 1.75 2005/12/05 23:55:15 rillig Exp $ DISTNAME= inn-2.4.1 PKGREVISION= 8 @@ -24,15 +24,15 @@ GNU_CONFIGURE_PREFIX= ${INN_PREFIX} CONFIGURE_ARGS+= --enable-setgid-inews \ --enable-uucp-rnews \ --with-perl \ - --with-openssl=${SSLBASE} \ + --with-openssl=${SSLBASE:Q} \ --with-tmp-dir=${INN_DATA_DIR}/tmp \ --with-db-dir=${INN_DATA_DIR}/db \ --with-etc-dir=${INN_DATA_DIR}/etc \ --with-log-dir=${INN_DATA_DIR}/log \ --with-run-dir=${INN_DATA_DIR}/run \ - --with-spool-dir=${INN_SPOOL} \ - --with-news-user=${INN_USER} \ - --with-news-group=${INN_GROUP} + --with-spool-dir=${INN_SPOOL:Q} \ + --with-news-user=${INN_USER:Q} \ + --with-news-group=${INN_GROUP:Q} CONFIGURE_ENV+= _PATH_PERL=${PERL5:Q} CONFIGURE_ENV+= _PATH_AWK=${TOOLS_AWK:Q} CONFIGURE_ENV+= _PATH_EGREP=${TOOLS_EGREP:Q} diff --git a/news/leafnode/Makefile b/news/leafnode/Makefile index 8b41853dde6..45ab152c170 100644 --- a/news/leafnode/Makefile +++ b/news/leafnode/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/12/05 20:50:50 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 23:55:15 rillig Exp $ DISTNAME= leafnode-1.11.3.rel PKGNAME= ${DISTNAME:S/.rel//} @@ -37,11 +37,11 @@ FILES_SUBST+= LEAFNODE_HOME=${LEAFNODE_HOME:Q} MESSAGE_SUBST+= LEAFNODE_CONFDIR=${LEAFNODE_CONFDIR} GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-spooldir=${LEAFNODE_SPOOL} +CONFIGURE_ARGS+= --with-spooldir=${LEAFNODE_SPOOL:Q} CONFIGURE_ARGS+= --with-lockfile=${LEAFNODE_LOCKDIR}/fetchnews.lck -CONFIGURE_ARGS+= --sysconfdir=${LEAFNODE_CONFDIR} -CONFIGURE_ARGS+= --with-user=${LEAFNODE_USER} -CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP} +CONFIGURE_ARGS+= --sysconfdir=${LEAFNODE_CONFDIR:Q} +CONFIGURE_ARGS+= --with-user=${LEAFNODE_USER:Q} +CONFIGURE_ARGS+= --with-group=${LEAFNODE_GROUP:Q} USE_TOOLS+= gmake .include "../../mk/bsd.prefs.mk" diff --git a/parallel/clusterit/Makefile b/parallel/clusterit/Makefile index b604c6b3b11..398b7345438 100644 --- a/parallel/clusterit/Makefile +++ b/parallel/clusterit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/06/02 20:48:12 garbled Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:15 rillig Exp $ DISTNAME= clusterit-2.3.1 CATEGORIES= parallel @@ -9,7 +9,7 @@ HOMEPAGE= http://www.garbled.net/clusterit.html COMMENT= Clustering package for unix HAS_CONFIGURE= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} .include "../../mk/x11.buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/parallel/ganglia-monitor-core/Makefile b/parallel/ganglia-monitor-core/Makefile index a91537adc3f..0c8ddfe5c28 100644 --- a/parallel/ganglia-monitor-core/Makefile +++ b/parallel/ganglia-monitor-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/04/13 01:57:29 jschauma Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= ganglia-3.0.1 @@ -15,7 +15,7 @@ COMMENT= Ganglia cluster monitor, monitoring daemon HAS_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --with-gmetad PATCH_ETC= mans/gmetad.1 mans/gmond.1 \ diff --git a/parallel/mpi-ch/Makefile b/parallel/mpi-ch/Makefile index 503d5096e8e..d7743283e32 100644 --- a/parallel/mpi-ch/Makefile +++ b/parallel/mpi-ch/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.39 2005/12/05 20:50:51 rillig Exp $ +# $NetBSD: Makefile,v 1.40 2005/12/05 23:55:16 rillig Exp $ DISTNAME= mpich-1.2.6 PKGREVISION= 1 @@ -25,11 +25,11 @@ MPI_RSH?= ssh .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS+= -prefix=${PREFIX} +CONFIGURE_ARGS+= -prefix=${PREFIX:Q} CONFIGURE_ARGS+= -docdir=${PREFIX}/share/doc/mpi-ch CONFIGURE_ARGS+= -htmldir=${PREFIX}/share/doc/html/mpi-ch CONFIGURE_ARGS+= -opt=-O -CONFIGURE_ARGS+= -rsh=${MPI_RSH} +CONFIGURE_ARGS+= -rsh=${MPI_RSH:Q} CONFIGURE_ARGS+= --with-comm=ch_p4 CONFIGURE_ARGS+= --with-mpe CONFIGURE_ARGS+= --disable-devdebug diff --git a/parallel/openpbs/Makefile b/parallel/openpbs/Makefile index 5228830693f..b37b00059d8 100644 --- a/parallel/openpbs/Makefile +++ b/parallel/openpbs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:08 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= OpenPBS_2_3_16 @@ -13,7 +13,7 @@ COMMENT= Generic network queueing system INTERACTIVE_STAGE= fetch HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} REPLACE_INTERPRETER+= tcl _REPLACE.tcl.old= .*/bin/pbs_tclsh diff --git a/parallel/sge/Makefile b/parallel/sge/Makefile index d2dcb55e32d..8b94e19e2d0 100644 --- a/parallel/sge/Makefile +++ b/parallel/sge/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:51 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= sge-5.3p6 @@ -18,7 +18,7 @@ USE_TOOLS+= gmake perl:run CFLAGS+= -D${UPPER_OPSYS} CONFIGURE_ENV+= REMOTE=sge CONFIGURE_ENV+= CFLAGS=${CFLAGS:M*:Q} -CONFIGURE_ARGS+= --with-grd=${SGE_BUILDARCH} +CONFIGURE_ARGS+= --with-grd=${SGE_BUILDARCH:Q} PLIST_SUBST+= SGE_ARCH=${SGE_ARCH:Q} MESSAGE_SUBST+= SGE_ROOT=${SGE_ROOT} MAKE_ENV+= PERL5=${PERL5:Q} diff --git a/print/LPRng-core/Makefile b/print/LPRng-core/Makefile index 7f1b573ce45..c389dcdd9ac 100644 --- a/print/LPRng-core/Makefile +++ b/print/LPRng-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:50:52 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:16 rillig Exp $ DISTNAME= LPRng-3.8.28 PKGNAME= LPRng-core-3.8.28 @@ -19,13 +19,13 @@ USE_TOOLS+= chgrp chown gmake USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/ltconfig GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-lpd_perms_path="${LPD_PERMS_PATH}" -CONFIGURE_ARGS+= --with-lpd_printcap_path="${LPD_PRINTCAP_PATH}" -CONFIGURE_ARGS+= --with-printcap_path="${PRINTCAP_PATH}" -CONFIGURE_ARGS+= --with-filterdir="${FILTER_DIR}" -CONFIGURE_ARGS+= --with-filter_path="${FILTER_PATH}" -CONFIGURE_ARGS+= --with-ld_library_path="${FILTER_LD_PATH}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-lpd_perms_path=${LPD_PERMS_PATH:Q} +CONFIGURE_ARGS+= --with-lpd_printcap_path=${LPD_PRINTCAP_PATH:Q} +CONFIGURE_ARGS+= --with-printcap_path=${PRINTCAP_PATH:Q} +CONFIGURE_ARGS+= --with-filterdir=${FILTER_DIR:Q} +CONFIGURE_ARGS+= --with-filter_path=${FILTER_PATH:Q} +CONFIGURE_ARGS+= --with-ld_library_path=${FILTER_LD_PATH:Q} CONFIGURE_ENV+= CHGRP=${TOOLS_CHGRP:Q} CONFIGURE_ENV+= CHOWN=${TOOLS_CHOWN:Q} diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile index 303331a34fb..8192ae9ca05 100644 --- a/print/a2ps/Makefile +++ b/print/a2ps/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/11/30 18:24:00 tonio Exp $ +# $NetBSD: Makefile,v 1.59 2005/12/05 23:55:16 rillig Exp $ DISTNAME= a2ps-4.13b PKGNAME= a2ps-4.13.0.2 @@ -29,8 +29,8 @@ USE_PKGINSTALL= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES CONFIGURE_ENV+= LPR=lpr -CONFIGURE_ARGS+= --with-medium="${PAPERSIZE}" -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --with-medium=${PAPERSIZE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/a2ps CONF_FILES= ${EGDIR}/a2ps-site.cfg ${PKG_SYSCONFDIR}/a2ps-site.cfg diff --git a/print/apsfilter/Makefile b/print/apsfilter/Makefile index 464518448b1..f4692c16cdf 100644 --- a/print/apsfilter/Makefile +++ b/print/apsfilter/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:52 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= apsfilter-7.2.5 @@ -24,10 +24,10 @@ USE_BZIP2= YES USE_PKGINSTALL= YES USE_TOOLS+= awk gs:run -CONFIGURE_ARGS+=--prefix=${PREFIX} -CONFIGURE_ARGS+=--with-shell=${SH} -CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+=--with-awk="${TOOLS_AWK}" +CONFIGURE_ARGS+=--prefix=${PREFIX:Q} +CONFIGURE_ARGS+=--with-shell=${SH:Q} +CONFIGURE_ARGS+=--sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+=--with-awk=${TOOLS_AWK:Q} PKG_SYSCONFSUBDIR?= apsfilter CONF_FILES= ${PREFIX}/share/apsfilter/template/apsfilterrc \ diff --git a/print/cups/Makefile b/print/cups/Makefile index 610843731ec..e45f17e8a4c 100644 --- a/print/cups/Makefile +++ b/print/cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.99 2005/12/05 20:50:52 rillig Exp $ +# $NetBSD: Makefile,v 1.100 2005/12/05 23:55:16 rillig Exp $ # # The CUPS author is very good about taking back changes into the main # CUPS distribution. The correct place to send patches or bug-fixes is: @@ -38,13 +38,13 @@ USE_LIBTOOL= yes INSTALL_TARGET= installcups GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ARGS+= --with-docdir=${PREFIX}/share/doc/cups CONFIGURE_ARGS+= --with-serverbindir=${PREFIX}/libexec/cups -CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR} -CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER} -CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP} +CONFIGURE_ARGS+= --with-rcdir=${RCD_SCRIPTS_DIR:Q} +CONFIGURE_ARGS+= --with-cups-user=${CUPS_USER:Q} +CONFIGURE_ARGS+= --with-cups-group=${CUPS_GROUP:Q} CONFIGURE_ARGS+= --with-manext=bsd CONFIGURE_ARGS+= --enable-libtool CONFIGURE_ARGS+= --enable-slp diff --git a/print/enscript/Makefile b/print/enscript/Makefile index 4fd155644af..ef879a9021f 100644 --- a/print/enscript/Makefile +++ b/print/enscript/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:27 jlam Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= enscript-1.6.3 @@ -17,14 +17,14 @@ USE_PKGLOCALEDIR= yes USE_PKGINSTALL= yes USE_TOOLS+= gmake -CONFIGURE_ARGS+= --sysconfdir="${PKG_SYSCONFDIR}" +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/enscript CONF_FILES= ${EGDIR}/enscript.cfg ${PKG_SYSCONFDIR}/enscript.cfg .include "../../mk/bsd.prefs.mk" .if defined(PAPERSIZE) -CONFIGURE_ARGS+=--with-media="${PAPERSIZE}" +CONFIGURE_ARGS+=--with-media=${PAPERSIZE:Q} .endif .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile index e1c465933bc..16850f42c32 100644 --- a/print/foomatic-filters/Makefile +++ b/print/foomatic-filters/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/11/28 06:41:21 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:16 rillig Exp $ DISTNAME= foomatic-filters-3.0.2 PKGREVISION= 1 @@ -25,7 +25,7 @@ CONFIG_SUB_OVERRIDE= ${WRKSRC}/config.sub CONFIGURE_ENV+= CUPS=${LOCALBASE}/share/cups CONFIGURE_ENV+= CUPS_FILTERS=${LOCALBASE}/lib/cups/filter CONFIGURE_ENV+= PRINTCAP=/etc/printcap -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} USE_TOOLS+= gmake gs:run perl:run USE_PKGINSTALL= yes diff --git a/print/gimp-print-cups/Makefile b/print/gimp-print-cups/Makefile index 9c877cd2e3d..84d5b0142cf 100644 --- a/print/gimp-print-cups/Makefile +++ b/print/gimp-print-cups/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:27 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:16 rillig Exp $ DISTNAME= gimp-print-4.2.7 PKGNAME= gimp-print-cups-4.2.7 @@ -15,10 +15,10 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-escputil=no --enable-libgimpprint=no -CONFIGURE_ARGS+= --with-cups=${PREFIX} +CONFIGURE_ARGS+= --with-cups=${PREFIX:Q} CONFIGURE_ARGS+= --without-samples --without-user-guide CONFIGURE_ARGS+= --without-gimp --without-translated-ppds -CONFIGURE_ARGS+= --sysconfdir=${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q} PKG_SYSCONFSUBDIR= cups EGDIR= ${PREFIX}/share/examples/cups diff --git a/print/scribus/Makefile b/print/scribus/Makefile index ca084a749e0..a64cea30904 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/10/18 18:00:44 drochner Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:16 rillig Exp $ DISTNAME= scribus-1.2.3 PKGREVISION= 1 @@ -17,13 +17,13 @@ USE_LIBTOOL= YES SHLIBTOOL_OVERRIDE= libtool GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-qt-dir=${QTDIR} \ +CONFIGURE_ARGS+= --with-qt-dir=${QTDIR:Q} \ --with-extra-libs=${LOCALBASE}/lib \ --with-extra-includes=${LOCALBASE}/include # XXX should work with other Python versions, but there are # stupid assumptions in the configure script PYTHON_VERSION_REQD= 24 -CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE} +CONFIGURE_ARGS+= --with-pythondir=${LOCALBASE:Q} # avoid CUPS libs to be pulled in CONFIGURE_ENV+= ac_cv_prog_hacups=no diff --git a/print/tcl-pdflib/Makefile b/print/tcl-pdflib/Makefile index d259fefb9d9..cfa368b930e 100644 --- a/print/tcl-pdflib/Makefile +++ b/print/tcl-pdflib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:16 rillig Exp $ .include "../../print/pdflib/Makefile.common" @@ -8,7 +8,7 @@ COMMENT= Tcl interface to PDFlib for generating PDF files BUILDLINK_DEPENDS.pdflib+= pdflib>=${PDFLIB_BASE_VERS} -CONFIGURE_ARGS+= --with-tcl=${TCLSH} +CONFIGURE_ARGS+= --with-tcl=${TCLSH:Q} CONFIGURE_ARGS+= --with-tclincl="${BUILDLINK_PREFIX.tcl}/include" CONFIGURE_ARGS+= --with-tclpkg="${PREFIX}/lib/tcl8.4" TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh diff --git a/print/texfamily/Makefile b/print/texfamily/Makefile index edeac6997ca..5ab50de3c79 100644 --- a/print/texfamily/Makefile +++ b/print/texfamily/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:16 rillig Exp $ DISTNAME= TeXfamily-1.2.1 PKGREVISION= 5 @@ -43,7 +43,7 @@ PLIST_SUBST+= MV=${MV:Q} CFLAGS+= -Dunix MAKEFLAGS+= PREFIX=${PREFIX:Q} GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--prefix=${PREFIX} \ +CONFIGURE_ARGS+=--prefix=${PREFIX:Q} \ --enable-local-texmf=texmf.local \ --without-texinfo \ --without-dialog \ diff --git a/print/xpdf/Makefile b/print/xpdf/Makefile index c4389873f27..c4a5af80423 100644 --- a/print/xpdf/Makefile +++ b/print/xpdf/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.40 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.41 2005/12/05 23:55:16 rillig Exp $ DISTNAME= xpdf-3.01 CATEGORIES= print @@ -17,7 +17,7 @@ CONFLICTS= xpdf-crypto-[0-9]* USE_PKGINSTALL= yes USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-freetype2-includes=${BUILDLINK_PREFIX.freetype2}/include/freetype2 CONFIGURE_ARGS+= --with-t1-includes=${BUILDLINK_PREFIX.t1lib}/include CONFIGURE_ENV+= CXXFLAGS=${CXXFLAGS:M*:Q} diff --git a/security/PAM/Makefile b/security/PAM/Makefile index 64953b9cfb1..87ab258ec08 100644 --- a/security/PAM/Makefile +++ b/security/PAM/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= Linux-PAM-0.77 @@ -26,7 +26,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-docdir=${PREFIX}/share/doc/PAM CONFIGURE_ARGS+= --enable-includedir=${PREFIX}/include CONFIGURE_ARGS+= --enable-mandir=${PREFIX}/${PKGMANDIR} -CONFIGURE_ARGS+= --enable-sconfigdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-sconfigdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-static-libpam CONFIGURE_ENV+= ac_cv_prog_HAVE_SGML2TXT=no CONFIGURE_ENV+= ac_cv_prog_HAVE_SGML2HTML=no diff --git a/security/amap/Makefile b/security/amap/Makefile index ddd87a00ad8..5b1efa8a075 100644 --- a/security/amap/Makefile +++ b/security/amap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= amap-5.0 @@ -12,7 +12,7 @@ COMMENT= Applications and Services scanner HAS_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} EGDIR= ${PREFIX}/share/examples/amap PKG_SYSCONFSUBDIR?= amap diff --git a/security/amavis-perl/Makefile b/security/amavis-perl/Makefile index bc07f8ed651..c2903e7628c 100644 --- a/security/amavis-perl/Makefile +++ b/security/amavis-perl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:16 rillig Exp $ DISTNAME= amavisd-${VERSION} PKGNAME= amavis-perl-${VERSION} @@ -53,8 +53,8 @@ CONFIGURE_ENV+= file=${TOOLS_FILE_CMD:Q} CONFIGURE_ENV+= procmail="/usr/libexec/mail.local" CONFIGURE_ARGS+=--sysconfdir=${PREFIX}/etc/amavis -CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR} -CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO} +CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR:Q} +CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO:Q} CONFIGURE_ARGS+=--enable-all CONFIGURE_ARGS+=--with-amavisuser=amavis diff --git a/security/amavis-perl/options.mk b/security/amavis-perl/options.mk index 48711fba5d3..decee369870 100644 --- a/security/amavis-perl/options.mk +++ b/security/amavis-perl/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.1 2005/08/01 12:18:41 wiz Exp $ +# $NetBSD: options.mk,v 1.2 2005/12/05 23:55:16 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.amavis-perl PKG_SUPPORTED_OPTIONS= milter @@ -17,6 +17,6 @@ CONFIGURE_ARGS+=--enable-milter CONFIGURE_ARGS+=--with-milter-libs=${PREFIX}/lib CONFIGURE_ARGS+=--with-milter-includes=${PREFIX}/include .else -CONFIGURE_ARGS+=--enable-smtp --with-smtp-port=${SMTPPORT} +CONFIGURE_ARGS+=--enable-smtp --with-smtp-port=${SMTPPORT:Q} PLIST_SRC+= ${PKGDIR}/PLIST.nomilter .endif diff --git a/security/amavis/Makefile b/security/amavis/Makefile index 4449ae66a64..ce3a582b01f 100644 --- a/security/amavis/Makefile +++ b/security/amavis/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:16 rillig Exp $ # DISTNAME= amavis-0.2.1 @@ -31,8 +31,8 @@ VIRUSMAILTO?= security # whom to notify about viruses GNU_CONFIGURE= YES CONFIGURE_ENV+= procmail="/usr/libexec/mail.local" CONFIGURE_ENV+= BASH=${TOOLS_SH:Q} -CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR} -CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO} +CONFIGURE_ARGS+=--with-virusdir=${VIRUSDIR:Q} +CONFIGURE_ARGS+=--with-mailto=${VIRUSMAILTO:Q} INSTALLATION_DIRS= bin sbin diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile index 86c013da22f..7b68fdf446a 100644 --- a/security/amavisd-new/Makefile +++ b/security/amavisd-new/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:54 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:16 rillig Exp $ DISTNAME= amavisd-new-${VERSION}${PATCHLEVEL} PKGNAME= amavisd-new-${VERSION}${PATCHLEVEL:S/-//} @@ -68,9 +68,9 @@ PKG_SUPPORTED_OPTIONS= milter .if !empty(PKG_OPTIONS:Mmilter) GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR} +CONFIGURE_ARGS+= --with-runtime-dir=${AMAVIS_DIR:Q} CONFIGURE_ARGS+= --with-sockname=${AMAVIS_DIR}/amavisd.sock -CONFIGURE_ARGS+= --with-user=${AMAVIS_USER} +CONFIGURE_ARGS+= --with-user=${AMAVIS_USER:Q} CONFIGURE_ARGS+= --with-milterinc=${BUILDLINK_PREFIX.libmilter}/include CONFIGURE_ARGS+= --with-milterlib=${BUILDLINK_PREFIX.libmilter}/lib CONFIGURE_DIRS= ${WRKSRC}/helper-progs diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile index 82d6345e164..e10be4ed577 100644 --- a/security/courier-authlib/Makefile +++ b/security/courier-authlib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:17 rillig Exp $ .include "Makefile.common" @@ -24,12 +24,12 @@ REPLACE_PERL= samplepipe.pl sysconftool USE_TOOLS+= cat:run gmake perl:run CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} # makedat -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --with-pkgconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --without-stdheaderdir AUTHDAEMONVAR?= ${VARBASE}/authdaemon -CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR} +CONFIGURE_ARGS+= --with-authdaemonvar=${AUTHDAEMONVAR:Q} OWN_DIRS_PERMS= ${AUTHDAEMONVAR} ${COURIER_USER} ${COURIER_GROUP} 0750 FILES_SUBST+= AUTHDAEMONVAR=${AUTHDAEMONVAR:Q} diff --git a/security/courier-authlib/Makefile.common b/security/courier-authlib/Makefile.common index 51659d837a6..37e8cf47301 100644 --- a/security/courier-authlib/Makefile.common +++ b/security/courier-authlib/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile.common,v 1.6 2005/12/05 23:55:17 rillig Exp $ COURIER_USER?= courier COURIER_GROUP?= mail @@ -10,5 +10,5 @@ PKG_GROUPS= ${COURIER_GROUP} PKG_USERS= ${COURIER_USER}:${COURIER_GROUP}::Courier\ user GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER} -CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP} +CONFIGURE_ARGS+= --with-mailuser=${COURIER_USER:Q} +CONFIGURE_ARGS+= --with-mailgroup=${COURIER_GROUP:Q} diff --git a/security/cy2-digestmd5/Makefile b/security/cy2-digestmd5/Makefile index c03d0f28253..6d238e545b6 100644 --- a/security/cy2-digestmd5/Makefile +++ b/security/cy2-digestmd5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-digestmd5/} COMMENT= Cyrus SASL DIGEST-MD5 authentication plugin @@ -10,7 +10,7 @@ CONFLICTS= cyrus-sasl<=2.1.19nb1 CONFIGURE_ARGS+= --enable-digest CONFIGURE_ARGS+= --with-rc4 -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/plugins BUILD_TARGET= libdigestmd5.la diff --git a/security/cy2-gssapi/Makefile b/security/cy2-gssapi/Makefile index 3f862f41b9a..da92e4ae5c7 100644 --- a/security/cy2-gssapi/Makefile +++ b/security/cy2-gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:17 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-gssapi/} COMMENT= Cyrus SASL GSSAPI authentication plugin @@ -8,8 +8,8 @@ CONFLICTS= cyrus-sasl<=2.1.19nb1 .include "../../security/cyrus-sasl2/Makefile.common" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} GSSIMPL.heimdal= heimdal GSSIMPL.mit-krb5= mit diff --git a/security/cy2-ntlm/Makefile b/security/cy2-ntlm/Makefile index d67401f0442..76084b89944 100644 --- a/security/cy2-ntlm/Makefile +++ b/security/cy2-ntlm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:17 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-ntlm/} COMMENT= Cyrus SASL NTLM authentication plugin @@ -7,7 +7,7 @@ SASL_PLUGIN= yes .include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-ntlm -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/plugins BUILD_TARGET= libntlm.la diff --git a/security/cy2-otp/Makefile b/security/cy2-otp/Makefile index 1b4f87ec17a..2e60dbae620 100644 --- a/security/cy2-otp/Makefile +++ b/security/cy2-otp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-otp/} COMMENT= Cyrus SASL OTP authentication plugin @@ -9,7 +9,7 @@ CONFLICTS= cyrus-sasl<=2.1.19nb1 .include "../../security/cyrus-sasl2/Makefile.common" CONFIGURE_ARGS+= --enable-otp -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} BUILD_DIRS= ${WRKSRC}/plugins BUILD_TARGET= libotp.la diff --git a/security/cy2-sql/Makefile b/security/cy2-sql/Makefile index 9d87c817e91..d9f674dea66 100644 --- a/security/cy2-sql/Makefile +++ b/security/cy2-sql/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:17 rillig Exp $ PKGNAME= ${DISTNAME:S/cyrus-sasl/cy2-sql/} COMMENT= Cyrus SASL SQL authentication plugin @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-mysql=${BUILDLINK_PREFIX.mysql-client} .if !empty(PKG_OPTIONS:Mpgsql) . include "../../mk/pgsql.buildlink3.mk" -CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX} +CONFIGURE_ARGS+= --with-pgsql=${PGSQL_PREFIX:Q} .endif .if !empty(PKG_OPTIONS:Msqlite) diff --git a/security/cyrus-sasl2/Makefile b/security/cyrus-sasl2/Makefile index d3660b77df2..fbe4073838f 100644 --- a/security/cyrus-sasl2/Makefile +++ b/security/cyrus-sasl2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:17 rillig Exp $ .include "Makefile.common" @@ -18,14 +18,14 @@ USE_DB185= no . include "../../mk/bdb.buildlink3.mk" .endif -CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE} +CONFIGURE_ARGS+= --with-dblib=${SASL_DBTYPE:Q} CONFIGURE_ARGS+= --with-dbpath=${PKG_SYSCONFDIR}/sasldb # Support using Cyrus saslauthd (security/cyrus-saslauthd) for plaintext # password authentication. # SASLSOCKETDIR?= ${VARBASE}/run/saslauthd -CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR} +CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR:Q} BUILD_DEFS+= SASLSOCKETDIR # Support using the Courier authdaemond (security/courier-authlib) for @@ -44,7 +44,7 @@ CONFIGURE_ARGS+= --enable-checkapop SASL_ENTROPY_SOURCE?= /dev/urandom .endif .if defined(SASL_ENTROPY_SOURCE) -CONFIGURE_ARGS+= --with-devrandom=${SASL_ENTROPY_SOURCE} +CONFIGURE_ARGS+= --with-devrandom=${SASL_ENTROPY_SOURCE:Q} .endif BUILD_DEFS+= SASL_ENTROPY_SOURCE diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common index 27a91e14fcb..34859deb21e 100644 --- a/security/cyrus-sasl2/Makefile.common +++ b/security/cyrus-sasl2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2005/11/04 19:36:57 tv Exp $ +# $NetBSD: Makefile.common,v 1.31 2005/12/05 23:55:17 rillig Exp $ # # This file is currently included by: # @@ -52,7 +52,7 @@ DOCDIR= ${PREFIX}/share/doc/cyrus-sasl PLUGINDIR= ${PREFIX}/lib/sasl2 _PLUGINDIR= ${VIEWBASE}/lib/sasl2 -CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR} +CONFIGURE_ARGS+= --with-plugindir=${_PLUGINDIR:Q} # Authentication mechanisms CONFIGURE_ARGS+= --disable-anon # ANONYMOUS diff --git a/security/cyrus-saslauthd/Makefile b/security/cyrus-saslauthd/Makefile index eff31978872..3fa9514cc94 100644 --- a/security/cyrus-saslauthd/Makefile +++ b/security/cyrus-saslauthd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:50:55 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:17 rillig Exp $ DISTNAME= cyrus-sasl-2.1.20 PKGNAME= ${DISTNAME:S/sasl/saslauthd/} @@ -21,15 +21,15 @@ HOMEPAGE= http://asg.web.cmu.edu/sasl/ COMMENT= Cyrus SASL plaintext authentication daemon GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} BUILD_TARGET= all saslcache testsaslauthd SASLSOCKETDIR?= ${VARBASE}/run/saslauthd BUILD_DEFS+= SASLSOCKETDIR FILES_SUBST+= SASLSOCKETDIR=${SASLSOCKETDIR:Q} -CONFIGURE_ARGS+= --with-saslauthd="${SASLSOCKETDIR}" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-saslauthd=${SASLSOCKETDIR:Q} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .include "options.mk" diff --git a/security/cyrus-saslauthd/options.mk b/security/cyrus-saslauthd/options.mk index 09802b75bfd..2a301974c5e 100644 --- a/security/cyrus-saslauthd/options.mk +++ b/security/cyrus-saslauthd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/05/31 11:24:33 dillo Exp $ +# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:17 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.cyrus-saslauthd PKG_SUPPORTED_OPTIONS= pam kerberos ldap gssapi @@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS= pam kerberos ldap gssapi ### .if !empty(PKG_OPTIONS:Mpam) . include "../../mk/pam.buildlink3.mk" -CONFIGURE_ARGS+= --with-pam=${PAMBASE} +CONFIGURE_ARGS+= --with-pam=${PAMBASE:Q} .endif ### @@ -39,7 +39,7 @@ PKG_OPTIONS+= gssapi ### .if !empty(PKG_OPTIONS:Mgssapi) . include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE} +CONFIGURE_ARGS+= --enable-gssapi=${KRB5BASE:Q} CONFIGURE_ARGS+= --with-gss_impl=${GSSIMPL.${KRB5_TYPE}} GSSIMPL.heimdal= heimdal GSSIMPL.mit-krb5= mit diff --git a/security/dirmngr/Makefile b/security/dirmngr/Makefile index a472dfa4118..29efafebd3a 100644 --- a/security/dirmngr/Makefile +++ b/security/dirmngr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/08/23 11:48:51 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:17 rillig Exp $ # DISTNAME= dirmngr-0.9.1 @@ -25,8 +25,8 @@ USE_PKGLOCALEDIR= yes RCD_SCRIPTS= dirmngr PKG_RCD_SCRIPTS= yes -CONFIGURE_ARGS+= --localstatedir="${VARBASE}" -CONFIGURE_ARGS+= --sharedstatedir="${VARBASE}" +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sharedstatedir=${VARBASE:Q} CONFIGURE_ENV+= BUILDLINK_PREFIX_openldap=${BUILDLINK_PREFIX.openldap} CONFIGURE_ARGS+= --with-pth-prefix=${WRKDIR}/pth diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile index b86596d6258..b787c22dd71 100644 --- a/security/heimdal/Makefile +++ b/security/heimdal/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: Makefile,v 1.48 2005/12/05 23:55:17 rillig Exp $ DISTNAME= heimdal-0.7.1 PKGREVISION= 1 @@ -21,8 +21,8 @@ MAKE_ENV+= INSTALL_CATPAGES=no HEIMDAL_STATEDIR?= ${VARBASE}/heimdal GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${HEIMDAL_STATEDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${HEIMDAL_STATEDIR:Q} CONFIGURE_ARGS+= --includedir=${PREFIX}/include/krb5 CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --without-krb4 @@ -45,7 +45,7 @@ CPPFLAGS+= -I${BUILDLINK_PREFIX.readline}/include/readline BROKEN_READLINE_DETECTION= yes .include "../../devel/readline/buildlink3.mk" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .include "../../security/openssl/buildlink3.mk" PKG_OPTIONS_VAR= PKG_OPTIONS.heimdal @@ -84,7 +84,7 @@ KRB5_PREFIX= # empty HEIMDAL_TRANSFORM= s/^ftp/k&/ .endif PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q} -CONFIGURE_ARGS+= --program-transform-name="${HEIMDAL_TRANSFORM}" +CONFIGURE_ARGS+= --program-transform-name=${HEIMDAL_TRANSFORM:Q} USE_PKGINSTALL= yes OWN_DIRS_PERMS= ${HEIMDAL_STATEDIR} ${ROOT_USER} ${ROOT_GROUP} 0700 diff --git a/security/hydra/Makefile b/security/hydra/Makefile index 4cf054c238c..8e88d02224f 100644 --- a/security/hydra/Makefile +++ b/security/hydra/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:17 rillig Exp $ # DISTNAME= ${PKGNAME}-src @@ -31,7 +31,7 @@ SUBST_MESSAGE.build= "Patching build files." USE_OLD_DES_API= YES PLIST_SRC= ${WRKDIR}/.PLIST_SRC -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} BUILDLINK_DEPENDS.libssh+= libssh-0.1 INSTALLATION_DIRS= bin diff --git a/security/ipsec-tools/Makefile b/security/ipsec-tools/Makefile index 24c785d5a26..d3369460abb 100644 --- a/security/ipsec-tools/Makefile +++ b/security/ipsec-tools/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:17 rillig Exp $ DISTNAME= ipsec-tools-0.6.3 CATEGORIES= security @@ -35,11 +35,11 @@ CONFIGURE_ARGS+= --enable-frag --enable-hybrid CONFIGURE_ARGS+= --enable-adminport --enable-dpd CONFIGURE_ARGS+= --enable-natt=kernel -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} PLIST_SUBST+= VARBASE=${VARBASE:Q} PKG_SYSCONFSUBDIR= racoon -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} SAMPLE_DIR= ${WRKSRC}/src/racoon/samples EXAMPLE_DIR= ${PREFIX}/share/examples/ipsec-tools diff --git a/security/jessie/Makefile b/security/jessie/Makefile index daf5a7765f0..16a0fd922e1 100644 --- a/security/jessie/Makefile +++ b/security/jessie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:17 rillig Exp $ # DISTNAME= jessie-0.9.7 @@ -16,7 +16,7 @@ USE_JAVA2= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-java-prefix=${PKG_JAVA_HOME} +CONFIGURE_ARGS+= --with-java-prefix=${PKG_JAVA_HOME:Q} CONFIGURE_ARGS+= --datadir=${PREFIX}/lib/java/jessie CONFIGURE_ENV+= JAVA=${PKG_JAVA_HOME}/bin/java CONFIGURE_ENV+= JAVAC=${PKG_JAVA_HOME}/bin/javac diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile index 982cb010861..c26af8cb349 100644 --- a/security/kth-krb4/Makefile +++ b/security/kth-krb4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.38 2005/06/01 18:03:21 jlam Exp $ +# $NetBSD: Makefile,v 1.39 2005/12/05 23:55:17 rillig Exp $ # DISTNAME= krb4-1.2.1 @@ -36,7 +36,7 @@ PLIST_SUBST+= KRB4_PREFIX=k4 KTH_KRB4_TRANSFORM= s/^ftp$$/k4&/ # always k4ftp PLIST_SUBST+= KRB4_PREFIX= .endif -CONFIGURE_ARGS+= --program-transform="${KTH_KRB4_TRANSFORM}" +CONFIGURE_ARGS+= --program-transform=${KTH_KRB4_TRANSFORM:Q} INFO_FILES= kth-krb.info diff --git a/security/libnasl/Makefile b/security/libnasl/Makefile index fd964ef3e97..34fd610b1ad 100644 --- a/security/libnasl/Makefile +++ b/security/libnasl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:18 rillig Exp $ .include "../../security/nessus/Makefile.common" @@ -8,7 +8,7 @@ COMMENT= Nessus Attack Scripting Language library WRKSRC= ${WRKDIR}/libnasl GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} .include "../../security/nessus-libraries/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/security/mit-krb5/Makefile b/security/mit-krb5/Makefile index d9b23769950..59be35b9502 100644 --- a/security/mit-krb5/Makefile +++ b/security/mit-krb5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/12/05 20:50:56 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:18 rillig Exp $ DISTNAME= krb5-1.4.2 PKGNAME= mit-${DISTNAME:S/-signed$//} @@ -29,8 +29,8 @@ USE_LIBTOOL= yes MIT_KRB5_STATEDIR?= ${VARBASE} FILES_SUBST+= MIT_KRB5_STATEDIR=${MIT_KRB5_STATEDIR:Q} -CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${MIT_KRB5_STATEDIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-shared CONFIGURE_ARGS+= --enable-pkgsrc-libtool CONFIGURE_ARGS+= --enable-dns @@ -60,7 +60,7 @@ KRB5_PREFIX= # empty MIT_KRB5_TRANSFORM= s/^ftp/k&/ .endif PLIST_SUBST+= KRB5_PREFIX=${KRB5_PREFIX:Q} -CONFIGURE_ARGS+= --program-transform-name="${MIT_KRB5_TRANSFORM}" +CONFIGURE_ARGS+= --program-transform-name=${MIT_KRB5_TRANSFORM:Q} # Fix some places in the MIT krb5 sources that don't point to the correct # Kerberized binaries when exec'ing programs. diff --git a/security/nessus-core/Makefile b/security/nessus-core/Makefile index 371f130bb71..a42101d4c70 100644 --- a/security/nessus-core/Makefile +++ b/security/nessus-core/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:18 rillig Exp $ .include "../../security/nessus/Makefile.common" @@ -9,7 +9,7 @@ COMMENT= Core module of the Nessus Network Security Scanner WRKSRC= ${WRKDIR}/nessus-core USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-gtk --with-x --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --enable-gtk --with-x --localstatedir=${VARBASE:Q} CONFIGURE_ENV+= ac_cv_path_GTKCONFIG="pkg-config gtk+-2.0" \ ac_cv_path_GLIBCONFIG="pkg-config glib-2.0" diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile index 24b73d2c77f..3c5c81fd805 100644 --- a/security/nessus-libraries/Makefile +++ b/security/nessus-libraries/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:18 rillig Exp $ .include "../../security/nessus/Makefile.common" @@ -12,7 +12,7 @@ USE_LIBTOOL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-zlib=${BUILDLINK_PREFIX.zlib}/lib \ --with-ssl=${BUILDLINK_PREFIX.openssl} \ - --localstatedir=${VARBASE} + --localstatedir=${VARBASE:Q} CONFIGURE_ENV+= CPP=${CPP:Q} .include "../../devel/zlib/buildlink3.mk" diff --git a/security/nessus-plugins/Makefile b/security/nessus-plugins/Makefile index d757c0c38e4..9f53e15da7d 100644 --- a/security/nessus-plugins/Makefile +++ b/security/nessus-plugins/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:18 rillig Exp $ .include "../../security/nessus/Makefile.common" @@ -14,7 +14,7 @@ WRKSRC= ${WRKDIR}/nessus-plugins GNU_CONFIGURE= yes USE_TOOLS+= cat gzip -CONFIGURE_ARGS+= --localstatedir=${VARBASE} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} CONFIGURE_ENV+= CAT=${TOOLS_CAT:Q} GZIP=${TOOLS_GZIP_CMD:Q} PLIST_SRC= ${WRKDIR}/PLIST PLIST diff --git a/security/openpam/Makefile b/security/openpam/Makefile index 528cb09d441..9e5b661d8b9 100644 --- a/security/openpam/Makefile +++ b/security/openpam/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:18 rillig Exp $ DISTNAME= openpam-20050201 CATEGORIES= security @@ -12,7 +12,7 @@ CONFLICTS+= PAM-[0-9]* USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --without-pam-su CONFIGURE_ARGS+= --with-pam-unix CONFIGURE_ARGS+= --with-modules-dir=${PREFIX}/lib/security diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile index 398abca3a94..b69863d6e34 100644 --- a/security/openssh+gssapi/Makefile +++ b/security/openssh+gssapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.29 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.30 2005/12/05 23:55:18 rillig Exp $ # NOTE: This package is modeled on ../openssh, but does not share # files with it as that package may update faster than the gssapi @@ -54,12 +54,12 @@ PKG_SYSCONFSUBDIR= ssh USE_PKGINSTALL= yes USE_TOOLS+= autoconf perl GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} -CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} +CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers} -CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT} -CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER} +CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT:Q} +CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER:Q} CONFIGURE_ARGS+= --with-kerberos5=/usr CONFIGURE_ARGS+= --with-kerberos4=/usr diff --git a/security/openssh/Makefile b/security/openssh/Makefile index 80e6274d617..dd683fc19b6 100644 --- a/security/openssh/Makefile +++ b/security/openssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.161 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.162 2005/12/05 23:55:18 rillig Exp $ DISTNAME= openssh-4.2p1 PKGNAME= openssh-4.2.1 @@ -60,14 +60,14 @@ PKG_SYSCONFSUBDIR= ssh USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mantype=man -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} -CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} +CONFIGURE_ARGS+= --with-ssl-dir=${SSLBASE:Q} CONFIGURE_ARGS+= --with-tcp-wrappers=${BUILDLINK_PREFIX.tcp_wrappers} .if ${OPSYS} != "Interix" -CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT} -CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER} +CONFIGURE_ARGS+= --with-privsep-path=${OPENSSH_CHROOT:Q} +CONFIGURE_ARGS+= --with-privsep-user=${OPENSSH_USER:Q} .endif # pkgsrc already enforces a "secure" version of zlib via dependencies, diff --git a/security/openssh/options.mk b/security/openssh/options.mk index 5bac94e7942..408105a4aa1 100644 --- a/security/openssh/options.mk +++ b/security/openssh/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.6 2005/09/21 18:07:09 reed Exp $ +# $NetBSD: options.mk,v 1.7 2005/12/05 23:55:18 rillig Exp $ .include "../../mk/bsd.prefs.mk" @@ -13,7 +13,7 @@ PKG_SUPPORTED_OPTIONS+= pam .if !empty(PKG_OPTIONS:Mkerberos) . include "../../mk/krb5.buildlink3.mk" -CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE} +CONFIGURE_ARGS+= --with-kerberos5=${KRB5BASE:Q} .endif .if !empty(PKG_OPTIONS:Mhpn-patch) diff --git a/security/openssl/Makefile b/security/openssl/Makefile index 93fd55e518f..18ea217f58e 100644 --- a/security/openssl/Makefile +++ b/security/openssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.109 2005/12/05 20:50:57 rillig Exp $ +# $NetBSD: Makefile,v 1.110 2005/12/05 23:55:18 rillig Exp $ OPENSSL_SNAPSHOT?= # empty OPENSSL_STABLE?= # empty @@ -45,8 +45,8 @@ TEST_TARGET= tests HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ./config -CONFIGURE_ARGS+= --prefix=${PREFIX} -CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} +CONFIGURE_ARGS+= --openssldir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= shared .if ${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc" diff --git a/security/pam-ldap/Makefile b/security/pam-ldap/Makefile index 26afab0069f..31ab68ead3a 100644 --- a/security/pam-ldap/Makefile +++ b/security/pam-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/08/29 09:49:07 drochner Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= pam_ldap-180 @@ -18,7 +18,7 @@ CONFIGURE_ARGS+= --with-ldap-lib=openldap CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap} CONFIGURE_ARGS+= --with-ldap-conf-file=${PKG_SYSCONFDIR}/pam_ldap.conf CONFIGURE_ARGS+= --with-ldap-secret-file=${PKG_SYSCONFDIR}/pam_ldap.secret -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} MAKE_ENV+= SHLIBTOOL=$(SHLIBTOOL) diff --git a/security/pks/Makefile b/security/pks/Makefile index e6cf4e7a186..853e675e1c6 100644 --- a/security/pks/Makefile +++ b/security/pks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/12/05 20:50:58 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:18 rillig Exp $ DISTNAME= pks-0.9.4 PKGREVISION= 3 @@ -43,13 +43,13 @@ OWN_DIRS_PERMS+= ${PKS_HOME}/db ${PKS_USER} ${PKS_GROUP} 0770 OWN_DIRS_PERMS+= ${PKS_HOME}/incoming ${PKS_USER} ${PKS_GROUP} 0770 CONFIGURE_ARGS+= --datadir=${PREFIX}/share/pks -CONFIGURE_ARGS+= --localstatedir=${PKS_HOME} +CONFIGURE_ARGS+= --localstatedir=${PKS_HOME:Q} # # pksd doesn't actually look for its config file anywhere; it must be # specified directly on the command-line. Setting sysconfdir here just # causes the example pksd.conf file to be installed at the named location. # -CONFIGURE_ARGS+= --sysconfdir=${EGDIR} +CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q} SUBST_CLASSES+= paths SUBST_MESSAGE.paths= "Fixing hardcoded paths." diff --git a/security/priv/Makefile b/security/priv/Makefile index 929babf2391..72fc6691d84 100644 --- a/security/priv/Makefile +++ b/security/priv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:17 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= priv-1.0-beta2 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} SUBST_CLASSES+= sysconfdir SUBST_STAGE.sysconfdir= post-configure SUBST_FILES.sysconfdir= priv.1 diff --git a/security/sfs/Makefile b/security/sfs/Makefile index caa26b105cb..8039eb71cc4 100644 --- a/security/sfs/Makefile +++ b/security/sfs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/08/23 11:48:51 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= sfs-0.7.2 @@ -14,8 +14,8 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-sfsuser=sfs CONFIGURE_ARGS+= --with-sfsgroup=sfs -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-sfsdir=${SFS_ROOT} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-sfsdir=${SFS_ROOT:Q} CONFIGURE_ARGS+= --disable-uvfs USE_PKGINSTALL= yes diff --git a/security/skey/Makefile b/security/skey/Makefile index bd91aa9a112..3556f9654c6 100644 --- a/security/skey/Makefile +++ b/security/skey/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:19 jlam Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= skey-1.1.5 @@ -14,7 +14,7 @@ COMMENT= Port of OpenBSD s/key implementation USE_TOOLS+= gmake perl GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES+= ${PREFIX}/share/examples/skey/skeykeys \ ${PKG_SYSCONFDIR}/skeykeys diff --git a/security/ssh2/Makefile.common b/security/ssh2/Makefile.common index ce4f4bc6328..78e826d5fba 100644 --- a/security/ssh2/Makefile.common +++ b/security/ssh2/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.15 2005/12/05 20:50:58 rillig Exp $ +# $NetBSD: Makefile.common,v 1.16 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= ssh-3.2.9.1 @@ -55,13 +55,13 @@ CONFIGURE_ARGS+= --without-daemonpam --without-clientpam CONFIGURE_ARGS+= --without-ssh-agent1-compat CONFIGURE_ARGS+= --without-ssh1-compat CONFIGURE_ARGS+= --with-libwrap=${BUILDLINK_PREFIX.tcp-wrappers} -CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR} +CONFIGURE_ARGS+= --with-pid-dir=${SSH_PID_DIR:Q} # Setting FOREIGN_ETCDIR to PKG_SYSCONFBASEDIR may seem stupid # if PKG_SYSCONFDIR.${PKG_SYSCONFVAR} is set but it does no harm... # -CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR} -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-foreign-etcdir=${PKG_SYSCONFBASEDIR:Q} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} MAKE_ENV+= PKGBASE=${PKGBASE:Q} MAKE_ENV+= RM=${RM:Q} diff --git a/security/stunnel/Makefile b/security/stunnel/Makefile index fba538128bc..b9fe738d79b 100644 --- a/security/stunnel/Makefile +++ b/security/stunnel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/09/28 20:52:26 rillig Exp $ +# $NetBSD: Makefile,v 1.51 2005/12/05 23:55:18 rillig Exp $ DISTNAME= stunnel-4.07 PKGREVISION= 2 @@ -13,12 +13,12 @@ COMMENT= Universal SSL tunnel USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} \ - --with-cert-dir="${SSLCERTS}" \ - --with-pem-dir="${SSLCERTS}" \ +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} \ + --with-cert-dir=${SSLCERTS:Q} \ + --with-pem-dir=${SSLCERTS:Q} \ --with-tcp-wrappers \ - --sysconfdir="${PKG_SYSCONFDIR}" \ - --localstatedir=${VARBASE} + --sysconfdir=${PKG_SYSCONFDIR:Q} \ + --localstatedir=${VARBASE:Q} PKG_SYSCONFSUBDIR= stunnel diff --git a/security/sudo/Makefile b/security/sudo/Makefile index a6dc0672c1a..03e80af8f63 100644 --- a/security/sudo/Makefile +++ b/security/sudo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.83 2005/11/12 14:17:45 adrianp Exp $ +# $NetBSD: Makefile,v 1.84 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= sudo-1.6.8p9 @@ -25,7 +25,7 @@ GNU_CONFIGURE= yes .include "../../mk/bsd.prefs.mk" CONFIGURE_ARGS+= --disable-root-mailer -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .include "options.mk" diff --git a/shells/rssh/Makefile b/shells/rssh/Makefile index cf8948a9838..66c3343fadc 100644 --- a/shells/rssh/Makefile +++ b/shells/rssh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/09/28 21:02:27 seb Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:18 rillig Exp $ # DISTNAME= rssh-2.2.3 @@ -13,7 +13,7 @@ COMMENT= Restricted shell allowing only scp and/or sftp GNU_CONFIGURE= yes USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} .if !exists(/usr/include/wordexp.h) PKG_SKIP_REASON+= "${PKGNAME} requires wordexp(3)" @@ -33,19 +33,19 @@ BUILD_DEFS+= RSSH_RDIST_PATH BUILD_DEFS+= RSSH_RSYNC_PATH .if defined(RSSH_SCP_PATH) && !empty(RSSH_SCP_PATH) -CONFIGURE_ARGS+= --with-scp=${RSSH_SCP_PATH} +CONFIGURE_ARGS+= --with-scp=${RSSH_SCP_PATH:Q} .endif .if defined(RSSH_SFTP_SERVER_PATH) && !empty(RSSH_SFTP_SERVER_PATH) -CONFIGURE_ARGS+= --with-sftp-server=${RSSH_SFTP_SERVER_PATH} +CONFIGURE_ARGS+= --with-sftp-server=${RSSH_SFTP_SERVER_PATH:Q} .endif .if defined(RSSH_CVS_PATH) && !empty(RSSH_CVS_PATH) -CONFIGURE_ARGS+= --with-cvs=${RSSH_CVS_PATH} +CONFIGURE_ARGS+= --with-cvs=${RSSH_CVS_PATH:Q} .endif .if defined(RSSH_RDIST_PATH) && !empty(RSSH_RDIST_PATH) -CONFIGURE_ARGS+= --with-rdist=${RSSH_RDIST_PATH} +CONFIGURE_ARGS+= --with-rdist=${RSSH_RDIST_PATH:Q} .endif .if defined(RSSH_RSYNC_PATH) && !empty(RSSH_RSYNC_PATH) -CONFIGURE_ARGS+= --with-rsync=${RSSH_RSYNC_PATH} +CONFIGURE_ARGS+= --with-rsync=${RSSH_RSYNC_PATH:Q} .endif post-install: diff --git a/shells/scponly/Makefile b/shells/scponly/Makefile index 53e1bc0ffc7..c3414ff216f 100644 --- a/shells/scponly/Makefile +++ b/shells/scponly/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:19 rillig Exp $ DISTNAME= scponly-4.1 CATEGORIES= shells security @@ -27,7 +27,7 @@ CONFIGURE_ENV+= scponly_PROG_PWD=${TOOLS_PWD_CMD:Q} CONFIGURE_ENV+= PROG_RM=${TOOLS_RM:Q} CONFIGURE_ENV+= scponly_PROG_RM=${TOOLS_RM:Q} CONFIGURE_ENV+= scponly_PROG_RMDIR=${TOOLS_RMDIR:Q} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} USE_PKGINSTALL= yes PKG_SHELL= bin/scponly PKG_SYSCONFSUBDIR= scponly diff --git a/shells/standalone-tcsh/Makefile b/shells/standalone-tcsh/Makefile index 67539404bf4..700eef1f2af 100644 --- a/shells/standalone-tcsh/Makefile +++ b/shells/standalone-tcsh/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/12/05 20:50:59 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:19 rillig Exp $ # NO_MTREE= YES @@ -17,7 +17,7 @@ PKG_INFO:= ${PKG_INFO} PKG_CREATE:= ${PKG_CREATE} PREFIX= / NLSDIR= usr/share/nls -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} CONFIGURE_ARGS+= --bindir=/bin CONFIGURE_ARGS+= --mandir=/usr/share/man diff --git a/shells/zsh/Makefile.common b/shells/zsh/Makefile.common index 633ee08c276..3cc4dfddcc8 100644 --- a/shells/zsh/Makefile.common +++ b/shells/zsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2005/11/26 15:41:16 uebayasi Exp $ +# $NetBSD: Makefile.common,v 1.31 2005/12/05 23:55:19 rillig Exp $ DISTNAME= zsh-${ZSH_VERSION} CATEGORIES= shells @@ -16,7 +16,7 @@ COMMENT= The Z shell USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --enable-etcdir=${PKG_SYSCONFDIR:Q} USE_MAKEINFO= yes INFO_FILES= zsh.info 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 diff --git a/textproc/chasen/Makefile.common b/textproc/chasen/Makefile.common index a72f2e6314d..52355716f28 100644 --- a/textproc/chasen/Makefile.common +++ b/textproc/chasen/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/02/13 09:54:38 taca Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 23:55:20 rillig Exp $ # CHASEN_VERSION= 2.3.3 @@ -7,5 +7,5 @@ CHASEN_VERSION= 2.3.3 PKG_SYSCONFSUBDIR?= chasen CHASEN_DICDIR?= ${PREFIX}/share/chasen/dic -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ - --with-dicdir=${CHASEN_DICDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ + --with-dicdir=${CHASEN_DICDIR:Q} diff --git a/textproc/dict-client/Makefile b/textproc/dict-client/Makefile index a58cff6842b..d1a28ca0ef4 100644 --- a/textproc/dict-client/Makefile +++ b/textproc/dict-client/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/10/10 17:02:12 hira Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:20 rillig Exp $ DISTNAME= dictd-1.9.15 PKGNAME= dict-client-1.9.15 @@ -12,8 +12,8 @@ COMMENT= Dictionary Service Protocol client USE_TOOLS+= gmake GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-cflags="${CFLAGS}" -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-cflags=${CFLAGS:M*:Q} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-dictorg BUILD_TARGET= dict diff --git a/textproc/dict-server/Makefile b/textproc/dict-server/Makefile index 723b6049c1e..85b474e7130 100644 --- a/textproc/dict-server/Makefile +++ b/textproc/dict-server/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:34 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $ DISTNAME= dictd-1.9.15 PKGNAME= dict-server-1.9.15 @@ -13,8 +13,8 @@ COMMENT= Dictionary Service Protocol server USE_TOOLS+= gmake USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-cflags="${CFLAGS}" -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-cflags=${CFLAGS:M*:Q} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} BUILD_TARGET= dictd dictzip INSTALL_TARGET= install.dictd install.dictzip install.dictfmt diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile index 2ffd0f0b64d..9dc8578fc45 100644 --- a/textproc/eb/Makefile +++ b/textproc/eb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/12/05 20:51:02 rillig Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 23:55:20 rillig Exp $ DISTNAME= eb-4.1.3 CATEGORIES= textproc japanese @@ -57,7 +57,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-zlib -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONF_FILES= ${EGDIR}/eb.conf.default ${PKG_SYSCONFDIR}/eb.conf diff --git a/textproc/eperl/Makefile b/textproc/eperl/Makefile index 76e79f13bd9..0454e990e46 100644 --- a/textproc/eperl/Makefile +++ b/textproc/eperl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/08/06 06:19:31 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:20 rillig Exp $ DISTNAME= eperl-2.2.14 PKGREVISION= 3 @@ -12,7 +12,7 @@ COMMENT= Interpreter/preprocessor for Perl embedded in text documents PERL5_PACKLIST= auto/Parse/ePerl/.packlist GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} PERL5_CONFIGURE= NO PERL5_CONFIGURE_DIRS= ${WRKSRC}/mod/Parse BUILD_DIRS= ${WRKSRC} ${WRKSRC}/mod/Parse diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile index 18af8c5eb97..96e1fe68ec5 100644 --- a/textproc/freepwing/Makefile +++ b/textproc/freepwing/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:03 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:20 rillig Exp $ DISTNAME= freepwing-1.4.4 PKGREVISION= 3 @@ -13,7 +13,7 @@ DEPENDS+= p5-Jcode-[0-9]*:../../converters/p5-Jcode USE_TOOLS+= gmake perl:run GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-perllibdir=${PERL5_INSTALLVENDORLIB} +CONFIGURE_ARGS+= --with-perllibdir=${PERL5_INSTALLVENDORLIB:Q} CONFIGURE_ARGS+= --with-pkgdocdir=${PREFIX}/share/doc/freepwing CONFIGURE_ENV+= GNUMAKE=${GMAKE:Q} diff --git a/textproc/grep/Makefile b/textproc/grep/Makefile index ce801c06c35..60f2e07af73 100644 --- a/textproc/grep/Makefile +++ b/textproc/grep/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:03 rillig Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= grep-2.5.1 @@ -24,7 +24,7 @@ INFO_FILES= grep.info .include "../../mk/bsd.prefs.mk" .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/textproc/gsed/Makefile b/textproc/gsed/Makefile index 0050ad3ea47..296ca86a952 100644 --- a/textproc/gsed/Makefile +++ b/textproc/gsed/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:03 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= sed-4.1.1 @@ -26,7 +26,7 @@ TEST_TARGET= check .include "../../mk/bsd.prefs.mk" .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/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile index ce3ac43745f..2df02eb2367 100644 --- a/textproc/gtk-doc/Makefile +++ b/textproc/gtk-doc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/10/08 17:18:13 jmmv Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= gtk-doc-1.4 @@ -16,7 +16,7 @@ DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular GNU_CONFIGURE= YES PKGCONFIG_OVERRIDE= gtk-doc.pc.in -CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG} +CONFIGURE_ARGS+= --with-xml-catalog=${XML_DEFAULT_CATALOG:Q} USE_TOOLS+= perl:run SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat diff --git a/textproc/icu/Makefile b/textproc/icu/Makefile index 56fe6384c02..4e54a164ccd 100644 --- a/textproc/icu/Makefile +++ b/textproc/icu/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.43 2005/12/05 20:51:03 rillig Exp $ +# $NetBSD: Makefile,v 1.44 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= icu-3.2 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --enable-static CONFIGURE_ENV+= U_MAKE=${TOOLS_GMAKE:Q} # ICU's configure script will automatically append "/icu" to the sysconfdir. -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} PKG_SYSCONFSUBDIR= icu CONVRTRS_EG= ${CONVRTRS_EG_DIR}/convrtrs.txt diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile index 5677485b276..ce021e2538c 100644 --- a/textproc/latex2html/Makefile +++ b/textproc/latex2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/11/28 06:41:22 jlam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:20 rillig Exp $ DISTNAME= latex2html-2002-2-1 PKGNAME= latex2html-2002.2.1 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --enable-png # add support of PNG images CONFIGURE_ARGS+= --with-texpath=${PKG_LOCALTEXMFPREFIX}/tex/latex/html CONFIGURE_ARGS+= --shlibdir=${PREFIX}/share/latex2html .if defined(LATEX2HTML_ICONPATH) -CONFIGURE_ARGS+= --with-iconpath=${LATEX2HTML_ICONPATH} +CONFIGURE_ARGS+= --with-iconpath=${LATEX2HTML_ICONPATH:Q} .endif .include "../../mk/tex.buildlink3.mk" diff --git a/textproc/namazu2/Makefile b/textproc/namazu2/Makefile index 7e253922e7d..202e99b6b90 100644 --- a/textproc/namazu2/Makefile +++ b/textproc/namazu2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/05 20:51:07 rillig Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:20 rillig Exp $ DISTNAME= namazu-2.0.14 PKGREVISION= 3 @@ -25,9 +25,9 @@ USE_LIBTOOL= yes SHLIBTOOL_OVERRIDE= libtool TEST_TARGET= check -CONFIGURE_ARGS+= --localstatedir=${DATADIR} \ +CONFIGURE_ARGS+= --localstatedir=${DATADIR:Q} \ --libexecdir=${PREFIX}/libexec/cgi-bin \ - --sysconfdir=${PKG_SYSCONFBASE} \ + --sysconfdir=${PKG_SYSCONFBASE:Q} \ --with-chasen DATADIR= ${PREFIX}/libdata diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile index e41ba40c5d7..820ab220dad 100644 --- a/textproc/ndtpd/Makefile +++ b/textproc/ndtpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/12/05 20:51:07 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= ndtpd-3.1.5 @@ -18,9 +18,9 @@ GNU_CONFIGURE= YES INFO_FILES= ndtpd-ja.info ndtpd.info -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --localstatedir=${NDTPD_RUNDIR} -CONFIGURE_ARGS+= --with-logdir=${NDTPD_LOGDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --localstatedir=${NDTPD_RUNDIR:Q} +CONFIGURE_ARGS+= --with-logdir=${NDTPD_LOGDIR:Q} CONFIGURE_ARGS+= --with-eb CONFIGURE_ARGS+= --with-zlib CONFIGURE_ARGS+= --with-eb-conf=${PKG_SYSCONFDIR.eb}/eb.conf diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile index 73a8701efda..716cea18912 100644 --- a/textproc/openjade/Makefile +++ b/textproc/openjade/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:07 rillig Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= openjade-1.3.2 @@ -17,7 +17,7 @@ GNU_CONFIGURE= YES CONFIGURE_ENV+= CXXFLAGS=${CFLAGS:M*:Q} CONFIGURE_ARGS+= --enable-default-catalog=${OPENJADE_DATA_DIR}/catalog \ - --datadir=${OPENJADE_DATA_DIR} + --datadir=${OPENJADE_DATA_DIR:Q} SGML_CATALOGS= ${PREFIX}/share/sgml/openjade/catalog diff --git a/textproc/rubber/Makefile b/textproc/rubber/Makefile index f1afc1c5519..b813234702c 100644 --- a/textproc/rubber/Makefile +++ b/textproc/rubber/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/11/11 18:50:25 tonio Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:20 rillig Exp $ # DISTNAME= rubber-1.0 @@ -18,7 +18,7 @@ TEXINFO_REQD= 4.6 PYTHON_VERSIONS_ACCEPTED= 24 23 TEX_ACCEPTED= teTeX1 teTeX2 teTeX3 -CONFIGURE_ARGS+= --python=${PYTHONBIN} --prefix=${PREFIX} \ +CONFIGURE_ARGS+= --python=${PYTHONBIN:Q} --prefix=${PREFIX:Q} \ --datadir=${PREFIX}/share .include "../../lang/python/application.mk" diff --git a/textproc/ruby-eruby/Makefile b/textproc/ruby-eruby/Makefile index 80172e256ea..8fcbeca7666 100644 --- a/textproc/ruby-eruby/Makefile +++ b/textproc/ruby-eruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:21 rillig Exp $ DISTNAME= eruby-${ERUBY_VERSION} PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} @@ -18,7 +18,7 @@ ERUBY_VERSION= 1.0.5 HAS_CONFIGURE= yes CONFIGURE_SCRIPT= ${RUBY} configure.rb CONFIGURE_ARGS+= --enable-shared \ - --with-charset="${ERUBY_DEFAULT_CHARSET}" + --with-charset=${ERUBY_DEFAULT_CHARSET:Q} INSTALL_TARGET= site-install PLIST_SUBST+= ERUBY_MAJOR=${ERUBY_MAJOR:Q} \ ERUBY_MINOR=${ERUBY_MINOR:Q} \ diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile index 7297f5a12d4..e25fb36e6fa 100644 --- a/textproc/scrollkeeper/Makefile +++ b/textproc/scrollkeeper/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= scrollkeeper-0.3.14 @@ -22,9 +22,9 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes -CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR} -CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${SCROLLKEEPER_DATADIR:Q} +CONFIGURE_ARGS+= --sharedstatedir=${SCROLLKEEPER_DATADIR:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-partial-db-dir=db CONFIGURE_ARGS+= --with-xml-catalog=${BUILDLINK_PREFIX.xmlcatmgr}/share/xml/catalog diff --git a/textproc/texi2html/Makefile b/textproc/texi2html/Makefile index 69596044e6e..b9d8bc953da 100644 --- a/textproc/texi2html/Makefile +++ b/textproc/texi2html/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.22 2005/08/16 11:37:34 adam Exp $ +# $NetBSD: Makefile,v 1.23 2005/12/05 23:55:21 rillig Exp $ DISTNAME= texi2html-1.76 CATEGORIES= textproc @@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_TOOLS+= perl:run GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} INFO_FILES= texi2html.info diff --git a/textproc/xalan-c/Makefile b/textproc/xalan-c/Makefile index 5a427dfaa28..ab2b28ba584 100644 --- a/textproc/xalan-c/Makefile +++ b/textproc/xalan-c/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.18 2005/05/22 20:08:36 jlam Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= Xalan-C_1_6-src @@ -27,7 +27,7 @@ XALAN_ENV= XALANCROOT="${WRKDIR}/xml-xalan/c" ICUROOT="${LOCALBASE}" HAS_CONFIGURE= YES CONFIGURE_SCRIPT= ./runConfigure -CONFIGURE_ARGS+= -C --prefix=${PREFIX} +CONFIGURE_ARGS+= -C --prefix=${PREFIX:Q} CONFIGURE_ARGS+= -p ${XALAN_PLATFORM} CONFIGURE_ARGS+= -t icu CONFIGURE_ARGS+= -r pthread diff --git a/textproc/xmlcatmgr/Makefile b/textproc/xmlcatmgr/Makefile index 30975c9a470..50b8ec508c0 100644 --- a/textproc/xmlcatmgr/Makefile +++ b/textproc/xmlcatmgr/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= xmlcatmgr-2.2 @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews GNU_CONFIGURE= YES USE_PKGINSTALL= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} OWN_DIRS= ${PKG_SYSCONFDIR}/sgml ${PKG_SYSCONFDIR}/xml EGDIR= ${PREFIX}/share/examples/xmlcatmgr diff --git a/time/gnutime/Makefile b/time/gnutime/Makefile index 7a95697a0f8..f1dedf57741 100644 --- a/time/gnutime/Makefile +++ b/time/gnutime/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= time-1.7 @@ -13,7 +13,7 @@ COMMENT= Report user, system, and real time used by a process GNU_CONFIGURE= yes INFO_FILES= time.info -CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX} +CONFIGURE_ARGS+= --program-prefix=${GNU_PROGRAM_PREFIX:Q} PLIST_SUBST+= GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q} BUILD_DEFS+= GNU_PROGRAM_PREFIX diff --git a/time/ical/Makefile b/time/ical/Makefile index df9ed0ac30b..fbb578e00b7 100644 --- a/time/ical/Makefile +++ b/time/ical/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:08 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:21 rillig Exp $ DISTNAME= ical-2.3.1 PKGREVISION= 1 @@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} \ +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} \ --with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \ --with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \ --with-tkconfig=${BUILDLINK_PREFIX.tk}/lib diff --git a/wm/icewm/Makefile.common b/wm/icewm/Makefile.common index 34129d85557..daa13eb54c0 100644 --- a/wm/icewm/Makefile.common +++ b/wm/icewm/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.45 2005/06/01 18:03:25 jlam Exp $ +# $NetBSD: Makefile.common,v 1.46 2005/12/05 23:55:21 rillig Exp $ DISTNAME= icewm-1.2.20 CATEGORIES= x11 wm @@ -22,8 +22,8 @@ CONFIGURE_ARGS+= --enable-antialiasing .include "../../mk/bsd.prefs.mk" -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -CONFIGURE_ARGS+= --with-cfgdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} +CONFIGURE_ARGS+= --with-cfgdir=${PKG_SYSCONFDIR:Q} .if !exists(${X11BASE}/include/X11/extensions/Xinerama.h) CONFIGURE_ARGS+= --disable-xinerama .endif diff --git a/wm/ion/Makefile b/wm/ion/Makefile index ac55cc97191..099c2063b8e 100644 --- a/wm/ion/Makefile +++ b/wm/ion/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/10/23 21:57:22 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= ion-2-20040729 @@ -17,7 +17,7 @@ USE_PKGINSTALL= YES USE_TOOLS+= gmake GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= ion EGDIR= ${PREFIX}/share/examples/ion diff --git a/wm/ion3-devel/Makefile b/wm/ion3-devel/Makefile index ba57006f211..9e152c8e03f 100644 --- a/wm/ion3-devel/Makefile +++ b/wm/ion3-devel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/10/23 21:59:59 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= ion-3ds-20040906 @@ -18,7 +18,7 @@ USE_TOOLS+= gmake GNU_CONFIGURE= YES USE_PKGLOCALEDIR= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= PKGLOCALEDIR=${PREFIX}/${PKGLOCALEDIR}/locale PKG_SYSCONFSUBDIR= ion3 diff --git a/wm/matchbox/Makefile b/wm/matchbox/Makefile index b6c4c5e2a38..b2dd6ea39b7 100644 --- a/wm/matchbox/Makefile +++ b/wm/matchbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/08/10 20:56:25 jlam Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= matchbox-window-manager-0.9.3 @@ -14,7 +14,7 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} PKG_SYSCONFSUBDIR= matchbox EGDIR= ${PREFIX}/share/examples/matchbox diff --git a/wm/openbox/Makefile b/wm/openbox/Makefile index d52eeef2792..b900676bbc1 100644 --- a/wm/openbox/Makefile +++ b/wm/openbox/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/08/10 20:56:25 jlam Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:21 rillig Exp $ DISTNAME= openbox-3.2 PKGREVISION= 1 @@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= YES PKGCONFIG_OVERRIDE= parser/obparser-3.0.pc.in PKGCONFIG_OVERRIDE+= render/obrender-3.0.pc.in -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= xdg OWN_DIRS= ${PKG_SYSCONFDIR}/openbox diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile index 413d7a18fc2..af30598ef06 100644 --- a/wm/pekwm/Makefile +++ b/wm/pekwm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:09 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:21 rillig Exp $ # DISTNAME= pekwm-0.1.3 @@ -23,7 +23,7 @@ CONFIGURE_ARGS+= --enable-xinerama .endif CONFIGURE_ARGS+= --enable-harbour -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} REPLACE_PERL= data/scripts/pekwm_themeset.pl \ data/scripts/pekwm_ws_menu.pl diff --git a/wm/windowmaker/Makefile b/wm/windowmaker/Makefile index c110266913b..64a265b4078 100644 --- a/wm/windowmaker/Makefile +++ b/wm/windowmaker/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:10 rillig Exp $ +# $NetBSD: Makefile,v 1.60 2005/12/05 23:55:21 rillig Exp $ DISTNAME= WindowMaker-0.92.0 PKGNAME= ${DISTNAME:S/WindowMaker/windowmaker/} @@ -19,7 +19,7 @@ USE_PKGINSTALL= yes USE_PKGLOCALEDIR= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-usermenu -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASEDIR:Q} CONFIGURE_ARGS+= --with-gnustepdir=${PREFIX}/share/GNUstep CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale CONFIGURE_ENV+= LINGUAS=yes diff --git a/www/ap-jk/Makefile b/www/ap-jk/Makefile index aceed98480f..5170882937a 100644 --- a/www/ap-jk/Makefile +++ b/www/ap-jk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/05/22 20:08:44 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 23:55:21 rillig Exp $ DISTNAME= jakarta-tomcat-connectors-${JK_VERSION}-src PKGNAME= ap-jk-${JK_VERSION} @@ -24,12 +24,12 @@ SUBST_SED.jk-lt= -e "s|^\(LIBTOOL =\) [^ ]*$$|\1 \$$(SHELL) \$$(top_builddir)/li SUBST_MESSAGE.jk-lt= "Fixing libtool references." # XXX The standard --with-apxs2 when using apache2 doesn't work -CONFIGURE_ARGS+= --with-apxs="${APXS}" +CONFIGURE_ARGS+= --with-apxs=${APXS:Q} .if defined(JK_ENABLE_JNI) USE_JAVA= yes CONFIGURE_ARGS+= --enable-jni -CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME} +CONFIGURE_ARGS+= --with-java-home=${JAVA_HOME:Q} SUBST_FILES.jk-lt+= jni/Makefile .endif diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile index b6c6911a66d..556debf273d 100644 --- a/www/ap-jserv/Makefile +++ b/www/ap-jserv/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:25 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 23:55:21 rillig Exp $ DISTNAME= ApacheJServ-1.1.2 PKGNAME= ap-jserv-1.1.2 @@ -18,7 +18,7 @@ USE_LIBTOOL= yes LTCONFIG_OVERRIDE= ${WRKSRC}/src/scripts/build/unix/ltconfig GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-apxs=${LOCALBASE}/sbin/apxs -CONFIGURE_ARGS+= --with-jdk-home=${PKG_JAVA_HOME} +CONFIGURE_ARGS+= --with-jdk-home=${PKG_JAVA_HOME:Q} CONFIGURE_ARGS+= --with-JSDK=${PREFIX}/lib/java/jsdk.jar CONFIGURE_ARGS+= --with-logdir=${VARBASE}/log/httpd CONFIGURE_ARGS+= --with-servlets=${LOCALBASE}/share/httpd/servlets diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index 39d83f71b85..5a014ac6f62 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:10 rillig Exp $ +# $NetBSD: Makefile,v 1.94 2005/12/05 23:55:22 rillig Exp $ DISTNAME= mod_ssl-2.8.25-1.3.34 PKGNAME= ap-ssl-2.8.25 @@ -19,7 +19,7 @@ USE_PKGINSTALL= yes APACHE_MODULE= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} .include "../../mk/bsd.prefs.mk" diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile index 5004353dbab..e0aa8f1cd29 100644 --- a/www/ap2-auth-ldap/Makefile +++ b/www/ap2-auth-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:10 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 23:55:22 rillig Exp $ DISTNAME= mod_auth_ldap3.05 PKGNAME= ap2-auth-ldap-3.05 @@ -17,9 +17,9 @@ CPPFLAGS+= -L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib -lldap -llber BUILDLINK_DEPENDS.apache+= apache>=2.0.47 -CONFIGURE_ARGS+= --with-apxs=${APXS} +CONFIGURE_ARGS+= --with-apxs=${APXS:Q} CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap} -CONFIGURE_ARGS+= --with-apache-dir=${PREFIX} +CONFIGURE_ARGS+= --with-apache-dir=${PREFIX:Q} CONFIGURE_ARGS+= --with-apache-ver=2 SUBST_CLASSES+= paths diff --git a/www/ap2-python/Makefile b/www/ap2-python/Makefile index 45e1aabdcdd..fdd26d8824f 100644 --- a/www/ap2-python/Makefile +++ b/www/ap2-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/03 13:30:50 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 23:55:22 rillig Exp $ DISTNAME= mod_python-${VERSION} PKGNAME= ap2-${PYPKGPREFIX}-python-${VERSION} @@ -17,7 +17,7 @@ APACHE_MODULE= YES VERSION= 3.1.3 GNU_CONFIGURE= yes -CONFIGURE_ARGS+=--with-apxs="${APXS}" +CONFIGURE_ARGS+=--with-apxs=${APXS:Q} CONFIGURE_ARGS+=--with-python=${PYTHONBIN:Q} PYTHON_VERSIONS_ACCEPTED= 24 23 diff --git a/www/ap2-ruby/Makefile b/www/ap2-ruby/Makefile index 90936169a19..c1c88dcefa4 100644 --- a/www/ap2-ruby/Makefile +++ b/www/ap2-ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/10/29 12:02:23 wiz Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 23:55:22 rillig Exp $ DISTNAME= mod_ruby-${VERSION} PKGNAME= ap2-${RUBY_PKGPREFIX}-${VERSION} @@ -19,7 +19,7 @@ VERSION= 1.2.4 HAS_CONFIGURE= yes INSTALL_TARGET= site-install CONFIGURE_SCRIPT= ${RUBY} configure.rb -CONFIGURE_ARGS+= --with-apxs="${APXS}" +CONFIGURE_ARGS+= --with-apxs=${APXS:Q} MAKE_FLAGS+= APACHE_INCLUDES='-I${PREFIX}/include/httpd \ -I${PREFIX}/include/apr-0' MESSAGE_SUBST+= RUBY_DOCDIR=${RUBY_DOCDIR} diff --git a/www/ap2-subversion/Makefile b/www/ap2-subversion/Makefile index e08efdf7efb..369dcbd894c 100644 --- a/www/ap2-subversion/Makefile +++ b/www/ap2-subversion/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.18 2004/12/03 15:15:12 wiz Exp $ +# $NetBSD: Makefile,v 1.19 2005/12/05 23:55:22 rillig Exp $ PKGNAME= ap2-subversion-${SVNVER} COMMENT= WebDAV server (Apache module) for Subversion .include "../../devel/subversion/Makefile.common" -CONFIGURE_ARGS+= --with-apxs=${APXS} +CONFIGURE_ARGS+= --with-apxs=${APXS:Q} CONFIGURE_ARGS+= --disable-mod-activation APACHE_MODULE= YES diff --git a/www/ap2-suphp/Makefile b/www/ap2-suphp/Makefile index 78f07140b84..3f1160773d6 100644 --- a/www/ap2-suphp/Makefile +++ b/www/ap2-suphp/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/08/03 16:43:38 rillig Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 23:55:22 rillig Exp $ # DISTNAME= suphp-0.6.0 @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes USE_LANGUAGES= c c++ GCC_REQD+= 3.0 # the C++ code uses the .at() method CONFIGURE_ARGS+= APXS=apxs -CONFIGURE_ARGS+= --with-apache-user=${APACHE_USER} +CONFIGURE_ARGS+= --with-apache-user=${APACHE_USER:Q} CONFIGURE_ARGS+= --with-logfile=${VARBASE}/httpd/suphp_log # I don't know why this is necessary, but it is. diff --git a/www/ap2-transform/Makefile b/www/ap2-transform/Makefile index d83514c30af..540a42ef7b5 100644 --- a/www/ap2-transform/Makefile +++ b/www/ap2-transform/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/08/10 20:56:25 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:22 rillig Exp $ # DISTNAME= mod_transform-0.4.0 @@ -15,7 +15,7 @@ USE_TOOLS+= pkg-config USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-apxs=${APXS} +CONFIGURE_ARGS+= --with-apxs=${APXS:Q} .include "../../textproc/libxslt/buildlink3.mk" .include "../../www/apache2/buildlink3.mk" diff --git a/www/apache/Makefile b/www/apache/Makefile index 4629bad59b4..244c5a6757a 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.174 2005/12/05 20:51:10 rillig Exp $ +# $NetBSD: Makefile,v 1.175 2005/12/05 23:55:22 rillig Exp $ # # This pkg does not compile in mod_ssl, only the `mod_ssl EAPI' (a set of # code hooks that allow mod_ssl to be compiled separately later, if desired). @@ -41,7 +41,7 @@ CONFIGURE_ARGS+= --enable-module=most \ CONFIGURE_ARGS+= --enable-rule=EAPI \ --disable-module=ssl CONFIGURE_ARGS+= --without-confadjust -CONFIGURE_ARGS+= --with-perl=${PERL5} +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ENV+= OPTIM=${APACHE_CUSTOM_CFLAGS:Q} CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}" @@ -60,8 +60,8 @@ APACHE_USER?= www APACHE_GROUP?= www BUILD_DEFS+= APACHE_USER APACHE_GROUP -CONFIGURE_ARGS+= --server-uid=${APACHE_USER} -CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP} +CONFIGURE_ARGS+= --server-uid=${APACHE_USER:Q} +CONFIGURE_ARGS+= --server-gid=${APACHE_GROUP:Q} PKG_OPTIONS_VAR= PKG_OPTIONS.apache PKG_SUPPORTED_OPTIONS= perf-tuning suexec diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk index 9c320a7328f..36f173106ef 100644 --- a/www/apache/buildlink3.mk +++ b/www/apache/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.10 2005/07/16 01:19:25 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.11 2005/12/05 23:55:22 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -24,7 +24,7 @@ USE_TOOLS+= perl # for "apxs" APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs .if defined(GNU_CONFIGURE) -CONFIGURE_ARGS+= --with-apxs="${APXS}" +CONFIGURE_ARGS+= --with-apxs=${APXS:Q} .endif # required because httpd/os.h includes <dlfcn.h> when it is found by diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 4936d820a2a..e21b6823d26 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.87 2005/12/05 20:51:11 rillig Exp $ +# $NetBSD: Makefile,v 1.88 2005/12/05 23:55:22 rillig Exp $ .include "Makefile.common" @@ -18,8 +18,8 @@ USE_LIBTOOL= yes USE_PKGINSTALL= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-layout=NetBSD -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-port=80 CONFIGURE_ARGS+= --enable-so CONFIGURE_ENV+= perlbin=${PERL5:Q} @@ -41,7 +41,7 @@ BUILDLINK_DEPENDS.apr+= apr>=0.9.7.2.0.55 # worker hybrid multi-threaded multi-process web server # APACHE_MPM?= prefork -CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM} +CONFIGURE_ARGS+= --with-mpm=${APACHE_MPM:Q} BUILD_DEFS+= APACHE_MPM .for _mpm_ in prefork worker PLIST_SUBST.${_mpm_}?= MPM_COMMENT.${_mpm_}="@comment " @@ -62,7 +62,7 @@ DFLT_APACHE_MODULES+= ldap auth_ldap # apache httpd executable. # APACHE_MODULES?= ${DFLT_APACHE_MODULES} -CONFIGURE_ARGS+= --enable-modules="${APACHE_MODULES}" +CONFIGURE_ARGS+= --enable-modules=${APACHE_MODULES:Q} BUILD_DEFS+= APACHE_MODULES APACHE_USER?= www diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index edde6432605..b19ee10d14b 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.13 2005/12/05 20:51:11 rillig Exp $ +# $NetBSD: buildlink3.mk,v 1.14 2005/12/05 23:55:22 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -27,7 +27,7 @@ APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs .if !empty(APACHE_BUILDLINK3_MK:M+) . if defined(GNU_CONFIGURE) -CONFIGURE_ARGS+= --with-apxs2="${APXS}" +CONFIGURE_ARGS+= --with-apxs2=${APXS:Q} . endif .endif # APACHE_BUILDLINK3_MK diff --git a/www/bkedit/Makefile b/www/bkedit/Makefile index d68c69deec3..ac6255820e7 100644 --- a/www/bkedit/Makefile +++ b/www/bkedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:11 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:22 rillig Exp $ # DISTNAME= bk_edit-0.6.23 @@ -14,7 +14,7 @@ COMMENT= Bookmark manager and editor USE_TOOLS+= bison HAS_CONFIGURE= yes -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} MAKE_ENV+= PKG_CFLAGS=${CFLAGS:M*:Q} MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:M*:Q} diff --git a/www/dillo/Makefile b/www/dillo/Makefile index 200b1838685..7dd1fdde737 100644 --- a/www/dillo/Makefile +++ b/www/dillo/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.31 2005/10/23 23:18:49 rillig Exp $ +# $NetBSD: Makefile,v 1.32 2005/12/05 23:55:22 rillig Exp $ DISTNAME= dillo-0.8.5 CATEGORIES= www @@ -12,7 +12,7 @@ COMMENT= Very small and fast graphical web-browser USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} EGDIR= ${PREFIX}/share/examples/dillo CONF_FILES= ${EGDIR}/dillorc.default ${PKG_SYSCONFDIR}/dillorc diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index 31849d39fc0..4594a16ddb6 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 23:55:22 rillig Exp $ DISTNAME= emacs-w3m-1.3.3 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -27,7 +27,7 @@ BUILD_DEPENDS+= ${EMACS_PKGNAME_PREFIX}Mule-UCS>=0.84:../../editors/mule-ucs .endif HAS_CONFIGURE= yes -CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN} +CONFIGURE_ARGS+=--with-emacs=${EMACS_BIN:Q} BUILD_TARGET= default .if ${EMACS_FLAVOR} == "xemacs" INSTALL_TARGET= install-package diff --git a/www/firefox/Makefile-firefox.common b/www/firefox/Makefile-firefox.common index be7ad7b1aa3..3476c60a2b4 100644 --- a/www/firefox/Makefile-firefox.common +++ b/www/firefox/Makefile-firefox.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile-firefox.common,v 1.22 2005/09/22 14:14:04 jlam Exp $ +# $NetBSD: Makefile-firefox.common,v 1.23 2005/12/05 23:55:22 rillig Exp $ MOZILLA_BIN= firefox-bin MOZ_VER= 1.0.7 @@ -26,7 +26,7 @@ CONFIGURE_ARGS+= --enable-single-profile CONFIGURE_ARGS+= --without-gssapi MOZILLA_EXTENSIONS= cookie,gnomevfs,inspector,negotiateauth,pref,transformiix,universalchardet,webservices,xml-rpc,xmlextras -CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS} +CONFIGURE_ARGS+= --enable-extensions=${MOZILLA_EXTENSIONS:Q} USE_LANGUAGES+= c++ BUILD_MATHML= # defined diff --git a/www/galeon12/Makefile b/www/galeon12/Makefile index d203c136d7e..4da79304217 100644 --- a/www/galeon12/Makefile +++ b/www/galeon12/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.10 2005/05/22 20:08:45 jlam Exp $ +# $NetBSD: Makefile,v 1.11 2005/12/05 23:55:22 rillig Exp $ DISTNAME= galeon-1.2.14 PKGREVISION= 4 @@ -24,7 +24,7 @@ USE_TOOLS+= gmake GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-mozilla-includes=${BUILDLINK_PREFIX.mozilla}/include/mozilla \ --with-mozilla-libs=${BUILDLINK_PREFIX.mozilla}/lib/mozilla \ - --with-libiconv=${LOCALBASE} \ + --with-libiconv=${LOCALBASE:Q} \ --disable-applet \ --disable-werror \ --sysconfdir=${PREFIX}/etc \ diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 780fd18dc97..731dbd37f27 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:12 rillig Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 23:55:22 rillig Exp $ DISTNAME= htdig-3.1.6 PKGREVISION= 3 @@ -23,8 +23,8 @@ USE_LANGUAGES= c c++ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ --with-common-dir=${PREFIX}/share/htdig/common \ - --with-config-dir=${PKG_SYSCONFDIR} \ - --with-database-dir=${DBDIR} \ + --with-config-dir=${PKG_SYSCONFDIR:Q} \ + --with-database-dir=${DBDIR:Q} \ --with-image-dir=${PREFIX}/share/examples/htdig \ --with-search-dir=${PREFIX}/share/examples/htdig CONFIGURE_ENV+= PDF_PARSER="${LOCALBASE}/bin/acroread" diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index a50d3c0a443..eaa95497de4 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:13 rillig Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:22 rillig Exp $ # DISTNAME= kazehakase-0.3.0 @@ -22,7 +22,7 @@ USE_PKGLOCALEDIR= yes LIBTOOL_OVERRIDE= libtool CONFIGURE_ARGS+= --disable-ssl -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_OPTIONS_VAR= PKG_OPTIONS.kazehakase .include "../../www/mozilla/gecko-options.mk" diff --git a/www/libwww/Makefile b/www/libwww/Makefile index 933b84a47b2..f3b50e4f9f6 100644 --- a/www/libwww/Makefile +++ b/www/libwww/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.63 2005/12/02 17:05:04 wiz Exp $ +# $NetBSD: Makefile,v 1.64 2005/12/05 23:55:23 rillig Exp $ DISTNAME= w3c-libwww-5.4.0 PKGNAME= libwww-5.4.0 @@ -23,7 +23,7 @@ USE_LIBTOOL= YES GNU_CONFIGURE= YES CONFIGURE_ARGS+= --with-zlib --with-regex --without-x -CONFIGURE_ARGS+= --with-ssl="${SSLBASE}" +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} # Avoid an ICE in gcc2 on sparc64 CONFIGURE_ENV+= F77=${FALSE:Q} @@ -49,7 +49,7 @@ CONFIGURE_ARGS+= --without-md5 PLIST_SUBST+= MD5LIB="@comment " .else . if !exists(/usr/include/md5.h) -CONFIGURE_ARGS+= --with-md5="${SSLBASE}" +CONFIGURE_ARGS+= --with-md5=${SSLBASE:Q} . endif PLIST_SUBST+= MD5LIB="" .endif diff --git a/www/lighttpd/options.mk b/www/lighttpd/options.mk index 69feaaed9a8..66f4011b0dc 100644 --- a/www/lighttpd/options.mk +++ b/www/lighttpd/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.2 2005/10/11 15:44:00 joerg Exp $ +# $NetBSD: options.mk,v 1.3 2005/12/05 23:55:23 rillig Exp $ PKG_OPTIONS_VAR = PKG_OPTIONS.lighttpd PKG_SUPPORTED_OPTIONS= bzip fam gdbm inet6 ldap lua mysql ssl memcache @@ -70,7 +70,7 @@ CONFIGURE_ARGS+= --with-memcache .if !empty(PKG_OPTIONS:Mmysql) . include "../../mk/mysql.buildlink3.mk" MYSQL_CONFIG?= ${BUILDLINK_PREFIX.mysql-client}/bin/mysql_config -CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG} +CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG:Q} .endif ### @@ -78,5 +78,5 @@ CONFIGURE_ARGS+= --with-mysql=${MYSQL_CONFIG} ### .if !empty(PKG_OPTIONS:Mssl) . include "../../security/openssl/buildlink3.mk" -CONFIGURE_ARGS+= --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --with-openssl=${SSLBASE:Q} .endif diff --git a/www/lynx/Makefile b/www/lynx/Makefile index bda619f5805..477ebd51a9b 100644 --- a/www/lynx/Makefile +++ b/www/lynx/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.84 2005/11/12 13:59:28 adrianp Exp $ +# $NetBSD: Makefile,v 1.85 2005/12/05 23:55:23 rillig Exp $ # # NOTE: Please do not enable the lynxcgi feature unless it is lynx @@ -50,7 +50,7 @@ CONFIGURE_ARGS+= --with-ssl # Note: --enable-{default-colors,scrollbar} are simply ignored # for certain settings of --with-screen. -CONFIGURE_ARGS+= --with-screen=${SCREENTYPE} +CONFIGURE_ARGS+= --with-screen=${SCREENTYPE:Q} CONFIGURE_ARGS+= --enable-default-colors CONFIGURE_ARGS+= --enable-scrollbar diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 2deedb90c01..c15229b4e5c 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.34 2005/12/05 20:51:13 rillig Exp $ +# $NetBSD: Makefile.php,v 1.35 2005/12/05 23:55:23 rillig Exp $ .include "../../www/php4/Makefile.common" @@ -16,7 +16,7 @@ CONFIGURE_ARGS+= --without-iconv CONFIGURE_ARGS+= --disable-posix -CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-config-file-path=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-exec-dir=${PREFIX}/libexec/php4 .include "../../mk/bsd.prefs.mk" diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 824e86db46c..24b11e0394d 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:23 rillig Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -39,10 +39,10 @@ PTHREAD_AUTO_VARS= yes PTHREAD_OPTS+= require GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${EGDIR} -CONFIGURE_ARGS+= --with-user=${PRIVOXY_USER} -CONFIGURE_ARGS+= --with-group=${PRIVOXY_GROUP} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${EGDIR:Q} +CONFIGURE_ARGS+= --with-user=${PRIVOXY_USER:Q} +CONFIGURE_ARGS+= --with-group=${PRIVOXY_GROUP:Q} USER_GROUP= ${PRIVOXY_USER} ${PRIVOXY_GROUP} diff --git a/www/py-clearsilver/Makefile b/www/py-clearsilver/Makefile index 929e67cb759..cb5c944295a 100644 --- a/www/py-clearsilver/Makefile +++ b/www/py-clearsilver/Makefile @@ -1,11 +1,11 @@ -# $NetBSD: Makefile,v 1.5 2005/10/29 19:29:52 epg Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 23:55:23 rillig Exp $ PKGNAME= ${PYPKGPREFIX}-${DISTNAME} .include "../../www/clearsilver/Makefile.common" CONFIGURE_ARGS+= --enable-python -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} MAKE_FLAGS+= PYTHON_SITE=${LOCALBASE}/${PYSITELIB} diff --git a/www/ruby-clearsilver/Makefile b/www/ruby-clearsilver/Makefile index e3003ce2363..48832777faf 100644 --- a/www/ruby-clearsilver/Makefile +++ b/www/ruby-clearsilver/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/11/02 09:48:34 taca Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 23:55:23 rillig Exp $ PKGNAME= ${RUBY_PKGPREFIX}-${DISTNAME} PKGREVISION= 1 @@ -8,7 +8,7 @@ PKGREVISION= 1 USE_RUBY_DIST_SUBDIR= no RUBY_HAS_ARCHLIB= yes CONFIGURE_ARGS+= --enable-ruby -CONFIGURE_ARGS+= --with-ruby=${RUBY} +CONFIGURE_ARGS+= --with-ruby=${RUBY:Q} INSTALL_DIRS= ${WRKSRC}/ruby diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile index 54752358018..af6798070d1 100644 --- a/www/ruby-fcgi/Makefile +++ b/www/ruby-fcgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:23 rillig Exp $ DISTNAME= ruby-fcgi-${VER} PKGNAME= ${RUBY_PKGPREFIX}-fcgi-${VER} @@ -13,7 +13,7 @@ USE_RUBY_SETUP= yes RUBY_SETUP= install.rb RUBY_EXTCONF_SUBDIRS= ext/fcgi VER= 0.8.6 -CONFIGURE_ARGS+= -- --with-fcgi-dir=${PREFIX} +CONFIGURE_ARGS+= -- --with-fcgi-dir=${PREFIX:Q} DOCS= README README.signals post-install: diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 6130fef64ec..731c35ac9d6 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile,v 1.5 2005/12/05 23:55:23 rillig Exp $ DISTNAME= sarg-1.4.1 CATEGORIES= www @@ -15,7 +15,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-gcc \ --enable-bindir=${PREFIX}/sbin \ --enable-mandir=${PREFIX}/${PKGMANDIR}/man1 \ - --enable-sysconfdir=${PKG_SYSCONFDIR} + --enable-sysconfdir=${PKG_SYSCONFDIR:Q} USE_PKGINSTALL= yes diff --git a/www/snownews/Makefile b/www/snownews/Makefile index c2c28815336..43b3bfc0a89 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 23:55:23 rillig Exp $ DISTNAME= snownews-1.5.7 PKGREVISION= 2 @@ -20,7 +20,7 @@ USE_TOOLS+= perl:run REPLACE_PERL+= configure opml2snow snowsync -CONFIGURE_ARGS+= --prefix=${PREFIX} +CONFIGURE_ARGS+= --prefix=${PREFIX:Q} MAKE_ENV+= PKG_LOCALEDIR=${PKGLOCALEDIR:Q} MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:M*:Q} diff --git a/www/squid/Makefile b/www/squid/Makefile index b903725ecc6..b9b61989dff 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.165 2005/12/05 14:06:03 taca Exp $ +# $NetBSD: Makefile,v 1.166 2005/12/05 23:55:23 rillig Exp $ DISTNAME= squid-2.5.STABLE12 PKGNAME= squid-2.5.12 @@ -32,8 +32,8 @@ PKG_SYSCONFSUBDIR?= squid USE_PKGINSTALL= yes USE_TOOLS+= perl GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} \ - --localstatedir=${DATADIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} \ + --localstatedir=${DATADIR:Q} MAKE_ENV+= INSTALL_SCRIPT=${INSTALL_SCRIPT:Q} MAKE_ENV+= PKG_PREFIX=${PREFIX:Q} VARBASE=${VARBASE:Q} diff --git a/www/squid/options.mk b/www/squid/options.mk index b3f88e19ab5..b5afb2442a2 100644 --- a/www/squid/options.mk +++ b/www/squid/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.5 2005/12/05 14:06:03 taca Exp $ +# $NetBSD: options.mk,v 1.6 2005/12/05 23:55:23 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.squid PKG_SUPPORTED_OPTIONS= carp icmp pam-helper snmp ssl aufs unlinkd @@ -84,7 +84,7 @@ CONFIGURE_ARGS+= --enable-snmp .endif .if !empty(PKG_OPTIONS:Mssl) -CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE} +CONFIGURE_ARGS+= --enable-ssl --with-openssl=${SSLBASE:Q} .include "../../security/openssl/buildlink3.mk" .endif diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile index 4fede6a61b2..66f76a128b7 100644 --- a/www/surfraw/Makefile +++ b/www/surfraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 23:55:23 rillig Exp $ # DISTNAME= surfraw-1.0.7 @@ -13,7 +13,7 @@ CONFLICTS+= surfaw-[0-9]* USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} # Override sysconfdir so that the installation puts the example config file # in ${EGDIR}. diff --git a/www/thy/Makefile b/www/thy/Makefile index 4e3bc8e3d71..b7975cec2be 100644 --- a/www/thy/Makefile +++ b/www/thy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 23:55:23 rillig Exp $ DISTNAME= thy-0.9.4 CATEGORIES= www @@ -36,7 +36,7 @@ CONF_FILES= ${EGDIR}/thyrc ${PKG_SYSCONFDIR}/thyrc \ RCD_SCRIPTS= thy INFO_FILES= thy.info -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} MAKE_FLAGS+= pkgconfdir=${EGDIR:Q} EGDIR= ${PREFIX}/share/examples/thy diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index 00786d548b8..86110f0689c 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.41 2005/12/05 20:51:14 rillig Exp $ +# $NetBSD: Makefile.common,v 1.42 2005/12/05 23:55:23 rillig Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -48,9 +48,9 @@ CONFIGURE_ARGS+= --enable-mouse CONFIGURE_ARGS+= --with-browser= CONFIGURE_ARGS+= --with-editor=vi CONFIGURE_ARGS+= --with-gc=${BUILDLINK_PREFIX.boehm-gc} -CONFIGURE_ARGS+= --with-mailer=${MAIL_CMD} -CONFIGURE_ARGS+= --with-ssl=${SSLBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-mailer=${MAIL_CMD:Q} +CONFIGURE_ARGS+= --with-ssl=${SSLBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} SUBST_CLASSES+= man-ja SUBST_MESSAGE.man-ja= "Fixing the path to Japanese manual pages." diff --git a/www/w3m/options.mk b/www/w3m/options.mk index 4923c8baf9f..5d50316fb99 100644 --- a/www/w3m/options.mk +++ b/www/w3m/options.mk @@ -1,4 +1,4 @@ -# $NetBSD: options.mk,v 1.4 2005/10/05 13:29:49 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2005/12/05 23:55:23 rillig Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.w3m PKG_SUPPORTED_OPTIONS= w3m-lynx-key w3m-m17n w3m-unicode @@ -54,7 +54,7 @@ _W3M_IMAGELIB= ${_imagelib:C|^w3m-image-||} . endif . endfor USE_X11= YES -CONFIGURE_ARGS+= --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB} +CONFIGURE_ARGS+= --enable-image=x11 --with-imagelib=${_W3M_IMAGELIB:Q} PLIST_SUBST+= USE_IMAGE='' . include "../../graphics/${_W3M_IMAGELIB}/buildlink3.mk" .else diff --git a/www/webalizer/Makefile b/www/webalizer/Makefile index ce8ff0bc577..7047ea72e99 100644 --- a/www/webalizer/Makefile +++ b/www/webalizer/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.35 2005/10/23 19:50:55 heinz Exp $ +# $NetBSD: Makefile,v 1.36 2005/12/05 23:55:23 rillig Exp $ # DISTNAME= webalizer-2.01-10-src @@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/${DISTNAME:S/-src//} USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-etcdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --enable-dns CONFIGURE_ENV+= ac_cv_GDLIB=${BUILDLINK_PREFIX.gd}/include diff --git a/www/wml/Makefile b/www/wml/Makefile index 54a0b86e08a..6b4a5134ab3 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:15 rillig Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 23:55:23 rillig Exp $ # DISTNAME= wml-2.0.9 @@ -19,7 +19,7 @@ DEPENDS+= p5-Term-ReadKey>=2.11:../../devel/p5-Term-ReadKey USE_TOOLS+= automake GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-perl=${PERL5} \ +CONFIGURE_ARGS+= --with-perl=${PERL5:Q} \ --with-openworld \ --with-tidy=${LOCALBASE}/bin/tidy diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index cbec59172e0..c10c13f02d8 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/12/05 20:51:15 rillig Exp $ +# $NetBSD: Makefile,v 1.59 2005/12/05 23:55:23 rillig Exp $ DISTNAME= wwwoffle-2.8e PKGREVISION= 1 @@ -15,7 +15,7 @@ USE_TOOLS+= gmake gzip USE_PKGINSTALL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle PKG_SYSCONFSUBDIR= wwwoffle diff --git a/x11/blt/Makefile b/x11/blt/Makefile index 3a7775436e7..fcb77165399 100644 --- a/x11/blt/Makefile +++ b/x11/blt/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:15 rillig Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 23:55:23 rillig Exp $ # DISTNAME= BLT2.4z @@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES= overwrite pkgviews WRKSRC= ${WRKDIR}/blt2.4z GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --exec-prefix=${PREFIX} +CONFIGURE_ARGS+= --exec-prefix=${PREFIX:Q} CONFIGURE_ARGS+= --with-tcl=${BUILDLINK_PREFIX.tcl}/lib CONFIGURE_ARGS+= --with-tk=${BUILDLINK_PREFIX.tk}/lib CONFIGURE_ENV+= X11BASE=${X11BASE:Q} diff --git a/x11/control-center/Makefile b/x11/control-center/Makefile index 4df7777ebe1..5955bdd6062 100644 --- a/x11/control-center/Makefile +++ b/x11/control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/06/24 21:26:24 wiz Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 23:55:23 rillig Exp $ DISTNAME= control-center-1.4.0.5 CATEGORIES= x11 gnome @@ -20,7 +20,7 @@ USE_LIBTOOL= YES LOCALSTATEDIR= ${PREFIX}/var GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} +CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR:Q} .include "../../mk/bsd.prefs.mk" diff --git a/x11/eterm/Makefile b/x11/eterm/Makefile index 515934b94f2..f846df89b9b 100644 --- a/x11/eterm/Makefile +++ b/x11/eterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.42 2005/06/01 19:44:07 wiz Exp $ +# $NetBSD: Makefile,v 1.43 2005/12/05 23:55:23 rillig Exp $ DISTNAME= Eterm-0.9.3 PKGNAME= ${DISTNAME:S/^E/e/} @@ -23,7 +23,7 @@ PIXMAP_FILES= Eterm-bg-scale-1.tar.gz Eterm-bg-scale-2.tar.gz \ USE_LIBTOOL= YES USE_PKGINSTALL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= Eterm OWN_DIRS= ${PKG_SYSCONFDIR}/themes diff --git a/x11/fltk/Makefile b/x11/fltk/Makefile index d4ba0bfc3a4..1d6a72c8f38 100644 --- a/x11/fltk/Makefile +++ b/x11/fltk/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/08/24 19:48:18 kristerw Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 23:55:24 rillig Exp $ DISTNAME= fltk-1.1.6-source PKGNAME= ${DISTNAME:S/-source//} @@ -25,7 +25,7 @@ TEST_TARGET= test PTHREAD_OPTS+= require GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL} +CONFIGURE_ARGS+= --enable-libtool=${LIBTOOL:Q} CONFIGURE_ARGS+= --with-links .include "../../graphics/MesaLib/buildlink3.mk" diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile index 89c8f1b9464..55886d712dd 100644 --- a/x11/gdm/Makefile +++ b/x11/gdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:15 rillig Exp $ +# $NetBSD: Makefile,v 1.94 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= gdm-2.8.0.5 @@ -32,8 +32,8 @@ PKG_OPTIONS_VAR= PKG_OPTIONS.gdm PKG_SUPPORTED_OPTIONS= inet6 pam .include "../../mk/bsd.options.mk" -CONFIGURE_ARGS+= --localstatedir=${VARBASE} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --localstatedir=${VARBASE:Q} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ENV+= PREFIX=${PREFIX:Q} CONFIGURE_ENV+= X11BASE=${X11BASE:Q} MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} diff --git a/x11/gnome-libs/Makefile b/x11/gnome-libs/Makefile index 1b7aee48384..13f254b61e6 100644 --- a/x11/gnome-libs/Makefile +++ b/x11/gnome-libs/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.111 2005/12/05 20:51:16 rillig Exp $ +# $NetBSD: Makefile,v 1.112 2005/12/05 23:55:24 rillig Exp $ DISTNAME= gnome-libs-1.4.2 PKGREVISION= 4 @@ -18,7 +18,7 @@ USE_TOOLS+= gmake USE_LIBTOOL= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR} \ +CONFIGURE_ARGS+= --localstatedir=${LOCALSTATEDIR:Q} \ --enable-gtk-doc=no \ --with-html-dir=${PREFIX}/share/doc/html \ --with-kde-datadir=${X11PREFIX}/share/kde diff --git a/x11/gnome2-applets/Makefile b/x11/gnome2-applets/Makefile index f8eb0bc5926..0c0c89d28a3 100644 --- a/x11/gnome2-applets/Makefile +++ b/x11/gnome2-applets/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.48 2005/10/23 17:26:14 minskim Exp $ +# $NetBSD: Makefile,v 1.49 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= gnome-applets-2.12.0 @@ -25,7 +25,7 @@ PKG_SUPPORTED_OPTIONS= inet6 .include "../../mk/bsd.options.mk" CONFIGURE_ARGS+= --with-html-dir=${PREFIX}/share/doc -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKGCONFIG_OVERRIDE+= libgswitchit/gswitchit.pc.in diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile index 26b180b8765..8a84570fa5c 100644 --- a/x11/gnome2-control-center/Makefile +++ b/x11/gnome2-control-center/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/11/25 21:23:15 wiz Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= control-center-2.12.1 @@ -23,7 +23,7 @@ USE_TOOLS+= gmake pkg-config USE_LIBTOOL= yes CONFIGURE_ARGS+= --disable-alsa -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} INSTALL_MAKE_FLAGS+= vfsmoduleconfdir=${PREFIX}/share/examples/${PKGBASE} diff --git a/x11/gnopernicus/Makefile b/x11/gnopernicus/Makefile index fc61851535f..17238e9c368 100644 --- a/x11/gnopernicus/Makefile +++ b/x11/gnopernicus/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.32 2005/10/16 12:12:01 jmmv Exp $ +# $NetBSD: Makefile,v 1.33 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= gnopernicus-0.11.7 @@ -17,7 +17,7 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR:Q} PKG_SYSCONFSUBDIR= gnopernicus OWN_DIRS+= ${PKG_SYSCONFDIR}/translation_tables EGDIR= ${PREFIX}/share/examples/gnopernicus diff --git a/x11/mlterm/Makefile b/x11/mlterm/Makefile index ce7a466f94b..fb9a608424c 100644 --- a/x11/mlterm/Makefile +++ b/x11/mlterm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.37 2005/08/10 20:56:29 jlam Exp $ +# $NetBSD: Makefile,v 1.38 2005/12/05 23:55:24 rillig Exp $ DISTNAME= mlterm-2.9.2 PKGREVISION= 1 @@ -31,7 +31,7 @@ CONFIGURE_ARGS+= --with-imagelib=gdk-pixbuf CONFIGURE_ARGS+= --with-type-engines=xft CONFIGURE_ARGS+= --without-libiconv-prefix CONFIGURE_ARGS+= --without-libintl-prefix -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} SUBST_CLASSES+= link SUBST_MESSAGE.link= "Fixing hardcoded paths and link options." diff --git a/x11/py-qt2-sip/Makefile b/x11/py-qt2-sip/Makefile index 8a82af34e1a..f391f3f0086 100644 --- a/x11/py-qt2-sip/Makefile +++ b/x11/py-qt2-sip/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:18 rillig Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= sip-3.1 @@ -14,8 +14,8 @@ COMMENT= Tool to create Python bindings for C++ libraries USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} \ - --with-qt-dir=${QTDIR} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} \ + --with-qt-dir=${QTDIR:Q} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} diff --git a/x11/py-qt2/Makefile b/x11/py-qt2/Makefile index 04677b05163..027528a464d 100644 --- a/x11/py-qt2/Makefile +++ b/x11/py-qt2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:18 rillig Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= PyQt-3.1-Qt-2.3.1 @@ -15,8 +15,8 @@ WRKSRC= ${WRKDIR}/PyQt-3.1 USE_LIBTOOL= yes GNU_CONFIGURE= yes -CONFIGURE_ARGS+= --with-python=${PYTHONBIN} \ - --with-qt-dir=${QTDIR} +CONFIGURE_ARGS+= --with-python=${PYTHONBIN:Q} \ + --with-qt-dir=${QTDIR:Q} PY_PATCHPLIST= yes PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} diff --git a/x11/ruby-tcltklib/Makefile b/x11/ruby-tcltklib/Makefile index dd1805a1d98..69cbbf8b527 100644 --- a/x11/ruby-tcltklib/Makefile +++ b/x11/ruby-tcltklib/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/03 07:22:46 taca Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:24 rillig Exp $ DISTNAME= ${RUBY_DISTNAME} PKGNAME= ${RUBY_PKGPREFIX}-tcltklib-${RUBY_VERSION} @@ -14,12 +14,12 @@ USE_RUBY_EXTCONF= yes EXTRACT_ELEMENTS= ${RUBY_DISTNAME}/ext/tcltklib WRKSRC= ${RUBY_WRKSRC}/ext/tcltklib -CONFIGURE_ARGS+= --with-tcllib="${TCL_LIB}" --with-tklib="${TK_LIB}" \ +CONFIGURE_ARGS+= --with-tcllib=${TCL_LIB:Q} --with-tklib=${TK_LIB:Q} \ --with-tcl-lib="${BUILDLINK_PREFIX.tcl}/lib/${TCL_DIR}" \ --with-tk-lib="${BUILDLINK_PREFIX.tk}/lib/${TK_DIR}" \ --with-tcl-include="${BUILDLINK_PREFIX.tcl}/include/${TCL_DIR}" \ --with-tk-include="${BUILDLINK_PREFIX.tk}/include/${TK_DIR}" \ - --with-X11-dir="${X11BASE}" + --with-X11-dir=${X11BASE:Q} REPLACE_RUBY= demo/lines1.rb demo/lines2.rb demo/safeTk.rb post-install: diff --git a/x11/wdm/Makefile b/x11/wdm/Makefile index 9190fe161d3..c20f3ee6c43 100644 --- a/x11/wdm/Makefile +++ b/x11/wdm/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:19 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 23:55:24 rillig Exp $ DISTNAME= wdm-1.25 PKGREVISION= 6 @@ -17,7 +17,7 @@ USE_X11BASE= YES USE_PKGLOCALEDIR= YES GNU_CONFIGURE= YES -CONFIGURE_ARGS+= --with-wdmdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-wdmdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-nlsdir=${PREFIX}/${PKGLOCALEDIR}/locale CONFIGURE_ARGS+= --with-gfx-incs=${BUILDLINK_DIR}/include/WINGs CONFIGURE_ARGS+= --with-gfx-libs=${BUILDLINK_DIR}/lib @@ -50,7 +50,7 @@ CONF_FILES+= ${PREFIX}/share/examples/wdm/${f} ${PKG_SYSCONFDIR}/${f} # different from WindowMaker. WDM_MANAGERS is a space-separated # list of window managers to support. .for WMANAGER in ${WDM_MANAGERS} -CONFIGURE_ARGS+= --with-winmgr=${WMANAGER} +CONFIGURE_ARGS+= --with-winmgr=${WMANAGER:Q} .endfor pre-install: diff --git a/x11/wmweather/Makefile b/x11/wmweather/Makefile index 58b4c6576d3..e60c5be795f 100644 --- a/x11/wmweather/Makefile +++ b/x11/wmweather/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/12/03 21:04:32 joerg Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 23:55:24 rillig Exp $ # DISTNAME= wmweather-2.4.2 @@ -16,7 +16,7 @@ GNU_CONFIGURE= yes USE_TOOLS+= gmake xmessage:run USE_PKGINSTALL= yes -CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR} +CONFIGURE_ARGS+= --with-sysconfdir=${PKG_SYSCONFDIR:Q} CONFIGURE_ARGS+= --with-xmessage=${TOOLS_PATH.xmessage} EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/x11/xfce4-desktop/Makefile b/x11/xfce4-desktop/Makefile index aa700e7fc9e..2662191c99a 100644 --- a/x11/xfce4-desktop/Makefile +++ b/x11/xfce4-desktop/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.15 2005/11/09 07:09:05 martti Exp $ +# $NetBSD: Makefile,v 1.16 2005/12/05 23:55:24 rillig Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -24,7 +24,7 @@ CONF_FILES+= ${EGDIR}/xfce-registered-categories.xml.${_l} \ ${PKG_SYSCONFDIR}/xfce-registered-categories.xml.${_l} .endfor -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} diff --git a/x11/xfce4-panel/Makefile b/x11/xfce4-panel/Makefile index d0f1cca1086..3391a38985c 100644 --- a/x11/xfce4-panel/Makefile +++ b/x11/xfce4-panel/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/11/09 07:09:05 martti Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 23:55:24 rillig Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -21,7 +21,7 @@ CONF_FILES+= ${EGDIR}/contents.xml.${_l} \ ${PKG_SYSCONFDIR}/contents.xml.${_l} .endfor -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} diff --git a/x11/xfce4-session/Makefile b/x11/xfce4-session/Makefile index fb2be89ea68..1f9e779a4d2 100644 --- a/x11/xfce4-session/Makefile +++ b/x11/xfce4-session/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/12/02 14:49:24 joerg Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 23:55:24 rillig Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -14,7 +14,7 @@ EGDIR= ${XFCE4_EGBASE}/session CONF_FILES= ${EGDIR}/xfce4-session.rc \ ${PKG_SYSCONFDIR}/xfce4-session.rc -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} ICEAUTH=${TOOLS_PATH.iceauth} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} ICEAUTH=${TOOLS_PATH.iceauth} REQD_DIRS+= ${XFCE4_EGBASE} ${EGDIR} diff --git a/x11/xfce4-utils/Makefile b/x11/xfce4-utils/Makefile index 2c6cedad9c3..f747e775a32 100644 --- a/x11/xfce4-utils/Makefile +++ b/x11/xfce4-utils/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/11/09 07:09:05 martti Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 23:55:24 rillig Exp $ .include "../../meta-pkgs/xfce4/Makefile.common" @@ -16,7 +16,7 @@ CONF_FILES= ${EGDIR}/xinitrc ${PKG_SYSCONFDIR}/xinitrc REQD_DIRS+= ${EGDIR} -CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} +CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE:Q} .include "options.mk" diff --git a/x11/xlockmore/Makefile.common b/x11/xlockmore/Makefile.common index 5c4eb581cc0..be9fb66faee 100644 --- a/x11/xlockmore/Makefile.common +++ b/x11/xlockmore/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.37 2005/12/01 19:17:54 wiz Exp $ +# $NetBSD: Makefile.common,v 1.38 2005/12/05 23:55:24 rillig Exp $ # # This Makefile.common is included by: # @@ -66,7 +66,7 @@ XLOCK_AUDIOPLAY?= ${BUILDLINK_PREFIX.oss}/bin/ossplay . else XLOCK_AUDIOPLAY?= /usr/bin/audioplay . endif -CONFIGURE_ARGS+= --enable-def-play="${XLOCK_AUDIOPLAY}" +CONFIGURE_ARGS+= --enable-def-play=${XLOCK_AUDIOPLAY:Q} .endif .if empty(PKG_OPTIONS:Mxlockmore-dpms) |