3 files changed, 7 insertions, 7 deletions
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