diff options
Diffstat (limited to 'www')
39 files changed, 94 insertions, 94 deletions
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 |