In packages with djb-style compile scripts, properly enquote ${CC}

and ${CFLAGS}. This fixes the build of net/djbdns, as well as any
other of these packages passing down PKG_SYSCONFDIR via CFLAGS, as
well as being more generally correct for arbitrary user-defined
CFLAGS. Suggested by jlam.

For consistency across djbware in pkgsrc:

* In math/djbfft's and sysutils/daemontools's do-configure targets,
  remove leading @ from ${ECHO} lines; from the former, also remove
  unneeded single quotes from one such line.

* Rename net/publicfile's pre-build and sysutils/service-config's
  post-patch targets to do-configure.

* In sysutils/checkpassword's do-configure target, reorder creation
  of conf-cc, conf-ld, and conf-home.

All of the affected packages have been verified to compile.

XXX These packages probably have enough build goo in common to
XXX warrant an mk/djbware.mk. I'll investigate this post-freeze.

11 files changed, 33 insertions, 33 deletions

diff --git a/mail/dot-forward/Makefile b/mail/dot-forward/Makefile
index c227b93c913..7109025df05 100644
--- a/mail/dot-forward/Makefile
+++ b/mail/dot-forward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		dot-forward-0.71
@@ -22,8 +22,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/ezmlm/Makefile.common b/mail/ezmlm/Makefile.common
index 6fbf46f3dc7..70e0f56c34d 100644
--- a/mail/ezmlm/Makefile.common
+++ b/mail/ezmlm/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile.common,v 1.6 2005/03/13 03:25:44 schmonz Exp $
 #
 
 EZMLM_VERS=	ezmlm-0.53
@@ -15,8 +15,8 @@ BUILD_TARGET=	it man install
 INSTALL_TARGET=	setup
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
 	${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
diff --git a/mail/fastforward/Makefile b/mail/fastforward/Makefile
index e15eb683448..05462e2734e 100644
--- a/mail/fastforward/Makefile
+++ b/mail/fastforward/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		fastforward-0.51
@@ -24,8 +24,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mess822/Makefile b/mail/mess822/Makefile
index 7b003a17892..5451920fe4a 100644
--- a/mail/mess822/Makefile
+++ b/mail/mess822/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/03/07 09:53:33 uebayasi Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		mess822-0.58
@@ -36,8 +36,8 @@ INSTALLATION_DIRS=	bin include lib man man/cat1 man/cat3 man/cat5 man/cat8
 INSTALLATION_DIRS+=	man/man1 man/man3 man/man5 man/man8 share/examples/mess822
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
diff --git a/mail/qmail-conf/Makefile b/mail/qmail-conf/Makefile
index af295cc282f..7cb22020760 100644
--- a/mail/qmail-conf/Makefile
+++ b/mail/qmail-conf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		qmail-conf-0.60
@@ -24,8 +24,8 @@ BUILD_TARGET=		it
 INSTALL_TARGET= 	setup check
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${LOCALBASE} > ${WRKSRC}/conf-ucspi-tcp
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
diff --git a/mail/qmail-qfilter/Makefile b/mail/qmail-qfilter/Makefile
index a67f811f820..5cb9281ed89 100644
--- a/mail/qmail-qfilter/Makefile
+++ b/mail/qmail-qfilter/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/21 00:14:13 schmonz Exp $
+# $NetBSD: Makefile,v 1.9 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		qmail-qfilter-2.0
@@ -33,8 +33,8 @@ INSTALLATION_DIRS=	bin man man/man1 share/examples/qmail-qfilter
 .include "../../mk/bsd.prefs.mk"
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin
 	${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man
 	${ECHO} ${PREFIX}/include/bglibs > ${WRKSRC}/conf-bgincs
diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile
index 494c434eb16..906dae86e7a 100644
--- a/mail/qmail/Makefile
+++ b/mail/qmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/12/21 05:32:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.31 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		netqmail-1.05
@@ -100,8 +100,8 @@ post-extract:
 	${MV} ${PKGNAME_NOREV} ..; ${MV} ${DISTNAME}.patch ..
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 
 post-build:
diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile
index b68a77c7c2d..872f45021d2 100644
--- a/mail/qmailanalog/Makefile
+++ b/mail/qmailanalog/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		qmailanalog-0.70
@@ -19,8 +19,8 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX}/qmailanalog > ${WRKSRC}/conf-home
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile
index 234e757ccfa..b8188c50629 100644
--- a/mail/qtools/Makefile
+++ b/mail/qtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=	qtools-0.56
@@ -18,8 +18,8 @@ BUILD_TARGET=	it
 INSTALL_TARGET=	setup check
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${QMAILDIR} > ${WRKSRC}/conf-qmail
 	${ECHO} ${PREFIX} > ${WRKSRC}/conf-ezmlm
 	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
diff --git a/mail/queue-fix/Makefile b/mail/queue-fix/Makefile
index bf54d9e9029..14477dc8959 100644
--- a/mail/queue-fix/Makefile
+++ b/mail/queue-fix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		queue-fix
@@ -19,8 +19,8 @@ BUILD_TARGET=		it
 INSTALLATION_DIRS=	bin share/doc/queue-fix
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/queue-fix ${PREFIX}/bin
diff --git a/mail/safecat/Makefile b/mail/safecat/Makefile
index ef3bbaab0c9..2b4ffa5c2b8 100644
--- a/mail/safecat/Makefile
+++ b/mail/safecat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		safecat-1.12
@@ -15,8 +15,8 @@ BUILD_TARGET=		it install instcheck
 INSTALL_TARGET=		setup check
 
 do-configure:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX} > ${WRKSRC}/conf-root
 
 .include "../../mk/bsd.pkg.mk"