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.

3 files changed, 12 insertions, 12 deletions

diff --git a/sysutils/checkpassword/Makefile b/sysutils/checkpassword/Makefile
index 0f75f884484..048ee141984 100644
--- a/sysutils/checkpassword/Makefile
+++ b/sysutils/checkpassword/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=	checkpassword-0.90
@@ -23,8 +23,8 @@ INSTALL_TARGET=	setup check
 INSTALLATION_DIRS=	bin
 
 do-configure:
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/daemontools/Makefile b/sysutils/daemontools/Makefile
index 1849555f9f0..044152f2001 100644
--- a/sysutils/daemontools/Makefile
+++ b/sysutils/daemontools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/12/03 15:15:10 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/03/13 03:25:44 schmonz Exp $
 # FreeBSD Id: ports/sysutils/daemontools/Makefile,v 1.8 2000/12/03 05:16:41 steve Exp
 
 DISTNAME=	daemontools-0.76
@@ -33,9 +33,9 @@ DEINSTALL_FILE=	${WRKDIR}/.DEINSTALL
 INSTALLATION_DIRS=	bin man man/man8 share/examples/daemontools
 
 do-configure:
-	@${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/src/conf-cc
-	@${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/src/conf-ld
-	@${ECHO} ${PREFIX} > ${WRKSRC}/src/conf-home
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/src/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/src/conf-ld
+	${ECHO} ${PREFIX} > ${WRKSRC}/src/conf-home
 
 do-build:
 	cd ${WRKSRC} && package/compile
diff --git a/sysutils/service-config/Makefile b/sysutils/service-config/Makefile
index 5c84d9397be..143e126b70b 100644
--- a/sysutils/service-config/Makefile
+++ b/sysutils/service-config/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/12/03 15:15:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=	service-config-0.51
@@ -19,9 +19,9 @@ RESTRICTED=     "Possibly inherited DJB-style license would prohibit distributio
 NO_BIN_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_FTP=  ${RESTRICTED}
 
-post-patch:
-	${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc
-	${ECHO} "${CC} ${_STRIPFLAG_CC}" > ${WRKSRC}/conf-ld
-	${ECHO} "${PREFIX}" > ${WRKSRC}/conf-home
+do-configure:
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
 
 .include "../../mk/bsd.pkg.mk"