Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command;

the ECHO macro is set to "echo" by default, but it is set to "true" if
make(1) is invoked with the -s option while ECHO_CMD is always set to
the echo command.

12 files changed, 28 insertions, 28 deletions

diff --git a/x11/XFree86-4-documents/Makefile b/x11/XFree86-4-documents/Makefile
index 6149e7d8fab4..86a60191804c 100644
--- a/x11/XFree86-4-documents/Makefile
+++ b/x11/XFree86-4-documents/Makefile
@@ -32,11 +32,11 @@ post-extract:
 
 do-configure:
 	(cd ${WRKSRC} ; \
-	 ${ECHO} "#define BuildMiscDocs YES" > host.def ; \
-	 ${ECHO} "#define BuildSpecsDocs YES" >> host.def ; \
-	 ${ECHO} "#define BuildLinuxDocPS NO" >> host.def ; \
-	 ${ECHO} "#define InstallHardcopyDocs YES" >> host.def ; \
-	 ${ECHO} "#define FreeBSDBuildXdoc YES" >> host.def ; \
+	 ${ECHO_CMD} "#define BuildMiscDocs YES" > host.def ; \
+	 ${ECHO_CMD} "#define BuildSpecsDocs YES" >> host.def ; \
+	 ${ECHO_CMD} "#define BuildLinuxDocPS NO" >> host.def ; \
+	 ${ECHO_CMD} "#define InstallHardcopyDocs YES" >> host.def ; \
+	 ${ECHO_CMD} "#define FreeBSDBuildXdoc YES" >> host.def ; \
 	 imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \
 		-DTOPDIR=.. -DCURDIR=.; \
 	 ${MAKE} Makefiles ; \
diff --git a/x11/XFree86-4/Makefile b/x11/XFree86-4/Makefile
index b513b4b2cb5d..d144e509e2af 100644
--- a/x11/XFree86-4/Makefile
+++ b/x11/XFree86-4/Makefile
@@ -54,7 +54,7 @@ PLIST=		${PKGDIR}/pkg-plist.alpha
 .endif
 
 pre-configure:
-	@if ${ECHO} "$(CFLAGS)" |${GREP} -q O[3456789]; then \
+	@if ${ECHO_CMD} "$(CFLAGS)" |${GREP} -q O[3456789]; then \
 		${ECHO} "XFree86-4 with thread support does not build with optimization"; \
 		${ECHO} "flags different from O or -O2"; \
 		${FALSE}; fi
@@ -124,7 +124,7 @@ post-patch:
 	@${MV} ${WRKDIR}/mgasource/mga-${MGA_DRIVER_DIR}/mga \
 		${WRKSRC}/programs/Xserver/hw/xfree86/drivers
 	@${CP} ${WRKSRC}/config/cf/xf86site.def ${WRKSRC}/config/cf/host.def
-	@${ECHO} "#define HaveMatroxHal YES" >> ${WRKSRC}/config/cf/host.def
+	@${ECHO_CMD} "#define HaveMatroxHal YES" >> ${WRKSRC}/config/cf/host.def
 	@${PERL} -pi.orig -ne 's!(#define PCI_CHIP_MGAG400\s+0x0525)!\1\n#define PCI_CHIP_MGAG550 0x2527\n!; \
 			s!({PCI_CHIP_MGAG400,\s+"MGA G400 AGP",0},)!\1\n{PCI_CHIP_MGAG550, "MGA G550 AGP", 0},\n!' \
 			${WRKSRC}/programs/Xserver/hw/xfree86/common/xf86PciInfo.h
diff --git a/x11/buttonbox/Makefile b/x11/buttonbox/Makefile
index 617f453f9a13..82f46b60ea29 100644
--- a/x11/buttonbox/Makefile
+++ b/x11/buttonbox/Makefile
@@ -27,13 +27,13 @@ do-build:
 		colour.c dispatcher.c main.c
 
 pre-install:
-	${ECHO} bin/buttonbox > ${PLIST}
-	${ECHO} lib/X11/app-defaults/ButtonBox.ad >> ${PLIST}
+	${ECHO_CMD} bin/buttonbox > ${PLIST}
+	${ECHO_CMD} lib/X11/app-defaults/ButtonBox.ad >> ${PLIST}
 .if !defined(NOPORTDOCS)
 	for i in ${DOCS}; \
-		do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
+		do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
 	done
-	${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
+	${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
 .endif
 
 do-install:
diff --git a/x11/kde4-baseapps/Makefile b/x11/kde4-baseapps/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kde4-baseapps/Makefile
+++ b/x11/kde4-baseapps/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kde4-runtime/Makefile b/x11/kde4-runtime/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kde4-runtime/Makefile
+++ b/x11/kde4-runtime/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kde4-workspace/Makefile b/x11/kde4-workspace/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kde4-workspace/Makefile
+++ b/x11/kde4-workspace/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kdebase2/Makefile b/x11/kdebase2/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kdebase2/Makefile
+++ b/x11/kdebase2/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kdebase3/Makefile b/x11/kdebase3/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kdebase3/Makefile
+++ b/x11/kdebase3/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kdebase4-runtime/Makefile b/x11/kdebase4-runtime/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kdebase4-runtime/Makefile
+++ b/x11/kdebase4-runtime/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kdebase4-workspace/Makefile b/x11/kdebase4-workspace/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kdebase4-workspace/Makefile
+++ b/x11/kdebase4-workspace/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/kdebase4/Makefile b/x11/kdebase4/Makefile
index 1173bb45a718..f5be27d77504 100644
--- a/x11/kdebase4/Makefile
+++ b/x11/kdebase4/Makefile
@@ -55,8 +55,8 @@ pre-everything::
 .endif
 
 post-extract:
-	@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
-	@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
+	@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
 
 post-patch:
 .if !defined(WITH_MOTIF)
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index edba17c054f3..7e42cdc43f47 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -22,7 +22,7 @@ USE_XPM=	yes
 MAN1=		xcolorsel.1
 
 post-patch:
-	${ECHO} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
+	${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
 	${PERL} -pi -e "s|#include <malloc.h>||g; s|/Xaw/|/Xaw3d/|g;" \
 		${WRKSRC}/*.[ch]
 	${PERL} -pi -e "s|app2head|./app2head|g; \