pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc In packages with djb-style compile scripts, properly e...
details: https://anonhg.NetBSD.org/pkgsrc/rev/482233471c09
branches: trunk
changeset: 490496:482233471c09
user: schmonz <schmonz%pkgsrc.org@localhost>
date: Sun Mar 13 03:25:43 2005 +0000
description:
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.
diffstat:
databases/cdb/Makefile | 6 +++---
devel/bglibs/Makefile | 6 +++---
mail/dot-forward/Makefile | 6 +++---
mail/ezmlm/Makefile.common | 6 +++---
mail/fastforward/Makefile | 6 +++---
mail/mess822/Makefile | 6 +++---
mail/qmail-conf/Makefile | 6 +++---
mail/qmail-qfilter/Makefile | 6 +++---
mail/qmail/Makefile | 6 +++---
mail/qmailanalog/Makefile | 6 +++---
mail/qtools/Makefile | 6 +++---
mail/queue-fix/Makefile | 6 +++---
mail/safecat/Makefile | 6 +++---
math/djbfft/Makefile | 10 +++++-----
net/djbdns/Makefile | 6 +++---
net/publicfile/Makefile | 8 ++++----
net/ucspi-tcp/Makefile | 6 +++---
sysutils/checkpassword/Makefile | 6 +++---
sysutils/daemontools/Makefile | 8 ++++----
sysutils/service-config/Makefile | 10 +++++-----
20 files changed, 66 insertions(+), 66 deletions(-)
diffs (truncated from 412 to 300 lines):
diff -r 7722400d671e -r 482233471c09 databases/cdb/Makefile
--- a/databases/cdb/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/databases/cdb/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 devel/bglibs/Makefile
--- a/devel/bglibs/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/devel/bglibs/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 mail/dot-forward/Makefile
--- a/mail/dot-forward/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/dot-forward/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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_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 -r 7722400d671e -r 482233471c09 mail/ezmlm/Makefile.common
--- a/mail/ezmlm/Makefile.common Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/ezmlm/Makefile.common Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 mail/fastforward/Makefile
--- a/mail/fastforward/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/fastforward/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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_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 -r 7722400d671e -r 482233471c09 mail/mess822/Makefile
--- a/mail/mess822/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/mess822/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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+= 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 -r 7722400d671e -r 482233471c09 mail/qmail-conf/Makefile
--- a/mail/qmail-conf/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/qmail-conf/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 mail/qmail-qfilter/Makefile
--- a/mail/qmail-qfilter/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/qmail-qfilter/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
.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 -r 7722400d671e -r 482233471c09 mail/qmail/Makefile
--- a/mail/qmail/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/qmail/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
${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 -r 7722400d671e -r 482233471c09 mail/qmailanalog/Makefile
--- a/mail/qmailanalog/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/qmailanalog/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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_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 -r 7722400d671e -r 482233471c09 mail/qtools/Makefile
--- a/mail/qtools/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/qtools/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 mail/queue-fix/Makefile
--- a/mail/queue-fix/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/queue-fix/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 mail/safecat/Makefile
--- a/mail/safecat/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/mail/safecat/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 math/djbfft/Makefile
--- a/math/djbfft/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/math/djbfft/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
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 -r 7722400d671e -r 482233471c09 net/djbdns/Makefile
--- a/net/djbdns/Makefile Sun Mar 13 02:57:26 2005 +0000
+++ b/net/djbdns/Makefile Sun Mar 13 03:25:43 2005 +0000
@@ -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 @@
.include "options.mk"
do-configure:
- ${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc
- ${ECHO} ${CC} ${_STRIPFLAG_CC} > ${WRKSRC}/conf-ld
Home |
Main Index |
Thread Index |
Old Index