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.
jsonn · Mar 13, 2005 · c36f4b6 · c36f4b6
1 parent 3ffad04
commit c36f4b6
Show file tree

Hide file tree

Showing 20 changed files with 66 additions and 66 deletions.
diff --git a/databases/cdb/Makefile b/databases/cdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/12/03 15:14:53 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2005/03/13 03:25:43 schmonz Exp $
 
 DISTNAME=	cdb-0.75
 CATEGORIES=	databases
@@ -22,8 +22,8 @@ INSTALL_TARGET=	setup check
 INSTALLATION_DIRS=	bin include lib
 
 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
 
 post-install:

diff --git a/devel/bglibs/Makefile b/devel/bglibs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/12/21 00:12:29 schmonz Exp $
+# $NetBSD: Makefile,v 1.2 2005/03/13 03:25:43 schmonz Exp $
 #
 
 DISTNAME=		bglibs-1.019
@@ -12,8 +12,8 @@ COMMENT=		Collection of libraries by Bruce Guenter
 USE_BUILDLINK3=		yes
 
 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
 
 do-install:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"
diff --git a/math/djbfft/Makefile b/math/djbfft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:03 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/03/13 03:25:44 schmonz Exp $
 
 DISTNAME=       djbfft-0.76
 CATEGORIES=     math
@@ -16,11 +16,11 @@ USE_BUILDLINK3=	yes
 NOT_FOR_PLATFORM=	IRIX-*-*
 
 do-configure:
-	@${ECHO} '${CC} ${CFLAGS}' > ${WRKSRC}/conf-cc
-	@${ECHO} '${CC}' > ${WRKSRC}/conf-ld
-	@${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} > ${WRKSRC}/conf-ld
+	${ECHO} ${PREFIX} > ${WRKSRC}/conf-home
 .ifdef(WITH_OPT_PENTIUM)
-	@${ECHO} 'pentium' > ${WRKSRC}/conf-opt
+	${ECHO} pentium > ${WRKSRC}/conf-opt
 .endif
 .ifdef(WITH_OPT_PPRO)
 	@${ECHO} 'ppro' > ${WRKSRC}/conf-opt

diff --git a/net/djbdns/Makefile b/net/djbdns/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2005/03/07 09:41:45 uebayasi Exp $
+# $NetBSD: Makefile,v 1.38 2005/03/13 03:25:44 schmonz Exp $
 # FreeBSD Id: ports/net/djbdns/Makefile,v 1.4 2000/09/28 18:18:41 nbm Exp
 #
 
@@ -50,8 +50,8 @@ CFLAGS+=		--include errno.h
 .include "options.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} > ${WRKSRC}/conf-home
 
 post-install:

diff --git a/net/publicfile/Makefile b/net/publicfile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.8 2005/03/13 03:25:44 schmonz Exp $
 #
 
 DISTNAME=		publicfile-0.52
@@ -19,9 +19,9 @@ RESTRICTED=		"unsure of djb's license"
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_BIN_ON_FTP=		${RESTRICTED}
 
-pre-build:
-	${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
-	${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
+do-configure:
+	${ECHO} ${CC:Q} ${CFLAGS:Q} > ${WRKSRC}/conf-cc
+	${ECHO} ${CC:Q} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
 	${ECHO} ${PREFIX}/publicfile > ${WRKSRC}/conf-home
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/net/ucspi-tcp/Makefile b/net/ucspi-tcp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/12/03 15:15:06 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2005/03/13 03:25:44 schmonz Exp $
 # FreeBSD Id: ports/sysutils/ucspi-tcp/Makefile,v 1.12 2000/07/10 01:41:24 steve Exp
 
 DISTNAME=	ucspi-tcp-0.88
@@ -31,8 +31,8 @@ GCC_REQD+=	3.0
 INSTALLATION_DIRS=	bin man man/man1
 
 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
 
 post-install:

diff --git 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
@@ -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
@@ -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"