diff options
| author | rillig <rillig> | 2005-12-05 23:55:01 +0000 |
|---|---|---|
| committer | rillig <rillig> | 2005-12-05 23:55:01 +0000 |
| commit | 7bea46e87d51bbe44f7a5b37970a31b1efd118a0 (patch) | |
| tree | 1390f4897127f87b9dc78eb04234494436dbf1a4 /net | |
| parent | 5a69276df89a294f862a5e2d84034200f2c262a4 (diff) | |
| download | pkgsrc-7bea46e87d51bbe44f7a5b37970a31b1efd118a0.tar.gz | |
Ran "pkglint --autofix", which corrected some of the quoting issues in
CONFIGURE_ARGS.
Diffstat (limited to 'net')
56 files changed, 140 insertions, 140 deletions
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 |