diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-05 20:49:47 +0000 |
| commit | b71a1d488b6b45e0a968a4c149990c25b6a09215 (patch) | |
| tree | dac5b1dd14794d86b061d26b9503adb2552ed3f8 /www | |
| parent | 624eed58928f83676fbd7ca01a5f6974bb2cce2a (diff) | |
| download | pkgsrc-b71a1d488b6b45e0a968a4c149990c25b6a09215.tar.gz | |
Fixed pkglint warnings. The warnings are mostly quoting issues, for
example MAKE_ENV+=FOO=${BAR} is changed to MAKE_ENV+=FOO=${BAR:Q}. Some
other changes are outlined in
http://mail-index.netbsd.org/tech-pkg/2005/12/02/0034.html
Diffstat (limited to 'www')
87 files changed, 230 insertions, 240 deletions
diff --git a/www/album_themes/Makefile b/www/album_themes/Makefile index 3fc7f8149fd..73d38268315 100644 --- a/www/album_themes/Makefile +++ b/www/album_themes/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2005/08/24 14:31:15 augustss Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:10 rillig Exp $ # DISTNAME= album_themes @@ -14,7 +14,7 @@ DEPENDS+= album-[0-9]*:../../www/album NO_CONFIGURE= YES NO_BUILD= YES -EXTRACT_ONLY= # defined +EXTRACT_ONLY= # none USE_TOOLS+= tar diff --git a/www/analog/Makefile b/www/analog/Makefile index ac41b2c1658..e6abf5a0648 100644 --- a/www/analog/Makefile +++ b/www/analog/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.50 2005/08/25 10:09:48 grant Exp $ +# $NetBSD: Makefile,v 1.51 2005/12/05 20:51:10 rillig Exp $ DISTNAME= analog-6.0 CATEGORIES= www @@ -13,7 +13,7 @@ COMMENT= Extremely fast program for analysing WWW logfiles WRKSRC= ${WRKDISTDIR}/src BUILD_TARGET= analog -MAKE_ENV+= PREFIX=${PREFIX} SYSCONFDIR=${PKG_SYSCONFDIR} +MAKE_ENV+= PREFIX=${PREFIX:Q} SYSCONFDIR=${PKG_SYSCONFDIR:Q} WRKDISTDIR= ${WRKDIR}/${DISTNAME} USE_PKGINSTALL= yes @@ -28,7 +28,7 @@ INSTALLATION_DIRS= bin man/man1 LIBS+= -lm LIBS.SunOS+= -lnsl -lsocket -MAKE_ENV+= LIBS=${LIBS:Q} +MAKE_ENV+= LIBS=${LIBS:M*:Q} do-install: ${INSTALL_PROGRAM} ${WRKDISTDIR}/analog ${PREFIX}/bin diff --git a/www/ap-auth-cookie/Makefile b/www/ap-auth-cookie/Makefile index e462b3b0dd0..7f0e74f9c23 100644 --- a/www/ap-auth-cookie/Makefile +++ b/www/ap-auth-cookie/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2005/05/15 21:54:50 jlam Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 20:51:10 rillig Exp $ # # There are a few more mod_auth_cookie's out there doing slightly # different things. This one pkg would be a good place to dump them all in @@ -20,7 +20,7 @@ EXTRACT_CMD= ${DO_NADA} APACHE_MODULE_NAME= mod_auth_cookie.so -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} post-extract: @(${ECHO} '#include "ap_compat.h"'; ${GZCAT} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILES}) \ diff --git a/www/ap-bandwidth/Makefile b/www/ap-bandwidth/Makefile index 616a15307a9..044477a44b7 100644 --- a/www/ap-bandwidth/Makefile +++ b/www/ap-bandwidth/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:47:50 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:10 rillig Exp $ # DISTNAME= mod_bandwidth.c @@ -15,7 +15,7 @@ WRKSRC= ${WRKDIR} APACHE_MODULE_NAME= mod_bandwidth.so -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} do-extract: @${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC} diff --git a/www/ap-dav/Makefile b/www/ap-dav/Makefile index 53c7e30d38e..e28bb9c98e0 100644 --- a/www/ap-dav/Makefile +++ b/www/ap-dav/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.14 2005/06/17 03:50:39 jlam Exp $ +# $NetBSD: Makefile,v 1.15 2005/12/05 20:51:10 rillig Exp $ DISTNAME= mod_dav-1.0.3-1.3.6 PKGNAME= ap-dav-1.0.3 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.webdav.org/mod_dav/ COMMENT= Apache WebDAV module # Ugly mess that says apache>=1.3.9 and apache<2.0. -BUILDLINK_DEPENDS.apache= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} +BUILDLINK_DEPENDS.apache+= {apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*} APACHE_MODULE= YES GNU_CONFIGURE= YES diff --git a/www/ap-dtcl/Makefile b/www/ap-dtcl/Makefile index f49acc82cc1..5dbe5f8a492 100644 --- a/www/ap-dtcl/Makefile +++ b/www/ap-dtcl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/06/17 03:50:39 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:10 rillig Exp $ DISTNAME= mod_dtcl-0.11.6 PKGNAME= ap-dtcl-0.11.2 @@ -15,8 +15,8 @@ WRKSRC= ${WRKDIR}/mod_dtcl TCLSH= ${BUILDLINK_PREFIX.tcl}/bin/tclsh CPPFLAGS+= -I${BUILDLINK_PREFIX.apache}/include/httpd -DEAPI -MAKE_ENV+= TCLSH="${TCLSH}" -MAKE_ENV+= INCLUDES="${CPPFLAGS}" +MAKE_ENV+= TCLSH=${TCLSH:Q} +MAKE_ENV+= INCLUDES=${CPPFLAGS:M*:Q} APACHE_MODULE= yes APACHEMODDIR= ${PREFIX}/lib/httpd diff --git a/www/ap-fastcgi/Makefile.common b/www/ap-fastcgi/Makefile.common index fcccc86cb05..2fc222de200 100644 --- a/www/ap-fastcgi/Makefile.common +++ b/www/ap-fastcgi/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/04/11 21:47:50 tv Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:10 rillig Exp $ # DISTNAME= mod_fastcgi-2.4.2 CATEGORIES= www @@ -13,7 +13,7 @@ PATCHDIR= ${.CURDIR}/../../www/ap-fastcgi/patches PLIST_SRC= ${.CURDIR}/../../www/ap-fastcgi/PLIST MESSAGE_SRC= ${.CURDIR}/../../www/ap-fastcgi/MESSAGE -PLIST_SUBST+= APACHE_MANUAL=${APACHE_MANUAL} +PLIST_SUBST+= APACHE_MANUAL=${APACHE_MANUAL:Q} post-install: ${INSTALL_DATA} ${WRKSRC}/docs/mod_fastcgi.html \ diff --git a/www/ap-iasp/Makefile b/www/ap-iasp/Makefile index 5cbdb387070..326622aa41f 100644 --- a/www/ap-iasp/Makefile +++ b/www/ap-iasp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.7 2005/07/15 18:27:54 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:10 rillig Exp $ -.include "../iasp/Makefile.common" +.include "../../www/iasp/Makefile.common" PKGNAME= ap-iasp-${IASP_VERSION} COMMENT= Apache connector for accessing a iASP proxy server diff --git a/www/ap-python/Makefile b/www/ap-python/Makefile index f4cf1fa9e46..ae1235c2a57 100644 --- a/www/ap-python/Makefile +++ b/www/ap-python/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.13 2005/04/11 21:47:50 tv Exp $ +# $NetBSD: Makefile,v 1.14 2005/12/05 20:51:10 rillig Exp $ # DISTNAME= mod_python-2.7.10 @@ -14,8 +14,8 @@ COMMENT= Python interpreter embedded into Apache PLIST_SRC= ${WRKDIR}/.PLIST_SRC GNU_CONFIGURE= yes -CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN} -MAKE_ENV+= PYTHONBIN=${PYTHONBIN} +CONFIGURE_ENV+= PYTHON_BIN=${PYTHONBIN:Q} +MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} PYTHON_VERSIONS_ACCEPTED= 23 22 21 20 post-install: diff --git a/www/ap-ruby/Makefile b/www/ap-ruby/Makefile index a82db256d34..336b2e3edf7 100644 --- a/www/ap-ruby/Makefile +++ b/www/ap-ruby/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/04/11 21:47:51 tv Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:10 rillig Exp $ # DISTNAME= mod_ruby-${VERSION} @@ -20,7 +20,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} MESSAGE_SUBST+= RUBY_DOCDIR=${RUBY_DOCDIR} DOCS= ChangeLog NOTICE README.en README.ja REPLACE_RUBY+= install-rb diff --git a/www/ap-ssl/Makefile b/www/ap-ssl/Makefile index e0b91d43eb1..39d83f71b85 100644 --- a/www/ap-ssl/Makefile +++ b/www/ap-ssl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2005/10/19 20:33:44 bouyer Exp $ +# $NetBSD: Makefile,v 1.93 2005/12/05 20:51:10 rillig Exp $ DISTNAME= mod_ssl-2.8.25-1.3.34 PKGNAME= ap-ssl-2.8.25 @@ -13,7 +13,7 @@ COMMENT= SSL/TLS protocols module for Apache CONFLICTS= apache-1.3.[0-9] apache-*modssl-[0-9]* apache6-[0-9]* -BUILDLINK_DEPENDS.apache= apache>=1.3.33 +BUILDLINK_DEPENDS.apache+= apache>=1.3.33 USE_PKGINSTALL= yes APACHE_MODULE= yes @@ -25,7 +25,7 @@ CONFIGURE_ARGS+= --with-ssl=${SSLBASE} SSL_RPATH_LDFLAGS= ${LINKER_RPATH_FLAG} ${SSLBASE}/lib FIX_RPATH+= SSL_RPATH_LDFLAGS -MAKE_ENV+= SSL_RPATH_LDFLAGS="${SSL_RPATH_LDFLAGS}" +MAKE_ENV+= SSL_RPATH_LDFLAGS=${SSL_RPATH_LDFLAGS:Q} PKG_SYSCONFVAR= apache PKG_SYSCONFSUBDIR?= httpd diff --git a/www/ap2-auth-ldap/Makefile b/www/ap2-auth-ldap/Makefile index 634f5450047..5004353dbab 100644 --- a/www/ap2-auth-ldap/Makefile +++ b/www/ap2-auth-ldap/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/10/14 10:47:43 adrianp Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:10 rillig Exp $ DISTNAME= mod_auth_ldap3.05 PKGNAME= ap2-auth-ldap-3.05 @@ -22,7 +22,7 @@ CONFIGURE_ARGS+= --with-ldap-dir=${BUILDLINK_PREFIX.openldap} CONFIGURE_ARGS+= --with-apache-dir=${PREFIX} CONFIGURE_ARGS+= --with-apache-ver=2 -SUBST_CLASSES= paths +SUBST_CLASSES+= paths SUBST_STAGE.paths= post-patch SUBST_FILES.paths= configure SUBST_SED.paths= -e "s|@@HASHLIB@@|${PREFIX}/include|g" \ diff --git a/www/apache/Makefile b/www/apache/Makefile index c1dfc28efae..4629bad59b4 100644 --- a/www/apache/Makefile +++ b/www/apache/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.173 2005/10/19 20:30:20 bouyer Exp $ +# $NetBSD: Makefile,v 1.174 2005/12/05 20:51:10 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). @@ -43,9 +43,9 @@ CONFIGURE_ARGS+= --enable-rule=EAPI \ CONFIGURE_ARGS+= --without-confadjust CONFIGURE_ARGS+= --with-perl=${PERL5} CONFIGURE_ARGS+= --with-port=80 -CONFIGURE_ENV+= OPTIM="${APACHE_CUSTOM_CFLAGS}" +CONFIGURE_ENV+= OPTIM=${APACHE_CUSTOM_CFLAGS:Q} CONFIGURE_ENV+= EAPI_MM="${BUILDLINK_PREFIX.libmm}" -CONFIGURE_ENV+= BINOWN=${BINOWN} BINGRP=${BINGRP} +CONFIGURE_ENV+= BINOWN=${BINOWN:Q} BINGRP=${BINGRP:Q} .include "../../mk/bsd.prefs.mk" @@ -118,7 +118,7 @@ APACHE_CUSTOM_CFLAGS+= -D_FILE_OFFSET_BITS=64 .if ${OPSYS} == "NetBSD" . if ${OBJECT_FMT} == "ELF" LINK_LIBGCC_LDFLAGS= ${LINK_ALL_LIBGCC_HACK} -MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_LIBGCC_LDFLAGS}" +MAKE_ENV+= LINK_LIBGCC_LDFLAGS=${LINK_LIBGCC_LDFLAGS:Q} # # If we are using gcc3, we need to link against libgcc_s, too. This # ensures modules can resolve symbols they require from gcc. @@ -148,8 +148,8 @@ OWN_DIRS_PERMS+= ${VARBASE}/httpd/proxy ${APACHE_USER} ${APACHE_GROUP} 0755 PKG_GROUPS= ${APACHE_GROUP} PKG_USERS= ${APACHE_USER}:${APACHE_GROUP}::Apache\ user -MAKE_ENV+= CHMOD="${CHMOD}" CHOWN="${CHOWN}" XARGS="${XARGS}" -MAKE_ENV+= FIND="${FIND}" CHGRP="${CHGRP}" +MAKE_ENV+= CHMOD=${CHMOD:Q} CHOWN=${CHOWN:Q} XARGS=${XARGS:Q} +MAKE_ENV+= FIND=${FIND:Q} CHGRP=${CHGRP:Q} .include "../../devel/libmm/buildlink3.mk" .include "../../textproc/expat/buildlink3.mk" diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 91277921bf7..4936d820a2a 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.86 2005/10/23 20:14:43 jlam Exp $ +# $NetBSD: Makefile,v 1.87 2005/12/05 20:51:11 rillig Exp $ .include "Makefile.common" @@ -28,7 +28,7 @@ CONFIGURE_ENV+= perlbin=${PERL5:Q} CONFIGURE_ARGS+= --with-apr=${BUILDLINK_PREFIX.apr} CONFIGURE_ARGS+= --with-apr-util=${BUILDLINK_PREFIX.apr} -BUILDLINK_DEPENDS.apr= apr>=0.9.7.2.0.55 +BUILDLINK_DEPENDS.apr+= apr>=0.9.7.2.0.55 .include "../../mk/bsd.prefs.mk" .include "../../devel/apr/buildlink3.mk" diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk index afa994f6ee0..edde6432605 100644 --- a/www/apache2/buildlink3.mk +++ b/www/apache2/buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: buildlink3.mk,v 1.12 2005/07/16 01:19:25 jlam Exp $ +# $NetBSD: buildlink3.mk,v 1.13 2005/12/05 20:51:11 rillig Exp $ BUILDLINK_DEPTH:= ${BUILDLINK_DEPTH}+ APACHE_BUILDLINK3_MK:= ${APACHE_BUILDLINK3_MK}+ @@ -21,8 +21,8 @@ BUILDLINK_DEPMETHOD.apache+= full .endif # APACHE_BUILDLINK3_MK USE_TOOLS+= perl # for "apxs" -CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL} # make apxs use the libtool we specify -MAKE_ENV+= APR_LIBTOOL=${LIBTOOL} +CONFIGURE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} # make apxs use the libtool we specify +MAKE_ENV+= APR_LIBTOOL=${LIBTOOL:Q} APXS?= ${BUILDLINK_PREFIX.apache}/sbin/apxs .if !empty(APACHE_BUILDLINK3_MK:M+) diff --git a/www/apc-gui/Makefile b/www/apc-gui/Makefile index 6edeae77e47..b83f65c657f 100644 --- a/www/apc-gui/Makefile +++ b/www/apc-gui/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/22 14:53:41 wiz Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:11 rillig Exp $ DISTNAME= apc_gui-1.0.3 PKGNAME= ${DISTNAME:S/_/-/} @@ -21,7 +21,7 @@ USE_PKGINSTALL= YES PKG_SYSCONFSUBDIR?= httpd APC_GUI_DIR= ${PREFIX}/share/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} -PLIST_SUBST+= PKGBASE=${PKGBASE} +PLIST_SUBST+= PKGBASE=${PKGBASE:Q} MESSAGE_SUBST+= APC_GUI_DIR=${APC_GUI_DIR} CONF_FILES= ${EGDIR}/apc_gui.conf ${PKG_SYSCONFDIR}/apc_gui.conf diff --git a/www/awstats/Makefile b/www/awstats/Makefile index 120ef0d342d..0f5e3cb1168 100644 --- a/www/awstats/Makefile +++ b/www/awstats/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.21 2005/09/28 12:11:29 rillig Exp $ +# $NetBSD: Makefile,v 1.22 2005/12/05 20:51:11 rillig Exp $ # DISTNAME= awstats-6.4 @@ -11,7 +11,7 @@ MAINTAINER= minskim@NetBSD.org HOMEPAGE= http://awstats.sourceforge.net/ COMMENT= Free real-time logfile analyzer to get advanced web statistics -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV}nb2 NO_BUILD= YES USE_TOOLS+= perl:run @@ -26,7 +26,7 @@ USE_PKGINSTALL= YES OWN_DIRS_PERMS+= ${VARBASE}/awstats ${APACHE_USER} ${APACHE_GROUP} 0700 PKG_SYSCONFSUBDIR= awstats -SUBST_CLASSES= conf +SUBST_CLASSES+= conf SUBST_STAGE.conf= post-patch SUBST_FILES.conf= tools/awstats_configure.pl \ wwwroot/cgi-bin/awstats.model.conf \ diff --git a/www/bkedit/Makefile b/www/bkedit/Makefile index 24ca289ad77..d68c69deec3 100644 --- a/www/bkedit/Makefile +++ b/www/bkedit/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/08 02:25:37 tv Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:11 rillig Exp $ # DISTNAME= bk_edit-0.6.23 @@ -16,8 +16,8 @@ USE_TOOLS+= bison HAS_CONFIGURE= yes CONFIGURE_ARGS+= --prefix=${PREFIX} -MAKE_ENV+= PKG_CFLAGS=${CFLAGS:Q} -MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:Q} +MAKE_ENV+= PKG_CFLAGS=${CFLAGS:M*:Q} +MAKE_ENV+= PKG_LDFLAGS=${LDFLAGS:M*:Q} .include "../../textproc/libxml2/buildlink3.mk" .include "../../x11/gtk/buildlink3.mk" diff --git a/www/blur6ex/Makefile b/www/blur6ex/Makefile index 8d3127c1ace..2d92df5b9c8 100644 --- a/www/blur6ex/Makefile +++ b/www/blur6ex/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:52 tv Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:11 rillig Exp $ # DISTNAME= blur6ex-0.1.198 @@ -18,7 +18,7 @@ NO_BUILD= yes USE_PKGINSTALL= yes HTTPD_ROOT?= share/httpd/htdocs -PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT} +PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT:Q} BUILD_DEFS+= HTTPD_ROOT diff --git a/www/cocoon/Makefile b/www/cocoon/Makefile index bbccfb7b076..c20593472a2 100644 --- a/www/cocoon/Makefile +++ b/www/cocoon/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.25 2005/09/28 12:15:16 rillig Exp $ +# $NetBSD: Makefile,v 1.26 2005/12/05 20:51:11 rillig Exp $ DISTNAME= Cocoon-1.8.2 PKGNAME= cocoon-1.8.2 @@ -64,4 +64,4 @@ do-install: .include "../../mk/bsd.pkg.mk" CLASSPATH:=${CLASSPATH}:${LOCALBASE}/lib/java/fop.jar:${LOCALBASE}/lib/java/xalan.jar:${LOCALBASE}/lib/java/bsf.jar:${LOCALBASE}/lib/java/xerces.jar:${LOCALBASE}/lib/java/servlet.jar:${PKG_JAVA_HOME}/lib/classes.zip:${PKG_JAVA_HOME}/lib/tools.jar -MAKE_ENV+= CLASSPATH=${CLASSPATH} +MAKE_ENV+= CLASSPATH=${CLASSPATH:Q} diff --git a/www/communicator/Makefile b/www/communicator/Makefile index 1138054cdc1..9e692f02813 100644 --- a/www/communicator/Makefile +++ b/www/communicator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.34 2003/08/08 09:38:41 grant Exp $ +# $NetBSD: Makefile,v 1.35 2005/12/05 20:51:11 rillig Exp $ # COMMENT= Netscape Communicator browser, version 4 (binary pkg) @@ -6,5 +6,5 @@ COMMENT= Netscape Communicator browser, version 4 (binary pkg) BINNAME= communicator DIST_SDIR_NAME= complete_install -.include "../navigator/Makefile.common" +.include "../../www/navigator/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/www/crawl/Makefile b/www/crawl/Makefile index 36db298aa92..200bc6627f8 100644 --- a/www/crawl/Makefile +++ b/www/crawl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/09/16 14:46:43 tv Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:11 rillig Exp $ DISTNAME= crawl-0.4 PKGREVISION= 1 @@ -19,7 +19,7 @@ post-install: ${INSTALL_DATA_DIR} ${PREFIX}/share/examples/${PKGBASE} ${INSTALL_DATA} ${WRKSRC}/crawl.conf ${PREFIX}/share/examples/${PKGBASE}/crawl.conf -SUBST_CLASSES= path +SUBST_CLASSES+= path SUBST_STAGE.path= post-patch SUBST_FILES.path= cfg.h SUBST_SED.path= -e 's,crawl.conf,${PKG_SYSCONFDIR}/crawl.conf,g' diff --git a/www/curl/Makefile b/www/curl/Makefile index f88f0c7f4c1..a3b961ea49c 100644 --- a/www/curl/Makefile +++ b/www/curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/10/20 16:25:15 minskim Exp $ +# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:11 rillig Exp $ DISTNAME= curl-7.15.0 PKGREVISION= 1 @@ -22,7 +22,7 @@ GNU_CONFIGURE= yes CONFIGURE_ARGS+= --with-ssl=${BUILDLINK_PREFIX.openssl} CONFIGURE_ARGS+= --with-zlib=${BUILDLINK_PREFIX.zlib} # Work around an ICE on sparc64 with gcc2 -CONFIGURE_ENV+= F77=${FALSE} +CONFIGURE_ENV+= F77=${FALSE:Q} TEST_TARGET= check diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile index 976753080b5..982cbee1409 100644 --- a/www/cvsweb/Makefile +++ b/www/cvsweb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/09/28 12:18:22 rillig Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:11 rillig Exp $ # DISTNAME= cvsweb-3.0.5 @@ -64,7 +64,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} .endfor -SUBST_CLASSES= prefix +SUBST_CLASSES+= prefix SUBST_STAGE.prefix= post-patch SUBST_FILES.prefix= cvsweb.conf cvsweb.cgi INSTALL SUBST_SED.prefix= -e "s,/usr/local/etc/apache,${PKG_SYSCONFBASE}/httpd,g" diff --git a/www/drraw/Makefile b/www/drraw/Makefile index c9d4f8e4e62..0453359e664 100644 --- a/www/drraw/Makefile +++ b/www/drraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.1.1.1 2005/10/13 11:14:41 kleink Exp $ +# $NetBSD: Makefile,v 1.2 2005/12/05 20:51:12 rillig Exp $ # DISTNAME= drraw-2.1.3 @@ -45,7 +45,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/${f} ${DOCDIR}/${f} .endfor -SUBST_CLASSES= prefix +SUBST_CLASSES+= prefix SUBST_STAGE.prefix= post-patch SUBST_FILES.prefix= drraw.cgi SUBST_SED.prefix= -e "s,@PKG_SYSCONFDIR@,${PKG_SYSCONFDIR},g" diff --git a/www/elinks/Makefile b/www/elinks/Makefile index d92330d2fc4..76d90b61a66 100644 --- a/www/elinks/Makefile +++ b/www/elinks/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/09/04 05:00:36 jlam Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:12 rillig Exp $ DISTNAME= elinks-0.10.5 PKGREVISION= 1 @@ -16,7 +16,7 @@ USE_TOOLS+= gmake CONFIGURE_ARGS+= --without-x CONFIGURE_ARGS+= --enable-256-colors -CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR} +CONFIGURE_ENV+= PKGLOCALEDIR=${PKGLOCALEDIR:Q} .include "../../archivers/bzip2/buildlink3.mk" .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/www/emacs-w3m/Makefile b/www/emacs-w3m/Makefile index b7e22489de5..31849d39fc0 100644 --- a/www/emacs-w3m/Makefile +++ b/www/emacs-w3m/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/28 20:52:27 rillig Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $ DISTNAME= emacs-w3m-1.3.3 PKGNAME= ${EMACS_PKGNAME_PREFIX}${DISTNAME} @@ -44,8 +44,8 @@ ETCDIR= share/emacs/${EMACS_VERSION:C/[^0-9]*$//}/etc ICONDIR= ${ETCDIR}/w3m/icons .endif DOCDIR= ${ETCDIR}/w3m/doc -PLIST_SUBST+= DOCDIR=${DOCDIR} -PLIST_SUBST+= ICONDIR=${ICONDIR} +PLIST_SUBST+= DOCDIR=${DOCDIR:Q} +PLIST_SUBST+= ICONDIR=${ICONDIR:Q} post-install: @${MKDIR} ${PREFIX}/${DOCDIR} diff --git a/www/epiphany-extensions/Makefile b/www/epiphany-extensions/Makefile index f06cffa1b70..48d807a665c 100644 --- a/www/epiphany-extensions/Makefile +++ b/www/epiphany-extensions/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/10/16 14:14:57 jmmv Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:12 rillig Exp $ # DISTNAME= epiphany-extensions-1.8.1 @@ -11,7 +11,7 @@ HOMEPAGE= http://www.gnome.org/projects/epiphany/extensions.html COMMENT= Extensions for the Epiphany web browser GNU_CONFIGURE= YES -USE_TOOLS= gmake pkg-config +USE_TOOLS+= gmake pkg-config USE_LIBTOOL= YES USE_MSGFMT_PLURALS= YES USE_PKGLOCALEDIR= YES diff --git a/www/firefox-bin-acroread/Makefile.common b/www/firefox-bin-acroread/Makefile.common index 8a87ce26f62..0892de6181b 100644 --- a/www/firefox-bin-acroread/Makefile.common +++ b/www/firefox-bin-acroread/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/08/26 22:18:05 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:12 rillig Exp $ PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|} CATEGORIES= www print @@ -16,8 +16,8 @@ NO_CONFIGURE= YES NO_BUILD= YES PLIST_SRC= ../../www/firefox-bin-acroread/PLIST -PLIST_SUBST+= ACROREAD=${ACROREAD} -PLIST_SUBST+= PLATFORM=${PLATFORM} +PLIST_SUBST+= ACROREAD=${ACROREAD:Q} +PLIST_SUBST+= PLATFORM=${PLATFORM:Q} NS_PLUGINS_DIR= ${PREFIX}/lib/firefox-linux/plugins BROWSER?= Browsers diff --git a/www/firefox-bin-flash/Makefile.common b/www/firefox-bin-flash/Makefile.common index ffbcec2bc7d..6399f4e771a 100644 --- a/www/firefox-bin-flash/Makefile.common +++ b/www/firefox-bin-flash/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.3 2005/04/11 21:47:53 tv Exp $ +# $NetBSD: Makefile.common,v 1.4 2005/12/05 20:51:12 rillig Exp $ DISTNAME= install_flash_player_7_${DISTUNAME} PKGNAME= ${MOZ_BIN}-flash-${FLASH_VERS:S/r/./} @@ -37,7 +37,7 @@ MOZ_BIN?= ${MOZ_NAME:S/linux/bin/} WRKSRC= ${WRKDIR}/${WRKNAME} NS_PLUGINS_DIR= ${PREFIX}/lib/${MOZ_NAME}/plugins -PLIST_SUBST+= MOZ_NAME="${MOZ_NAME}" +PLIST_SUBST+= MOZ_NAME=${MOZ_NAME:Q} do-install: ${INSTALL_DATA_DIR} ${NS_PLUGINS_DIR} diff --git a/www/firefox-bin/Makefile.NetBSD.i386 b/www/firefox-bin/Makefile.NetBSD.i386 index 857a46d8b2e..3c946235107 100644 --- a/www/firefox-bin/Makefile.NetBSD.i386 +++ b/www/firefox-bin/Makefile.NetBSD.i386 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.7 2005/04/18 14:24:15 wiz Exp $ +# $NetBSD: Makefile.NetBSD.i386,v 1.8 2005/12/05 20:51:12 rillig Exp $ BUILD_DEFS+= MOZILLA_USE_LINUX @@ -6,7 +6,7 @@ BUILD_DEFS+= MOZILLA_USE_LINUX ONLY_FOR_PLATFORM+= NetBSD-*-i386 . include "Makefile.Linux.i386" .else -PKG_SKIP_REASON= "No native pre-built NetBSD binary available." +PKG_SKIP_REASON+= "No native pre-built NetBSD binary available." PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary." DISTNAME= ${MOZILLA}-${MOZ_DISTVER}-i386-unknown-netbsdelf1.6 EXTRACT_SUFX= .tar.bz2 diff --git a/www/firefox/hacks.mk b/www/firefox/hacks.mk index c8dd1a20d82..35d705a1e48 100644 --- a/www/firefox/hacks.mk +++ b/www/firefox/hacks.mk @@ -1,4 +1,4 @@ -# $NetBSD: hacks.mk,v 1.1 2005/08/03 16:55:19 tron Exp $ +# $NetBSD: hacks.mk,v 1.2 2005/12/05 20:51:12 rillig Exp $ # Firefox suffers from display glitches (e.g. text appearing at the wrong # location) if it was compiled with optimization. @@ -13,7 +13,7 @@ _GCC_IS_TOO_OLD!= \ else \ ${ECHO} "no"; \ fi -MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD} +MAKEFLAGS+= _GCC_IS_TOO_OLD=${_GCC_IS_TOO_OLD:Q} . endif . if !empty(_GCC_IS_TOO_OLD:M[yY][eE][sS]) PKG_HACKS+= powerpc-codegen diff --git a/www/horde3/Makefile b/www/horde3/Makefile index 189f5e01557..178e9c3eb08 100644 --- a/www/horde3/Makefile +++ b/www/horde3/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/11/25 20:59:15 adrianp Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:12 rillig Exp $ DISTNAME= horde-3.0.7 CATEGORIES= www @@ -59,7 +59,7 @@ CONF_FILES_PERMS+= ${HORDEDIR}/config/hooks.php.dist \ ${HORDEDIR}/config/hooks.php \ ${APACHE_USER} ${ROOT_GROUP} 0440 -SUBST_CLASSES= files +SUBST_CLASSES+= files SUBST_STAGE.files= post-build SUBST_FILES.files= horde.conf.dist config/conf.xml config/conf.xml.dist \ scripts/set_perms.sh diff --git a/www/htdig/Makefile b/www/htdig/Makefile index 446bfc98de6..780fd18dc97 100644 --- a/www/htdig/Makefile +++ b/www/htdig/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.26 2005/05/17 22:00:13 jlam Exp $ +# $NetBSD: Makefile,v 1.27 2005/12/05 20:51:12 rillig Exp $ DISTNAME= htdig-3.1.6 PKGREVISION= 3 @@ -21,7 +21,7 @@ USE_PKGINSTALL= YES USE_LANGUAGES= c c++ GNU_CONFIGURE= yes -CONFIGURE_ARGS= --with-cgi-bin-dir=${PREFIX}/libexec/cgi-bin \ +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} \ diff --git a/www/htmldoc-x11/Makefile b/www/htmldoc-x11/Makefile index a40fea61aa0..b38002ac0af 100644 --- a/www/htmldoc-x11/Makefile +++ b/www/htmldoc-x11/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.7 2005/06/01 18:03:26 jlam Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:12 rillig Exp $ # -.include "../htmldoc/Makefile.common" +.include "../../www/htmldoc/Makefile.common" PKGNAME= htmldoc-x11-${HTMLDOC_VERSION} PKGREVISION= 3 diff --git a/www/http_load/Makefile b/www/http_load/Makefile index cee825d846d..f4ff2bbd25c 100644 --- a/www/http_load/Makefile +++ b/www/http_load/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/23 20:06:26 wiz Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $ DISTNAME= http_load-04jan2002 PKGNAME= http_load-20020104 @@ -10,7 +10,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.acme.com/software/http_load/ COMMENT= Multiprocessing http test client -MAKE_ENV+= SSLBASE="${SSLBASE}" +MAKE_ENV+= SSLBASE=${SSLBASE:Q} .include "../../security/openssl/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/iasp/Makefile b/www/iasp/Makefile index e4d6ed138aa..70954515f80 100644 --- a/www/iasp/Makefile +++ b/www/iasp/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.9 2005/08/19 18:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:12 rillig Exp $ -.include "../iasp/Makefile.common" +.include "../../www/iasp/Makefile.common" PKGNAME= iasp-${IASP_VERSION} PKGREVISION= 2 @@ -14,14 +14,14 @@ SCRIPTS_ENV+= ECHO=${ECHO:Q} SCRIPTS_ENV+= SED=${SED:Q} SCRIPTS_ENV+= SH=${SH:Q} SCRIPTS_ENV+= IASP=${IASP_DESTDIR} -FILES_SUBST= IASP=${IASP_DESTDIR} -PLIST_SUBST= IASP=${IASP_DESTDIR:S/^${PREFIX}\///} +FILES_SUBST+= IASP=${IASP_DESTDIR:Q} +PLIST_SUBST+= IASP=${IASP_DESTDIR:S/^${PREFIX}\///:Q} IASP_USER?= ${APACHE_USER} IASP_GROUP?= ${APACHE_GROUP} BUILD_DEFS+= IASP_USER IASP_GROUP -FILES_SUBST+= IASP_USER=${IASP_USER} -FILES_SUBST+= IASP_GROUP=${IASP_GROUP} +FILES_SUBST+= IASP_USER=${IASP_USER:Q} +FILES_SUBST+= IASP_GROUP=${IASP_GROUP:Q} PKG_USERS= ${IASP_USER}:${IASP_GROUP} PKG_GROUPS= ${IASP_GROUP} diff --git a/www/ijb/Makefile b/www/ijb/Makefile index 16ad7408d55..00a66cd2afe 100644 --- a/www/ijb/Makefile +++ b/www/ijb/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:40 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $ # DISTNAME= ijb20 @@ -12,7 +12,7 @@ MAINTAINER= abs@NetBSD.org HOMEPAGE= http://www.junkbuster.com/ COMMENT= The Internet Junkbuster Proxy blocks unwanted banner ads and cookies -MAKE_ENV+= MORE_CFLAGS="${CFLAGS}" +MAKE_ENV+= MORE_CFLAGS=${CFLAGS:M*:Q} INSTALLATION_DIRS= bin man/man1 diff --git a/www/ijb/distinfo b/www/ijb/distinfo index c9700b1a893..f6cf21ff708 100644 --- a/www/ijb/distinfo +++ b/www/ijb/distinfo @@ -1,7 +1,7 @@ -$NetBSD: distinfo,v 1.5 2005/02/24 14:08:32 wiz Exp $ +$NetBSD: distinfo,v 1.6 2005/12/05 20:51:12 rillig Exp $ SHA1 (ijb20.tar.Z) = 2233cc5f26208058c5046168ff9ddf70312bfb75 RMD160 (ijb20.tar.Z) = 9ca21442e53c839102b3abfedd07e290953c28a7 Size (ijb20.tar.Z) = 286005 bytes SHA1 (patch-aa) = 4c4f75f5cc3af63afce4aa8beab7f5e2e0b422dd -SHA1 (patch-ab) = 1295fffa7e2cac2de991ac5b0a7a9f5bfa9cd1d1 +SHA1 (patch-ab) = 18da8c5788d8704f3502f70f5aafdbd9ce897fd2 diff --git a/www/ijb/patches/patch-ab b/www/ijb/patches/patch-ab index a1bb7d813e0..6afaf774227 100644 --- a/www/ijb/patches/patch-ab +++ b/www/ijb/patches/patch-ab @@ -1,8 +1,8 @@ -$NetBSD: patch-ab,v 1.1 2004/05/23 23:28:30 danw Exp $ +$NetBSD: patch-ab,v 1.2 2005/12/05 20:51:12 rillig Exp $ --- loaders.c.orig Fri Oct 30 22:58:47 1998 +++ loaders.c -@@ -8,7 +8,6 @@ char *loaders_rcs = "$Id: loaders.c,v 1. +@@ -8,7 +8,6 @@ #include <stdlib.h> #include <sys/types.h> #include <string.h> diff --git a/www/instiki/Makefile b/www/instiki/Makefile index 98bc975176e..892cddc5c6a 100644 --- a/www/instiki/Makefile +++ b/www/instiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/11/09 04:27:34 taca Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:12 rillig Exp $ DISTNAME= instiki-0.9.2 PKGREVISION= 4 @@ -14,7 +14,7 @@ NO_BUILD= yes USE_PKGINSTALL= yes RCD_SCRIPTS= instiki -FILES_SUBST+= RUBY=${RUBY} +FILES_SUBST+= RUBY=${RUBY:Q} REPLACE_RUBY= instiki diff --git a/www/jakarta-servletapi/Makefile b/www/jakarta-servletapi/Makefile index 857a4696bdc..a16413bf55e 100644 --- a/www/jakarta-servletapi/Makefile +++ b/www/jakarta-servletapi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/10/05 14:48:56 jwise Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:12 rillig Exp $ DISTNAME= jakarta-servletapi-${TOMCAT_VERSION}-src PKGNAME= ${DISTNAME:S/-src$//} @@ -42,4 +42,4 @@ do-install: .include "../../mk/bsd.pkg.mk" MAKE_PROGRAM= ${LOCALBASE}/bin/ant -MAKE_FLAGS= +MAKE_FLAGS= # empty diff --git a/www/jakarta-tomcat4/Makefile b/www/jakarta-tomcat4/Makefile index 20feae80563..357d36f8101 100644 --- a/www/jakarta-tomcat4/Makefile +++ b/www/jakarta-tomcat4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/05/24 14:25:32 rillig Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $ PKGNAME= jakarta-tomcat4-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -34,7 +34,7 @@ CONF_FILES+= ${SAMPLECONFDIR}/${FILE}.default ${PKG_SYSCONFDIR}/${FILE} .endfor RCD_SCRIPTS= tomcat4 -FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME} TOMCAT_LIB=${TOMCAT_LIB} +FILES_SUBST+= JAVA_HOME=${PKG_JAVA_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} .include "../../mk/java-vm.mk" diff --git a/www/jakarta-tomcat5/Makefile b/www/jakarta-tomcat5/Makefile index a5d8ef05a00..cb058f26aae 100644 --- a/www/jakarta-tomcat5/Makefile +++ b/www/jakarta-tomcat5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/07/15 18:27:54 jlam Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:12 rillig Exp $ PKGNAME= jakarta-tomcat5-${TOMCAT_VERSION} DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} @@ -42,13 +42,11 @@ CONF_FILES= # empty .for f in ${CFILES} CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.undef f .for f in ${CF2FILES} CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f} .endfor -.undef f -FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME} TOMCAT_LIB=${TOMCAT_LIB} +FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} do-build: @${MV} ${WRKSRC}/conf ${WRKDIR} @@ -57,11 +55,9 @@ do-install: .for f in ${CFILES} ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR} .endfor -.undef f .for f in ${CF2FILES} ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2} .endfor -.undef f ${INSTALL_DATA_DIR} ${TOMCAT_LIB} @(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}; \ ${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \ diff --git a/www/jakarta-tomcat55/Makefile b/www/jakarta-tomcat55/Makefile index 1ee0e2e8758..65cd5d0df8c 100644 --- a/www/jakarta-tomcat55/Makefile +++ b/www/jakarta-tomcat55/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/07/15 18:27:54 jlam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:12 rillig Exp $ DISTNAME= jakarta-tomcat-${TOMCAT_VERSION} PKGREVISION= 1 @@ -41,13 +41,11 @@ CONF_FILES= # empty .for f in ${CFILES} CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.undef f .for f in ${CF2FILES} CONF_FILES+= ${EGDIR2}/${f} ${PKG_SYSCONFDIR}/${CATALINA_DIR}/${f} .endfor -.undef f -FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME} TOMCAT_LIB=${TOMCAT_LIB} +FILES_SUBST+= JAVA_HOME=${PKG_JVM_HOME:Q} TOMCAT_LIB=${TOMCAT_LIB:Q} do-build: @${MV} ${WRKSRC}/conf ${WRKDIR} @@ -56,11 +54,9 @@ do-install: .for f in ${CFILES} ${INSTALL_DATA} ${WRKDIR}/conf/${f} ${EGDIR} .endfor -.undef f .for f in ${CF2FILES} ${INSTALL_DATA} ${WRKDIR}/conf/${CATALINA_DIR}/${f} ${EGDIR2} .endfor -.undef f ${INSTALL_DATA_DIR} ${TOMCAT_LIB} @(cd ${WRKSRC} && ${PAX} -rw -pm . ${TOMCAT_LIB}; \ ${FIND} ${TOMCAT_LIB} -type f -print | ${XARGS} ${CHMOD} a+r; \ diff --git a/www/jssi/Makefile b/www/jssi/Makefile index 055dcd235cd..add116e1a37 100644 --- a/www/jssi/Makefile +++ b/www/jssi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/10/29 01:56:42 kristerw Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:13 rillig Exp $ DISTNAME= ApacheJSSI-1.1.2 PKGNAME= jssi-1.1.2 @@ -18,7 +18,7 @@ WRKSRC= ${WRKDIR}/ApacheJSSI-1.1.2/src/java USE_TOOLS+= gmake NO_CONFIGURE= yes -MAKE_ENV+= CLASSPATH=${CLASSPATH} +MAKE_ENV+= CLASSPATH=${CLASSPATH:Q} post-build: (cd ${WRKSRC}/../../docs && ${SETENV} ${SCRIPTS_ENV} ${SH} generate_javadoc) diff --git a/www/kazehakase/Makefile b/www/kazehakase/Makefile index 3b3d83d46a0..a50d3c0a443 100644 --- a/www/kazehakase/Makefile +++ b/www/kazehakase/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.2 2005/09/17 22:40:36 reed Exp $ +# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:13 rillig Exp $ # DISTNAME= kazehakase-0.3.0 @@ -36,7 +36,6 @@ EGFILES= bookmarkbar.xml bookmarks.xml kz-ui-beginner.xml \ .for f in ${EGFILES} CONF_FILES+= ${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f} .endfor -.undef f MAKE_DIRS+= ${PKG_SYSCONFDIR}/mozilla CONF_FILES+= ${EGDIR}/mozilla/encodings.xml ${PKG_SYSCONFDIR}/mozilla/encodings.xml diff --git a/www/mini_httpd/Makefile b/www/mini_httpd/Makefile index ffbdba62794..c3226cbe9b2 100644 --- a/www/mini_httpd/Makefile +++ b/www/mini_httpd/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/09/07 02:15:12 reed Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:13 rillig Exp $ DISTNAME= mini_httpd-1.19 PKGREVISION= 2 @@ -11,7 +11,7 @@ COMMENT= Small, forking webserver with IPv6 and SSL support DIST_SUBDIR= ${PKGNAME_NOREV} -MAKE_ENV+= PKG_CFLAGS="${CFLAGS}" +MAKE_ENV+= PKG_CFLAGS=${CFLAGS:M*:Q} .include "../../mk/bsd.prefs.mk" diff --git a/www/mozilla-bin-nightly/Makefile.NetBSD.i386 b/www/mozilla-bin-nightly/Makefile.NetBSD.i386 index a54d7cc50e2..067493895ce 100644 --- a/www/mozilla-bin-nightly/Makefile.NetBSD.i386 +++ b/www/mozilla-bin-nightly/Makefile.NetBSD.i386 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.NetBSD.i386,v 1.6 2004/11/06 10:41:30 kristerw Exp $ +# $NetBSD: Makefile.NetBSD.i386,v 1.7 2005/12/05 20:51:13 rillig Exp $ BUILD_DEFS+= MOZILLA_USE_LINUX @@ -7,7 +7,7 @@ DISTNAME= mozilla-i686-pc-linux-gnu MOZ_PLATFORM= linux ONLY_FOR_PLATFORM+= NetBSD-*-i386 .else -PKG_SKIP_REASON= "No native pre-built NetBSD binary available." +PKG_SKIP_REASON+= "No native pre-built NetBSD binary available." PKG_SKIP_REASON+= "Set MOZILLA_USE_LINUX if you want to use the Linux binary." DISTNAME= mozilla-i386-unknown-netbsdelf1.6 EXTRACT_SUFX= .tar.bz2 diff --git a/www/mozilla-bin-nightly/Makefile.common b/www/mozilla-bin-nightly/Makefile.common index d529b0e8d8f..8f3e7f3dab3 100644 --- a/www/mozilla-bin-nightly/Makefile.common +++ b/www/mozilla-bin-nightly/Makefile.common @@ -1,9 +1,9 @@ -# $NetBSD: Makefile.common,v 1.7 2005/09/28 12:22:51 rillig Exp $ +# $NetBSD: Makefile.common,v 1.8 2005/12/05 20:51:13 rillig Exp $ MASTER_SITES= http://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ \ ftp://ftp.mozilla.org/pub/mozilla.org/${MOZILLA_SHORT}/nightly/${MOZ_CONTRIB}latest-trunk/ -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} NO_CHECKSUM= yes NO_SRC_ON_FTP= # defined diff --git a/www/mozilla-bin/Makefile.common b/www/mozilla-bin/Makefile.common index 693b97a39d3..a45d996fb7e 100644 --- a/www/mozilla-bin/Makefile.common +++ b/www/mozilla-bin/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.30 2005/09/28 12:22:10 rillig Exp $ +# $NetBSD: Makefile.common,v 1.31 2005/12/05 20:51:13 rillig Exp $ DISTNAME= # see Makefile.${OPSYS}.${ARCH} PKGNAME= ${MOZILLA}${MOZ_EXTRA}-bin-${MOZ_VER} @@ -49,9 +49,9 @@ MASTER_SITES+= ${_site_}contrib/ MOZILLA_LIB= ${PREFIX}/lib/${MOZILLA}${MOZ_EXTRA}-${MOZ_PLATFORM} -FILES_SUBST+= MOZILLA=${MOZILLA} -FILES_SUBST+= MOZ_EXTRA=${MOZ_EXTRA} -FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM} +FILES_SUBST+= MOZILLA=${MOZILLA:Q} +FILES_SUBST+= MOZ_EXTRA=${MOZ_EXTRA:Q} +FILES_SUBST+= MOZ_PLATFORM=${MOZ_PLATFORM:Q} MESSAGE_SUBST+= PKGBASE=${PKGBASE} PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common index 7e3bfb25167..7f1719d70be 100644 --- a/www/mozilla/Makefile.common +++ b/www/mozilla/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.64 2005/11/26 22:09:25 martin Exp $ +# $NetBSD: Makefile.common,v 1.65 2005/12/05 20:51:13 rillig Exp $ MOZ_DIST_VER?= ${MOZ_VER} DISTNAME?= mozilla-${MOZ_DIST_VER}-source @@ -55,7 +55,7 @@ UNLIMIT_RESOURCES= datasize memorysize stacksize .include "../../graphics/freetype2/buildlink3.mk" .include "../../graphics/jpeg/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" -.ifdef _MOZILLA_USE_GTK2 +.if defined(_MOZILLA_USE_GTK2) .include "../../net/libIDL/buildlink3.mk" .include "../../x11/gtk2/buildlink3.mk" CONFIGURE_ARGS+= --enable-default-toolkit=gtk2 --disable-gnomevfs @@ -69,25 +69,25 @@ CONFIGURE_ARGS+= --enable-default-toolkit=gtk # NetBSD-*-m68k builds, but "regchrome" dumps core. NOT_FOR_PLATFORM= NetBSD-1.4.*-* NetBSD-*-m68k -MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA} +MAKE_ENV+= MOZILLA_PKG_NAME=${MOZILLA:Q} MOZ_LIBDIR= ${PREFIX}/lib/${MOZILLA} -MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} -CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR} +MAKE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} +CONFIGURE_ENV+= LIBRUNPATH=${MOZ_LIBDIR:Q} LDFLAGS+= ${COMPILER_RPATH_FLAG}${MOZ_LIBDIR} -.ifdef BUILD_SVG +.if defined(BUILD_SVG) MAKE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 CONFIGURE_ENV+= MOZ_INTERNAL_LIBART_LGPL=1 CONFIGURE_ARGS+= --enable-svg CONFIGURE_ARGS+= --enable-svg-renderer-libart .endif -.ifdef BUILD_CALENDAR +.if defined(BUILD_CALENDAR) CONFIGURE_ARGS+= --enable-calendar .endif -.ifdef BUILD_MATHML +.if defined(BUILD_MATHML) CONFIGURE_ARGS+= --enable-mathml .endif @@ -100,10 +100,10 @@ CONFIGURE_ARGS+= --enable-xinerama # directory SCRIPTS_ENV+= HOME="${WRKDIR}" -PLIST_SUBST+= MOZILLA=${MOZILLA} -PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN} -FILES_SUBST+= MOZILLA=${MOZILLA} -FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN} +PLIST_SUBST+= MOZILLA=${MOZILLA:Q} +PLIST_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} +FILES_SUBST+= MOZILLA=${MOZILLA:Q} +FILES_SUBST+= MOZILLA_BIN=${MOZILLA_BIN:Q} .if ${OBJECT_FMT} == "ELF" SO_SUFFIX= so SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM}" @@ -114,14 +114,14 @@ SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_LIB}" SO_SUFFIX= so.1.0 SCRIPTS_ENV+= MOZ_INSTALL_LIB="${INSTALL_PROGRAM}" .endif -PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX} +PLIST_SUBST+= SO_SUFFIX=${SO_SUFFIX:Q} .if (${OPSYS} == "SunOS" && ${MACHINE_ARCH} == "sparc") SUNOSLIB= .else SUNOSLIB= "@comment " .endif -PLIST_SUBST+= SUNOSLIB=${SUNOSLIB} +PLIST_SUBST+= SUNOSLIB=${SUNOSLIB:Q} SCRIPTS_ENV+= OBJECT_FMT=${OBJECT_FMT:Q} SCRIPTS_ENV+= PLIST_SRC=${PLIST_SRC:Q} @@ -193,7 +193,7 @@ CONFIGURE_ARGS+= --enable-xft .endif # Fix for firefox* packages. -SUBST_CLASSES= pc +SUBST_CLASSES+= pc SUBST_STAGE.pc= post-extract SUBST_FILES.pc= build/unix/*.pc.in SUBST_SED.pc= -e "s|%includedir%|${PREFIX}/include/${MOZILLA}|g" \ diff --git a/www/navigator/Makefile b/www/navigator/Makefile index 6a4a8fc8e80..c9626a55242 100644 --- a/www/navigator/Makefile +++ b/www/navigator/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2003/08/08 09:38:40 grant Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:13 rillig Exp $ # COMMENT= Netscape Navigator browser, version 4 (binary pkg) @@ -6,5 +6,5 @@ COMMENT= Netscape Navigator browser, version 4 (binary pkg) BINNAME= navigator DIST_SDIR_NAME= navigator_standalone -.include "../navigator/Makefile.common" +.include "../../www/navigator/Makefile.common" .include "../../mk/bsd.pkg.mk" diff --git a/www/navigator/Makefile.common b/www/navigator/Makefile.common index 92e6c762f2c..d6b273fb0bd 100644 --- a/www/navigator/Makefile.common +++ b/www/navigator/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.78 2005/09/28 12:17:23 rillig Exp $ +# $NetBSD: Makefile.common,v 1.79 2005/12/05 20:51:13 rillig Exp $ # # Common include file for communicator and navigator packages @@ -45,7 +45,7 @@ DEPENDS+= ns-flash>4.0:../../multimedia/ns-flash .elif ${MACHINE_ARCH} == "alpha" . if !exists(/emul/osf1/sbin/loader) -PKG_FAIL_REASON= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" +PKG_FAIL_REASON+= "${PKGNAME} requires Digital UNIX libraries - see compat_osf1(8)" . endif NS_VERS= 4.78 PKGNAME= ${BINNAME}-${NS_VERS} @@ -65,7 +65,7 @@ DIST_DIR_NAME= unsupported/bsdi21 WRKNAME= x86-bsdi-bsd2 VENDOR_NAME= BSD/OS 2.1 -BUILD_DEPENDS= binpatch>=1.0:../../pkgtools/binpatch +BUILD_DEPENDS+= binpatch>=1.0:../../pkgtools/binpatch post-install: ${SH} ../../www/navigator/files/binpatch-x86-bsdi-bsd2-4.75.sh \ @@ -90,7 +90,7 @@ post-install: .endif .elif ((${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64") && defined(NS_USE_SUNOS)) . if !exists(/emul/sunos/usr/lib/ld.so) -PKG_FAIL_REASON= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" +PKG_FAIL_REASON+= "${PKGNAME} requires SunOS libraries - see compat_sunos(8)" . endif NS_VERS= 4.61 PKGNAME= ${BINNAME}-${NS_VERS} @@ -106,7 +106,7 @@ MASTER_SITES= ftp://archive.netscape.com/archive/communicator/${SUB}/ .elif ${MACHINE_ARCH} == "sparc" || ${MACHINE_ARCH} == "sparc64" PLIST_ARCH= solaris-sparc . if !exists(/emul/svr4/usr/lib/ld.so.1) -PKG_FAIL_REASON= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)" +PKG_FAIL_REASON+= "${PKGNAME} requires Solaris libraries - see compat_svr4(8)" . endif NS_VERS= 4.79 PKGNAME= ${BINNAME}-${NS_VERS} @@ -118,9 +118,9 @@ VENDOR_NAME= Solaris 2.5.1 # powerpc is "unusual" .elif ${MACHINE_ARCH} == "powerpc" . if ${BINNAME} == "navigator" -PKG_FAIL_REASON= "There is no navigator-only package for PowerPC" -PKG_FAIL_REASON+= "platform. Please cd to ../communicator and" -PKG_FAIL_REASON+= "install communicator package instead." +PKG_FAIL_REASON+= "There is no navigator-only package for PowerPC" +PKG_FAIL_REASON+= "platform. Please cd to ../communicator and" +PKG_FAIL_REASON+= "install communicator package instead." . endif NS_VERS= 4.73 PKGNAME= ${BINNAME}-${NS_VERS} @@ -130,7 +130,7 @@ WRKSRC= ${WRKDIR} MASTER_SITES= http://www.gmd.de/ftp/mirrors3/ftp.linuxppc.org/linuxppc-halloween/software/ EXTRACT_SUFX= .rpm HOMEPAGE= http://linuxppc.org/software/index/linuxppc_stable/software/netscape-4.7-3.ppc.html -BUILD_DEPENDS= rpm2pkg>=1.2:../../pkgtools/rpm2pkg +BUILD_DEPENDS+= rpm2pkg>=1.2:../../pkgtools/rpm2pkg DESCR_SRC= ${WRKDIR}/DESCR.linux-powerpc PLIST_SRC= ${WRKDIR}/PLIST_DYNAMIC RPM2PKG= rpm2pkg @@ -199,7 +199,7 @@ NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/plugins PLIST_SRC= ${PKGDIR}/PLIST.pre \ ${PKGDIR}/PLIST.${PLIST_ARCH} \ ${PKGDIR}/PLIST.post -PLIST_SUBST+= NS_VERS=${NS_VERS} LDAP_VERS=${LDAP_VERS} BINNAME=${BINNAME} +PLIST_SUBST+= NS_VERS=${NS_VERS:Q} LDAP_VERS=${LDAP_VERS:Q} BINNAME=${BINNAME:Q} do-install: ${INSTALL_DATA_DIR} ${MOZILLA_HOME}/java/classes diff --git a/www/netscape7-acroread/Makefile.common b/www/netscape7-acroread/Makefile.common index a06c9acb139..d01e9ee7bc8 100644 --- a/www/netscape7-acroread/Makefile.common +++ b/www/netscape7-acroread/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.2 2005/04/18 16:20:25 jschauma Exp $ +# $NetBSD: Makefile.common,v 1.3 2005/12/05 20:51:13 rillig Exp $ PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|} CATEGORIES= www print @@ -16,9 +16,9 @@ NO_CONFIGURE= YES NO_BUILD= YES PLIST_SRC= ../../www/netscape7-acroread/PLIST -PLIST_SUBST+= ACROREAD=${ACROREAD} -PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR} -PLIST_SUBST+= PLATFORM=${PLATFORM} +PLIST_SUBST+= ACROREAD=${ACROREAD:Q} +PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q} +PLIST_SUBST+= PLATFORM=${PLATFORM:Q} NS_PLUGINS_DIR= ${PREFIX}/lib/netscape/netscape7/plugins do-install: diff --git a/www/ns-remote/Makefile b/www/ns-remote/Makefile index c7064182016..56752e5dd9d 100644 --- a/www/ns-remote/Makefile +++ b/www/ns-remote/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/07/06 19:13:24 abs Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:13 rillig Exp $ DISTNAME= ns-remote PKGNAME= ns-remote-1.11 @@ -12,7 +12,7 @@ COMMENT= Remote-control of Netscape and Mozilla-based browsers DIST_SUBDIR= netscape -LDFLAGS.SunOS= -lsocket -lnsl +LDFLAGS.SunOS+= -lsocket -lnsl INSTALLATION_DIRS= bin diff --git a/www/opera-acroread/Makefile.common b/www/opera-acroread/Makefile.common index 4f7e8a0520f..6507b6154ca 100644 --- a/www/opera-acroread/Makefile.common +++ b/www/opera-acroread/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2005/05/02 08:59:08 tron Exp $ +# $NetBSD: Makefile.common,v 1.5 2005/12/05 20:51:13 rillig Exp $ PKGNAME= ${DISTNAME:C|MozillaFirebird|firefox|} CATEGORIES= www print @@ -17,9 +17,9 @@ NO_CONFIGURE= YES NO_BUILD= YES PLIST_SRC= ../../www/opera-acroread/PLIST -PLIST_SUBST+= ACROREAD=${ACROREAD} -PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR} -PLIST_SUBST+= PLATFORM=${PLATFORM} +PLIST_SUBST+= ACROREAD=${ACROREAD:Q} +PLIST_SUBST+= ACRO_SUBDIR=${ACRO_SUBDIR:Q} +PLIST_SUBST+= PLATFORM=${PLATFORM:Q} NS_PLUGINS_DIR= ${PREFIX}/emul/linux/usr/lib/opera/plugins do-install: diff --git a/www/opera/Makefile b/www/opera/Makefile index f7e2e6dd69c..8ce79b5ff39 100644 --- a/www/opera/Makefile +++ b/www/opera/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2005/11/22 22:14:51 jdolecek Exp $ +# $NetBSD: Makefile,v 1.48 2005/12/05 20:51:13 rillig Exp $ DISTNAME= opera-${OPERA_PKG_VERSION:S/u/pl/} CATEGORIES= www @@ -21,7 +21,6 @@ LICENSE= opera-850-license #PKG_INSTALLATION_TYPES= overwrite pkgviews NO_CONFIGURE= YES -NO_TOOLS= YES USE_LANGUAGES= # empty .include "../../mk/bsd.prefs.mk" @@ -78,7 +77,7 @@ CONF_FILES+= ${PREFIX}/share/opera/config/opera6rc.fixed \ /etc/opera6rc.fixed . endif -PLIST_SUBST+= OPERA_VER_DATE=${OPERA_VER_DATE} +PLIST_SUBST+= OPERA_VER_DATE=${OPERA_VER_DATE:Q} PLIST_SUBST+= OPERA_PKG_VERSION=${OPERA_PKG_VERSION:C/u.*//} .endif @@ -111,7 +110,7 @@ USE_TOOLS+= gzip .endif post-install-manpage: - # The SuSE common makefile defines "MANCOMPRESSED=yes". +# The SuSE common makefile defines "MANCOMPRESSED=yes". . if defined(MANCOMPRESSED) && !empty(MANCOMPRESSED:M[yY][eE][sS]) ${GZIP_CMD} ${EMULDIR}/usr/share/man/man1/opera.1 ${LN} -fs ../../${EMULSUBDIR}/usr/share/man/man1/opera.1.gz \ diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile index 8282361c97a..eff77548fb4 100644 --- a/www/p5-Apache-Gallery/Makefile +++ b/www/p5-Apache-Gallery/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.28 2005/08/06 06:19:36 jlam Exp $ +# $NetBSD: Makefile,v 1.29 2005/12/05 20:51:13 rillig Exp $ # DISTNAME= Apache-Gallery-0.9.1 @@ -39,15 +39,15 @@ AG_DOCDIR= ${PREFIX}/share/doc/${AG} AG_EGDIR= ${PREFIX}/share/examples/${AG} AG_SHAREDIR= ${PREFIX}/share/${AG} -FILES_SUBST+= AG=${AG} -FILES_SUBST+= AG_SHAREDIR=${AG_SHAREDIR} -FILES_SUBST+= LDFLAGS=${LDFLAGS:Q} +FILES_SUBST+= AG=${AG:Q} +FILES_SUBST+= AG_SHAREDIR=${AG_SHAREDIR:Q} +FILES_SUBST+= LDFLAGS=${LDFLAGS:M*:Q} MESSAGE_SUBST+= AG=${AG} MESSAGE_SUBST+= AG_DOCDIR=${AG_DOCDIR} MESSAGE_SUBST+= AG_SHAREDIR=${AG_SHAREDIR} -PLIST_SUBST+= AG=${AG} +PLIST_SUBST+= AG=${AG:Q} PLIST_SUBST+= AG_DOCDIR=${AG_DOCDIR:S,${PREFIX}/,,} PLIST_SUBST+= AG_EGDIR=${AG_EGDIR:S,${PREFIX}/,,} PLIST_SUBST+= AG_SHAREDIR=${AG_SHAREDIR:S,${PREFIX}/,,} diff --git a/www/p5-CGI-Kwiki/Makefile b/www/p5-CGI-Kwiki/Makefile index dbae4d3f330..52d04cee887 100644 --- a/www/p5-CGI-Kwiki/Makefile +++ b/www/p5-CGI-Kwiki/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.5 2005/08/06 06:19:38 jlam Exp $ +# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:13 rillig Exp $ # DISTNAME= CGI-Kwiki-0.18 @@ -10,7 +10,7 @@ MASTER_SITES= ${MASTER_SITE_PERL_CPAN:=CGI/} MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.kwiki.org/ -COMMENT= A Quickie Wiki that's not too Tricky +COMMENT= Quickie Wiki that's not too Tricky DEPENDS+= p5-Test-Simple>=0.47:../../devel/p5-Test-Simple DEPENDS+= p5-Locale-Maketext>=1.08:../../misc/p5-Locale-Maketext diff --git a/www/p5-URI/Makefile b/www/p5-URI/Makefile index 6b6a18ffcb6..7a84410cbde 100644 --- a/www/p5-URI/Makefile +++ b/www/p5-URI/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.30 2005/08/06 06:19:40 jlam Exp $ +# $NetBSD: Makefile,v 1.31 2005/12/05 20:51:13 rillig Exp $ # DISTNAME= URI-1.35 @@ -12,7 +12,7 @@ MAINTAINER= heinz@NetBSD.org HOMEPAGE= http://search.cpan.org/dist/URI/ COMMENT= Perl5 Uniform Resource Identifiers class (URI, RFC 2396) -BUILD_DEPENDS= p5-MIME-Base64>=2.12:../../converters/p5-MIME-Base64 +BUILD_DEPENDS+= p5-MIME-Base64>=2.12:../../converters/p5-MIME-Base64 CONFLICTS+= p5-libwww-5.36 # URI used to be part of that package diff --git a/www/php-FastTemplate/Makefile b/www/php-FastTemplate/Makefile index 355cdc39f4d..12c632eaaf4 100644 --- a/www/php-FastTemplate/Makefile +++ b/www/php-FastTemplate/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2005/06/23 15:38:40 wiz Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:13 rillig Exp $ DISTNAME= FastTemplate-1_1_0 PKGNAME= php-FastTemplate-1.1.0 @@ -24,8 +24,8 @@ PHP_LIB_DIR= ${PREFIX}/${PHP_LIB_SUBDIR} DOCDIR= ${PREFIX}/share/doc/html/${PKGBASE} EGDIR= ${PREFIX}/share/examples/${PKGBASE} -PLIST_SUBST+= PHP_LIB_SUBDIR=${PHP_LIB_SUBDIR} -PLIST_SUBST+= PKGBASE=${PKGBASE} +PLIST_SUBST+= PHP_LIB_SUBDIR=${PHP_LIB_SUBDIR:Q} +PLIST_SUBST+= PKGBASE=${PKGBASE:Q} do-install: ${INSTALL_DATA_DIR} ${PHP_LIB_DIR} diff --git a/www/php4-apc/Makefile b/www/php4-apc/Makefile index 8628c082582..afab433dbbb 100644 --- a/www/php4-apc/Makefile +++ b/www/php4-apc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/10/04 16:50:50 tv Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $ MODNAME= apc PECL_VERSION= 2.0.4 @@ -13,7 +13,7 @@ CONFIGURE_ARGS+= --enable-${MODNAME} WRKSRC= ${WRKDIR}/APC-${PECL_VERSION} PLIST_SRC+= ${.CURDIR}/PLIST.extras -PLIST_SUBST+= PKGBASE="${PKGBASE}" +PLIST_SUBST+= PKGBASE=${PKGBASE:Q} DOCDIR= ${PREFIX}/share/doc/${PKGBASE} post-install: diff --git a/www/php4/Makefile b/www/php4/Makefile index 9eb54a0a6b6..5f34a9dbc45 100644 --- a/www/php4/Makefile +++ b/www/php4/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.58 2005/11/21 09:13:28 joerg Exp $ +# $NetBSD: Makefile,v 1.59 2005/12/05 20:51:13 rillig Exp $ PKGNAME= php-${PHP_BASE_VERS} PKGREVISION= 2 @@ -39,12 +39,12 @@ EGDIR= ${PREFIX}/share/examples/php # libtool without change. # .if ${OPSYS} == "NetBSD" && ${OBJECT_FMT} == "ELF" -MAKE_ENV+= LINK_LIBGCC_LDFLAGS="${LINK_ALL_LIBGCC_HACK}" +MAKE_ENV+= LINK_LIBGCC_LDFLAGS=${LINK_ALL_LIBGCC_HACK:Q} .endif # Ensure we export symbols in the linked shared object. LDFLAGS+= ${EXPORT_SYMBOLS_LDFLAGS} -MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS="${EXPORT_SYMBOLS_LDFLAGS}" +MAKE_ENV+= EXPORT_SYMBOLS_LDFLAGS=${EXPORT_SYMBOLS_LDFLAGS:Q} CONF_FILES= ${EGDIR}/php.ini-recommended ${PKG_SYSCONFDIR}/php.ini OWN_DIRS= ${PREFIX}/${PHP_EXTENSION_DIR} diff --git a/www/php4/Makefile.common b/www/php4/Makefile.common index 235f9a14ec3..c022c2c15ad 100644 --- a/www/php4/Makefile.common +++ b/www/php4/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.50 2005/11/01 23:12:15 jdolecek Exp $ +# $NetBSD: Makefile.common,v 1.51 2005/12/05 20:51:13 rillig Exp $ DISTNAME?= php-${PHP_DIST_VERS} CATEGORIES+= www php4 @@ -30,7 +30,7 @@ PHP_DISTFILE= ${DISTNAME}${EXTRACT_SUFX} # of the Zend API. # PHP_EXTENSION_DIR= lib/php/20020429 -PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR} +PLIST_SUBST+= PHP_EXTENSION_DIR=${PHP_EXTENSION_DIR:Q} PKG_SYSCONFVAR?= php diff --git a/www/php4/Makefile.php b/www/php4/Makefile.php index 29638d76078..2deedb90c01 100644 --- a/www/php4/Makefile.php +++ b/www/php4/Makefile.php @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.php,v 1.33 2005/11/11 07:04:57 rillig Exp $ +# $NetBSD: Makefile.php,v 1.34 2005/12/05 20:51:13 rillig Exp $ .include "../../www/php4/Makefile.common" @@ -6,7 +6,7 @@ DISTINFO_FILE= ${.CURDIR}/../../www/php4/distinfo PATCHDIR= ${.CURDIR}/../../www/php4/patches -BUILD_DEFS= USE_INET6 +BUILD_DEFS+= USE_INET6 USE_LIBTOOL= YES GNU_CONFIGURE= YES diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile index 354b3b0272b..824e86db46c 100644 --- a/www/privoxy/Makefile +++ b/www/privoxy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.19 2005/08/23 11:48:51 rillig Exp $ +# $NetBSD: Makefile,v 1.20 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= ${PKGNAME_NOREV}-stable-src @@ -56,8 +56,8 @@ OWN_DIRS_PERMS+= /var/log/privoxy ${USER_GROUP} 0775 DEINSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL INSTALL_EXTRA_TMPL= ${.CURDIR}/INSTALL -FILES_SUBST+= EGDIR=${EGDIR} -FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER} +FILES_SUBST+= EGDIR=${EGDIR:Q} +FILES_SUBST+= PRIVOXY_USER=${PRIVOXY_USER:Q} pre-configure: @cd ${WRKSRC} && \ diff --git a/www/py-HTMLgen/Makefile b/www/py-HTMLgen/Makefile index 71a450177f8..ca2b3d23af0 100644 --- a/www/py-HTMLgen/Makefile +++ b/www/py-HTMLgen/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.6 2004/07/22 09:16:00 recht Exp $ +# $NetBSD: Makefile,v 1.7 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= HTMLgen @@ -13,7 +13,7 @@ HOMEPAGE= http://starship.python.net/crew/friedrich/HTMLgen/html/main.html COMMENT= Class library for the generation of HTML documents NO_BUILD= yes -MAKE_ENV+= PYTHONBIN=${PYTHONBIN} +MAKE_ENV+= PYTHONBIN=${PYTHONBIN:Q} PY_PATCHPLIST= yes .include "../../lang/python/extension.mk" diff --git a/www/py-curl/Makefile b/www/py-curl/Makefile index 689d5de367a..43c863135e0 100644 --- a/www/py-curl/Makefile +++ b/www/py-curl/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.24 2005/05/17 13:30:09 adam Exp $ +# $NetBSD: Makefile,v 1.25 2005/12/05 20:51:14 rillig Exp $ DISTNAME= pycurl-7.13.2 PKGNAME= ${PYPKGPREFIX}-${DISTNAME:S/py//} @@ -12,7 +12,7 @@ COMMENT= Python module interface to the cURL library PYDISTUTILSPKG= # defined PYBINMODULE= # defined PYTHON_VERSIONS_ACCEPTED= 23 22 -PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX} +PLIST_SUBST+= PYVERSSUFFIX=${PYVERSSUFFIX:Q} BUILDLINK_DEPENDS.curl+= curl>=7.12.1 diff --git a/www/ruby-fcgi/Makefile b/www/ruby-fcgi/Makefile index e2e5943fb1d..54752358018 100644 --- a/www/ruby-fcgi/Makefile +++ b/www/ruby-fcgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/04/11 21:48:01 tv Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:14 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} DOCS= README README.signals post-install: diff --git a/www/sarg/Makefile b/www/sarg/Makefile index 7dd74d000dc..6130fef64ec 100644 --- a/www/sarg/Makefile +++ b/www/sarg/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.3 2005/10/07 17:57:59 reed Exp $ +# $NetBSD: Makefile,v 1.4 2005/12/05 20:51:14 rillig Exp $ DISTNAME= sarg-1.4.1 CATEGORIES= www @@ -30,8 +30,8 @@ SARG_REPORTSDIR?= /var/sarg OWN_DIRS+= ${SARG_REPORTSDIR} ${CFLNG} -FILES_SUBST+= SQUID_ACCESSLOG=${SQUID_ACCESSLOG} \ - SARG_REPORTSDIR=${SARG_REPORTSDIR} +FILES_SUBST+= SQUID_ACCESSLOG=${SQUID_ACCESSLOG:Q} \ + SARG_REPORTSDIR=${SARG_REPORTSDIR:Q} SUBST_CLASSES+= sargconf SUBST_MESSAGE.sargconf= "[Adjust values in SARG configuration files]" SUBST_STAGE.sargconf= post-configure @@ -41,7 +41,7 @@ SUBST_SED.sargconf= ${FILES_SUBST_SED} BUILD_DEFS+= SQUID_ACCESSLOG SARG_REPORTSDIR MAKE_ENV+= PKG_FLAGS="-DSQUID_ACCESSLOG='\"${SQUID_ACCESSLOG}\"' \ -DSARG_REPORTSDIR='\"${SARG_REPORTSDIR}\"'" \ - EGDIR="${EGDIR}" + EGDIR=${EGDIR:Q} CONF_FILES= ${EGDIR}/sarg.conf ${PKG_SYSCONFDIR}/sarg.conf \ ${EGDIR}/exclude_codes ${PKG_SYSCONFDIR}/exclude_codes \ diff --git a/www/screws/Makefile b/www/screws/Makefile index 98ee23bd266..b5a4941433a 100644 --- a/www/screws/Makefile +++ b/www/screws/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.11 2005/09/04 05:00:37 jlam Exp $ +# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= screws-0.56 @@ -18,8 +18,8 @@ BUILD_DEFS+= SCREWS_USER SCREWS_GROUP PKG_USERS= ${SCREWS_USER}:${SCREWS_GROUP} PKG_GROUPS= ${SCREWS_GROUP} -MAKE_ENV+= ETCPREFIX=${PKG_SYSCONFDIR} -MAKE_ENV+= PERL="${PERL5}" +MAKE_ENV+= ETCPREFIX=${PKG_SYSCONFDIR:Q} +MAKE_ENV+= PERL=${PERL5:Q} EGDIR= ${PREFIX}/share/examples CONF_FILES= ${EGDIR}/default.conf ${PKG_SYSCONFDIR}/screws.conf diff --git a/www/snownews/Makefile b/www/snownews/Makefile index f4c0b6e0ac2..c2c28815336 100644 --- a/www/snownews/Makefile +++ b/www/snownews/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/10/26 12:44:21 tonio Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $ DISTNAME= snownews-1.5.7 PKGREVISION= 2 @@ -22,7 +22,7 @@ REPLACE_PERL+= configure opml2snow snowsync CONFIGURE_ARGS+= --prefix=${PREFIX} MAKE_ENV+= PKG_LOCALEDIR=${PKGLOCALEDIR:Q} -MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:Q} +MAKE_ENV+= EXTRA_CFLAGS=${CFLAGS:M*:Q} # XXX -lintl hack suggested by Jeremy C. Reed: blocking on PR #23369 .include "../../devel/gettext-lib/buildlink3.mk" diff --git a/www/spfc/Makefile b/www/spfc/Makefile index 168b0f9a306..5ee0087c507 100644 --- a/www/spfc/Makefile +++ b/www/spfc/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:42 jlam Exp $ +# $NetBSD: Makefile,v 1.17 2005/12/05 20:51:14 rillig Exp $ DISTNAME= spfc-0.2.0 CATEGORIES= www java @@ -15,7 +15,7 @@ DEPENDS+= jsdk-2.0:../../www/jsdk20 WRKSRC= ${WRKDIR}/spfc-0.2.0/src/ USE_TOOLS+= gmake -NO_CONFIGURE= +NO_CONFIGURE= yes MAKE_ENV+= CLASSPATH=${CLASSPATH}:${PREFIX}/lib/jsdk.jar do-install: diff --git a/www/surfraw/Makefile b/www/surfraw/Makefile index 0c704da458a..4fede6a61b2 100644 --- a/www/surfraw/Makefile +++ b/www/surfraw/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.27 2005/08/19 18:12:39 jlam Exp $ +# $NetBSD: Makefile,v 1.28 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= surfraw-1.0.7 @@ -18,8 +18,8 @@ CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} # Override sysconfdir so that the installation puts the example config file # in ${EGDIR}. # -MAKE_FLAGS+= sysconfdir=${EGDIR} -MAKE_ENV+= AM_MAKEFLAGS="${MAKE_FLAGS}" +MAKE_FLAGS+= sysconfdir=${EGDIR:Q} +MAKE_ENV+= AM_MAKEFLAGS=${MAKE_FLAGS:Q} DOCDIR= ${PREFIX}/share/doc/surfraw EGDIR= ${PREFIX}/share/examples/${PKGBASE} diff --git a/www/tcl-cgi/Makefile b/www/tcl-cgi/Makefile index 999d4bea705..7092bb39e36 100644 --- a/www/tcl-cgi/Makefile +++ b/www/tcl-cgi/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2004/04/13 02:57:02 minskim Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= cgi.tcl @@ -13,7 +13,7 @@ COMMENT= Library of Tcl procedures to assist in writing CGI scripts DEPENDS+= tcl>=8.3.2:../../lang/tcl WRKSRC= ${WRKDIR}/cgi.tcl-1.3 -DIST_SUBDIR= ${PKGNAME} +DIST_SUBDIR= ${PKGNAME_NOREV} GNU_CONFIGURE= yes diff --git a/www/thy/Makefile b/www/thy/Makefile index 979a7effa3d..4e3bc8e3d71 100644 --- a/www/thy/Makefile +++ b/www/thy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/09/06 15:19:31 adam Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:14 rillig Exp $ DISTNAME= thy-0.9.4 CATEGORIES= www @@ -37,7 +37,7 @@ RCD_SCRIPTS= thy INFO_FILES= thy.info CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR} -MAKE_FLAGS+= pkgconfdir=${EGDIR} +MAKE_FLAGS+= pkgconfdir=${EGDIR:Q} EGDIR= ${PREFIX}/share/examples/thy diff --git a/www/tidy/Makefile b/www/tidy/Makefile index e3154f3ce20..3d64baa6a03 100644 --- a/www/tidy/Makefile +++ b/www/tidy/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.20 2005/10/04 18:00:49 wiz Exp $ +# $NetBSD: Makefile,v 1.21 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= tidy_src_050921 @@ -14,7 +14,7 @@ MAINTAINER= asmodai@in-nomine.org HOMEPAGE= http://tidy.sourceforge.net/ COMMENT= Fixes and tidies up HTML files -BUILD_DEPENDS= libxslt>=1.1.0:../../textproc/libxslt +BUILD_DEPENDS+= libxslt>=1.1.0:../../textproc/libxslt WRKSRC= ${WRKDIR}/tidy NO_CONFIGURE= yes diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common index fdcc4ab7cde..00786d548b8 100644 --- a/www/w3m/Makefile.common +++ b/www/w3m/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.40 2005/07/30 11:31:46 wiz Exp $ +# $NetBSD: Makefile.common,v 1.41 2005/12/05 20:51:14 rillig Exp $ # DISTNAME= w3m-${W3M_VERS} @@ -10,7 +10,7 @@ HOMEPAGE= http://w3m.sourceforge.net/ PKG_INSTALLATION_TYPES= overwrite pkgviews -GNU_CONFIGURE= # defined +GNU_CONFIGURE= yes USE_TOOLS+= gmake # Needed for some combinations of options... W3M_VERS= 0.5.1 diff --git a/www/websvn/Makefile b/www/websvn/Makefile index 472008ab518..766f36b3223 100644 --- a/www/websvn/Makefile +++ b/www/websvn/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.8 2005/09/28 14:31:09 rillig Exp $ +# $NetBSD: Makefile,v 1.9 2005/12/05 20:51:15 rillig Exp $ # DISTNAME= WebSVN_161 @@ -22,7 +22,7 @@ PKG_SYSCONFDIR.websvn= ${PREFIX}/${HTTPD_ROOT}/websvn/include MESSAGE_SUBST+= PKGBASE=${PKGBASE} MESSAGE_SUBST+= HTTPD_ROOT=${HTTPD_ROOT} -PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT} +PLIST_SUBST+= HTTPD_ROOT=${HTTPD_ROOT:Q} HTTPD_ROOT?= share/httpd/htdocs diff --git a/www/wml/Makefile b/www/wml/Makefile index 331de90f3aa..54a0b86e08a 100644 --- a/www/wml/Makefile +++ b/www/wml/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.23 2005/08/06 06:19:41 jlam Exp $ +# $NetBSD: Makefile,v 1.24 2005/12/05 20:51:15 rillig Exp $ # DISTNAME= wml-2.0.9 @@ -19,14 +19,14 @@ 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} \ --with-openworld \ --with-tidy=${LOCALBASE}/bin/tidy TEST_TARGET= test -INCOMPAT_CURSES= NetBSD-1.5* NetBSD-1.6[-_.]* -INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]* +INCOMPAT_CURSES= NetBSD-1.5*-* NetBSD-1.6[-_.]*-* +INCOMPAT_CURSES+= NetBSD-1.6[A-Z]-* NetBSD-1.6Z[A-C]*-* PERL_ARCHNAME_cmd= eval `${PERL5} -V:archname 2>/dev/null`; \ ${ECHO} $${archname} diff --git a/www/wwwoffle/Makefile b/www/wwwoffle/Makefile index a0364782d0c..cbec59172e0 100644 --- a/www/wwwoffle/Makefile +++ b/www/wwwoffle/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.57 2005/11/01 12:22:24 abs Exp $ +# $NetBSD: Makefile,v 1.58 2005/12/05 20:51:15 rillig Exp $ DISTNAME= wwwoffle-2.8e PKGREVISION= 1 @@ -19,7 +19,7 @@ CONFIGURE_ARGS+= --with-confdir=${PKG_SYSCONFDIR} CONFIGURE_ARGS+= --with-spooldir=${VARBASE}/wwwoffle PKG_SYSCONFSUBDIR= wwwoffle -PLIST_SUBST+= GZIP_CMD="${GZIP_CMD}" +PLIST_SUBST+= GZIP_CMD=${GZIP_CMD:Q} INSTALL_EXTRA_TMPL= ${PKGDIR}/INSTALL RCD_SCRIPTS= wwwoffled diff --git a/www/zope25-CMFPlone/Makefile b/www/zope25-CMFPlone/Makefile index 4ff902e69cb..b5107befa10 100644 --- a/www/zope25-CMFPlone/Makefile +++ b/www/zope25-CMFPlone/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.12 2005/09/28 12:37:53 rillig Exp $ +# $NetBSD: Makefile,v 1.13 2005/12/05 20:51:15 rillig Exp $ DISTNAME= CMFPlone1.0.3 PKGNAME= zope25-CMFPlone-1.0.3 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.plone.org/ COMMENT= Content Management System -BUILDLINK_DEPENDS.zope= zope-2.6.* +BUILDLINK_DEPENDS.zope+= zope-2.6.* DEPENDS+= zope25-CMF-[0-9]*:../../www/zope25-CMF DEPENDS+= zope25-Formulator-[0-9]*:../../www/zope25-Formulator diff --git a/www/zope25-EasyImage/Makefile b/www/zope25-EasyImage/Makefile index e9b0a249d68..858d35a7f68 100644 --- a/www/zope25-EasyImage/Makefile +++ b/www/zope25-EasyImage/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:03 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:15 rillig Exp $ DISTNAME= EasyImage15 PKGREVISION= 2 @@ -7,7 +7,7 @@ CATEGORIES= www MASTER_SITES= http://www.zope.org/Members/regebro/easyimage/ EXTRACT_SUFX= .zip -BUILDLINK_DEPENDS.pyimaging= ${PYPKGPREFIX}-imaging>=1.1.3 +BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3 MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.zope.org/Members/regebro/easyimage diff --git a/www/zope25-JPicture/Makefile b/www/zope25-JPicture/Makefile index 84f6f924626..0474c1fed62 100644 --- a/www/zope25-JPicture/Makefile +++ b/www/zope25-JPicture/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.9 2005/04/11 21:48:03 tv Exp $ +# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:15 rillig Exp $ DISTNAME= JPicture-2_0 PKGREVISION= 2 @@ -7,7 +7,7 @@ CATEGORIES= www MASTER_SITES= http://www.dataflake.org/software/jpicture/ EXTRACT_SUFX= .tgz -BUILDLINK_DEPENDS.pyimaging= ${PYPKGPREFIX}-imaging>=1.1.3 +BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3 MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.dataflake.org/software/jpicture/ diff --git a/www/zope25-PropertyFolder/Makefile b/www/zope25-PropertyFolder/Makefile index c4f93d0b37b..f1e25e1db12 100644 --- a/www/zope25-PropertyFolder/Makefile +++ b/www/zope25-PropertyFolder/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2003/07/22 04:14:44 martti Exp $ +# $NetBSD: Makefile,v 1.8 2005/12/05 20:51:15 rillig Exp $ DISTNAME= PropertyFolder-1.3.3 PKGNAME= zope25-PropertyFolder-1.3.3 @@ -9,7 +9,7 @@ MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.zope.org/Members/mjablonski/PropertyFolder COMMENT= The folderish friend of the PropertyObject -BUILDLINK_DEPENDS.zope= zope>=2.6.1 +BUILDLINK_DEPENDS.zope+= zope>=2.6.1 .include "../../www/zope25/product.mk" .include "../../mk/bsd.pkg.mk" diff --git a/www/zope25-ZPhotoSlides/Makefile b/www/zope25-ZPhotoSlides/Makefile index c81ae03da17..041492a08b2 100644 --- a/www/zope25-ZPhotoSlides/Makefile +++ b/www/zope25-ZPhotoSlides/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2005/04/11 21:48:03 tv Exp $ +# $NetBSD: Makefile,v 1.18 2005/12/05 20:51:15 rillig Exp $ DISTNAME= ZPhotoSlides-1.1b PKGNAME= zope25-ZPhotoSlides-1.1b @@ -7,7 +7,7 @@ CATEGORIES= www MASTER_SITES= http://www.zope.org/Members/p3b/ZPhotoSlides/ DEPENDS+= zope25-LocalFS-[0-9]*:../../www/zope25-LocalFS -BUILDLINK_DEPENDS.pyimaging= ${PYPKGPREFIX}-imaging>=1.1.3 +BUILDLINK_DEPENDS.pyimaging+= ${PYPKGPREFIX}-imaging>=1.1.3 MAINTAINER= tech-pkg@NetBSD.org HOMEPAGE= http://www.zope.org/Members/p3b/ZPhotoSlides |