8 files changed, 21 insertions, 22 deletions
diff --git a/time/anacron/Makefile b/time/anacron/Makefile
index fffe573d02f..a29bec3346a 100644
--- a/time/anacron/Makefile
+++ b/time/anacron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:08 rillig Exp $
 #
 
 DISTNAME=	anacron-2.3
@@ -33,13 +33,13 @@ SUBST_SED.man=		-e 's|/etc/anacrontab|${PKG_SYSCONFDIR}/anacrontab|g'
 
 MAKE_FLAGS+=		ANACRONTAB='${PKG_SYSCONFDIR}/anacrontab'
 MAKE_FLAGS+=		BINDIR='${PREFIX}/sbin'
-MAKE_FLAGS+=		CFLAGS='${CFLAGS}'
-MAKE_FLAGS+=		INSTALL_DATA='${INSTALL_DATA}'
-MAKE_FLAGS+=		INSTALL_DIR='${TRUE}'
-MAKE_FLAGS+=		INSTALL_PROGRAM='${INSTALL_PROGRAM}'
+MAKE_FLAGS+=		CFLAGS=${CFLAGS:M*:Q}
+MAKE_FLAGS+=		INSTALL_DATA=${INSTALL_DATA:Q}
+MAKE_FLAGS+=		INSTALL_DIR=${TRUE:Q}
+MAKE_FLAGS+=		INSTALL_PROGRAM=${INSTALL_PROGRAM:Q}
 MAKE_FLAGS+=		MANDIR='${PREFIX}/man'
-MAKE_FLAGS+=		PREFIX='${PREFIX}'
-MAKE_FLAGS+=		SHELL='${SH}'
+MAKE_FLAGS+=		PREFIX=${PREFIX:Q}
+MAKE_FLAGS+=		SHELL=${SH:Q}
 MAKE_FLAGS+=		SPOOLDIR='/var/spool/anacron'
 
 EGDIR=			${PREFIX}/share/examples/anacron
diff --git a/time/gnutime/Makefile b/time/gnutime/Makefile
index 720a4596438..7a95697a0f8 100644
--- a/time/gnutime/Makefile
+++ b/time/gnutime/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:44 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/12/05 20:51:08 rillig Exp $
 #
 
 DISTNAME=		time-1.7
@@ -14,7 +14,7 @@ GNU_CONFIGURE=		yes
 INFO_FILES=		time.info
 
 CONFIGURE_ARGS+=	--program-prefix=${GNU_PROGRAM_PREFIX}
-PLIST_SUBST+=		GNU_PROGRAM_PREFIX="${GNU_PROGRAM_PREFIX}"
+PLIST_SUBST+=		GNU_PROGRAM_PREFIX=${GNU_PROGRAM_PREFIX:Q}
 BUILD_DEFS+=		GNU_PROGRAM_PREFIX
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/ical/Makefile b/time/ical/Makefile
index 8db147c2b0e..df9ed0ac30b 100644
--- a/time/ical/Makefile
+++ b/time/ical/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/12/05 20:51:08 rillig Exp $
 
 DISTNAME=	ical-2.3.1
 PKGREVISION=	1
@@ -13,7 +13,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--prefix=${PREFIX} \
+CONFIGURE_ARGS+= --prefix=${PREFIX} \
 		--with-tclconfig=${BUILDLINK_PREFIX.tcl}/lib \
 		--with-tclsh=${BUILDLINK_PREFIX.tcl}/bin/tclsh \
 		--with-tkconfig=${BUILDLINK_PREFIX.tk}/lib
diff --git a/time/pcal/Makefile b/time/pcal/Makefile
index e0d44a4614f..50498e137e9 100644
--- a/time/pcal/Makefile
+++ b/time/pcal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/08 18:22:49 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	pcal-4.7
@@ -17,8 +17,8 @@ CGIBINDIR=	${PREFIX}/libexec/cgi-bin
 WWWSERVER=	${HOSTNAME_CMD:sh}
 
 .include "../../mk/bsd.prefs.mk"	# for PAPERSIZE
-MAKE_ENV+=	PAPERSIZE="${PAPERSIZE}"
-MAKE_ENV+=	CC="${CC}" HOST_CC="${CC}"
+MAKE_ENV+=	PAPERSIZE=${PAPERSIZE:Q}
+MAKE_ENV+=	CC=${CC:Q} HOST_CC=${CC:Q}
 
 BUILD_TARGET=	pcal
 
diff --git a/time/pclock/Makefile b/time/pclock/Makefile
index aa0c7de1b48..6d4fe3a644c 100644
--- a/time/pclock/Makefile
+++ b/time/pclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:23 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	pclock_0.13.1.orig
@@ -12,7 +12,7 @@ COMMENT=	Simple analog clock designed for Window Maker
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}.orig
 
-MAKE_ENV+=	LN=${LN}
+MAKE_ENV+=	LN=${LN:Q}
 
 post-install:
 		${INSTALL_DATA_DIR} ${PREFIX}/share/pclock
diff --git a/time/ptimetracker/Makefile b/time/ptimetracker/Makefile
index 0f3a1fcd17e..f452cfa9ad8 100644
--- a/time/ptimetracker/Makefile
+++ b/time/ptimetracker/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:38 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/12/05 20:51:09 rillig Exp $
 
 DISTNAME=	ptimetracker-1.7.3
-PKGREVISION=	# empty
 CATEGORIES=	time kde
 MASTER_SITES=	http://www.eggtart.plus.com/ptt/prog/
 
diff --git a/time/sunclock/Makefile b/time/sunclock/Makefile
index b99a8160ea8..779507560a5 100644
--- a/time/sunclock/Makefile
+++ b/time/sunclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:47:45 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	sunclock-1.5
@@ -10,6 +10,6 @@ COMMENT=	Show which portion of the Earth's surface is illuminated by the Sun
 
 USE_IMAKE=	yes
 
-CPPFLAGS.SunOS=	-DUSE_PUTENV
+CPPFLAGS.SunOS+=	-DUSE_PUTENV
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/time/wmmoonclock/Makefile b/time/wmmoonclock/Makefile
index eeab2ea69e6..8c2354ed9c9 100644
--- a/time/wmmoonclock/Makefile
+++ b/time/wmmoonclock/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/05/22 20:08:43 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/12/05 20:51:09 rillig Exp $
 #
 
 DISTNAME=	wmMoonClock-1.27
@@ -13,7 +13,7 @@ WRKSRC=         ${WRKDIR}/${DISTNAME}/Src
 USE_TOOLS+=	gmake
 USE_X11BASE=	YES
 
-MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS}
+MAKE_FLAGS+=    EXTRA_LOCAL_LIBS=${EXTRA_LOCAL_LIBS:Q}
 
 .include "../../mk/bsd.prefs.mk"