echo -> ${ECHO} or ${ECHO_MSG} and in some cases, move echo stuff

to pkg/MESSAGE and use ${CAT} ${PKGMESSAGE}

6 files changed, 25 insertions, 25 deletions

diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile
index 8c1834e12b87..73353a042823 100644
--- a/textproc/docbook-241/Makefile
+++ b/textproc/docbook-241/Makefile
@@ -5,7 +5,7 @@
 #
 # Based heavily on work by jfieber.
 #
-# $Id: Makefile,v 1.2 1999/05/05 17:40:15 nik Exp $
+# $Id: Makefile,v 1.3 1999/08/22 19:00:09 mharo Exp $
 #
 
 DISTNAME=	docbook-241
@@ -31,7 +31,7 @@ pre-install:
 do-install:
 	@zcat ${DISTDIR}/docbk241.tar.Z |(cd ${INSTDIR}/2.4.1; pax -r)
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/2.4.1/catalog
-	@echo "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/2.4.1/catalog
+	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/2.4.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/2.4.1/*
 	@${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile
index 7ad92568afac..c72e51e589ff 100644
--- a/textproc/docbook-300/Makefile
+++ b/textproc/docbook-300/Makefile
@@ -5,7 +5,7 @@
 #
 # Based heavily on work by jfieber
 #
-# $Id: Makefile,v 1.2 1999/05/05 17:40:23 nik Exp $
+# $Id: Makefile,v 1.3 1999/08/22 19:00:10 mharo Exp $
 #
 
 DISTNAME=	docbook-3.0
@@ -31,7 +31,7 @@ pre-install:
 do-install:
 	@zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/3.0; pax -r)
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.0/catalog
-	@echo "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
+	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/*
 	@${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile
index 1cb16ed07cef..2d4f5fe6c5a9 100644
--- a/textproc/docbook-310/Makefile
+++ b/textproc/docbook-310/Makefile
@@ -5,7 +5,7 @@
 #
 # Based heavily on work by jfieber
 #
-# $Id: Makefile,v 1.4 1999/05/05 17:40:24 nik Exp $
+# $Id: Makefile,v 1.5 1999/08/22 19:00:11 mharo Exp $
 #
 
 DISTNAME=	docbk31
@@ -32,7 +32,7 @@ pre-install:
 do-install:
 	@unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1
 	@${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog
-	@echo "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
+	@${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog
 	@${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/*
 	@${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${INSTDIR}
 
diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile
index aa7691902c9d..481fe6c44e06 100644
--- a/textproc/ispell/Makefile
+++ b/textproc/ispell/Makefile
@@ -4,7 +4,7 @@
 # Date created:         6 November 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.28 1999/07/04 18:21:51 obrien Exp $
+# $Id: Makefile,v 1.29 1999/08/13 00:13:14 jmz Exp $
 #
 
 DISTNAME=	ispell-3.1
@@ -27,10 +27,10 @@ MLINKS=		ispell.1 buildhash.1 ispell.1 findaffix.1 ispell.1 munchlist.1\
 .if !defined(ISPELL_FR)
 .if (make(patch) || make(configure) || make(build) || make (install))
 .BEGIN:
-	@echo '*********************************************************'
-	@echo '* Note that you can build a french or british version   *'
-	@echo '* by typing "make french" or "make british"             *'
-	@echo '*********************************************************'
+	@${ECHO_MSG} '*********************************************************'
+	@${ECHO_MSG} '* Note that you can build a french or british version   *'
+	@${ECHO_MSG} '* by typing "make french" or "make british"             *'
+	@${ECHO_MSG} '*********************************************************'
 .endif
 .else
 EXTRA_DICT=	francais-IREQ-1.4.tar.gz
@@ -40,28 +40,28 @@ DISTFILES+=	${EXTRA_DICT}
 
 pre-extract:
 .if !defined(LANG)
-	@echo '******************************************************'
-	@echo '* Note that you can build a british version by       *'
-	@echo '* typing "make british" following a "make clean"     *'
-	@echo '******************************************************'
+	@${ECHO_MSG} '******************************************************'
+	@${ECHO_MSG} '* Note that you can build a british version by       *'
+	@${ECHO_MSG} '* typing "make british" following a "make clean"     *'
+	@${ECHO_MSG} '******************************************************'
 .endif
 
 pre-configure:
 .if defined(EXTRA_DICT)
-	@echo ${EXTRA_DICT} > ${WRKDIR}/extra_dict
+	@${ECHO} ${EXTRA_DICT} > ${WRKDIR}/extra_dict
 .else
-	@echo -n
+	@${ECHO} -n
 .endif
 
 post-configure:
-	@echo "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
+	@${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h
 
 british:
-	@echo "Okay, making a british version of ispell...."
+	@${ECHO_MSG} "Okay, making a british version of ispell...."
 	@${MAKE} ${.MAKEFLAGS} LANG=british all
 
 french:
-	@echo "Okay, making a french/english version of ispell...."
+	@${ECHO_MSG} "Okay, making a french/english version of ispell...."
 	@${MAKE} ${.MAKEFLAGS} ISPELL_FR=yes
 
 pre-install:
diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile
index 3537640929ef..a7c91f8dd9fb 100644
--- a/textproc/nicetext/Makefile
+++ b/textproc/nicetext/Makefile
@@ -3,7 +3,7 @@
 # Date created:		20 February 1998
 # Whom:			Mark Chapman <markc@ctgi.net>
 #
-# $Id: Makefile,v 1.1.1.1 1999/05/03 02:40:33 steve Exp $
+# $Id: Makefile,v 1.2 1999/08/22 19:00:20 mharo Exp $
 
 DISTNAME=	nicetext-0.9
 CATEGORIES=	textproc
@@ -22,8 +22,8 @@ PROGRAMS=	bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \
 		sortdct txt2dct
 
 post-install:
-	@echo "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
-	@echo ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
+	@${ECHO} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd
+	@${ECHO} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd
 	${CHMOD} a+rx ${WRKSRC}/bin/qstart-nttpd
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/qstart-nttpd ${PREFIX}/bin/
 .for f in ${MAN1}
diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile
index d2339fc17aee..5d6ba121e62e 100644
--- a/textproc/yodl/Makefile
+++ b/textproc/yodl/Makefile
@@ -3,7 +3,7 @@
 # Date created:         22 Oct 1997
 # Whom:                 Donald Burr <dburr@FreeBSD.ORG>
 #
-# $Id: Makefile,v 1.1.1.1 1998/07/20 23:55:33 dburr Exp $
+# $Id: Makefile,v 1.2 1999/01/10 10:05:02 simokawa Exp $
 #
 
 DISTNAME=	yodl-1.22
@@ -35,7 +35,7 @@ do-build:
 # this weird contortion is because the YODL makefile is broken
 # trust me, it works.
 do-install:
-	@echo "*** NOTE: any errors from make can be safely ignored."
+	@${ECHO_MSG} "*** NOTE: any errors from make can be safely ignored."
 	(cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX} install)
 	-(cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX} manpages)
 	(cd ${WRKSRC}/manpages && ${GMAKE} PREFIX=${PREFIX} manpages)