From b8f8618362b39a01e2225feef7d298fb22cafe2f Mon Sep 17 00:00:00 2001
From: Michael Haro <mharo@FreeBSD.org>
Date: Fri, 27 Aug 1999 22:30:39 +0000
Subject: echo -> ${ECHO} or ${ECHO_MSG}  and in some cases, move echo stuff to
 pkg/MESSAGE and use ${CAT} ${PKGMESSAGE}

---
 security/crack/Makefile  | 8 ++++----
 security/pgp/Makefile    | 8 ++++----
 security/xinetd/Makefile | 4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

(limited to 'security')

diff --git a/security/crack/Makefile b/security/crack/Makefile
index ae7fddfe6cf3..7064ed682c30 100644
--- a/security/crack/Makefile
+++ b/security/crack/Makefile
@@ -5,7 +5,7 @@
 # Whom:			David O'Brien <obrien@FreeBSD.org>
 # Whom:                 Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp>
 #
-# $Id: Makefile,v 1.6 1997/11/26 01:42:55 obrien Exp $
+# $Id: Makefile,v 1.7 1998/10/10 03:42:59 steve Exp $
 #
 
 DISTNAME=	crack5.0
@@ -27,12 +27,12 @@ pre-configure:
 	@/bin/mv -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig
 	@${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c
 .endif
-	@echo "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
+	@${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile
 
 pre-build:
 	@(if [ ! -f /usr/share/dict/words ];then \
-		echo "You may want to install the dict distribution into /usr/share/dict" ; \
-		echo "to increase the size of the cracking dictionary." ; \
+		${ECHO_MSG} "You may want to install the dict distribution into /usr/share/dict" ; \
+		${ECHO_MSG} "to increase the size of the cracking dictionary." ; \
 	fi)
 
 do-build:
diff --git a/security/pgp/Makefile b/security/pgp/Makefile
index e92ce41410a6..4bc263ecae35 100644
--- a/security/pgp/Makefile
+++ b/security/pgp/Makefile
@@ -5,7 +5,7 @@
 # Date created:         8 Jul 1995
 # Whom:                 ache
 #
-# $Id: Makefile,v 1.26 1999/08/22 23:33:24 mharo Exp $
+# $Id: Makefile,v 1.27 1999/08/23 04:23:54 mharo Exp $
 #
 
 # Pick an initial default, else it doesn't get set in the INDEX.
@@ -39,9 +39,9 @@ do-install:
 
 .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO
 pre-fetch:
-	@echo
-	@echo You must set variable USA_RESIDENT to YES, if you are USA resident
-	@echo or to NO, if you aren\'t USA resident to build this package
+	@${ECHO_MSG}
+	@${ECHO_MSG} You must set variable USA_RESIDENT to YES, if you are USA resident
+	@${ECHO_MSG} or to NO, if you aren\'t USA resident to build this package
 	@${FALSE}
 .elif defined(USA_RESIDENT)
 .if ${USA_RESIDENT} == YES
diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile
index 5cef34aa961f..9f843f32837f 100644
--- a/security/xinetd/Makefile
+++ b/security/xinetd/Makefile
@@ -3,7 +3,7 @@
 # Date created:				28 June 1996
 # Whom:					markm
 #
-# $Id: Makefile,v 1.8 1999/08/14 08:41:15 vanilla Exp $
+# $Id: Makefile,v 1.9 1999/08/22 18:59:59 mharo Exp $
 #
 
 DISTNAME=	xinetd-2.1.8.6b6
@@ -24,7 +24,7 @@ post-install:
 	@if [ ! -f ${PREFIX}/etc/rc.d/xinetd.sh ]; then \
 		${ECHO} "Install ${PREFIX}/etc/rc.d/xinetd.sh startup file."; \
 		${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/xinetd.sh; \
-		${ECHO} "[ -x ${PREFIX}/sbin/xinetd ] && ${PREFIX}/sbin/xinetd && echo -n ' xinetd'" >> ${PREFIX}/etc/rc.d/xinetd.sh; \
+		${ECHO} "[ -x ${PREFIX}/sbin/xinetd ] && ${PREFIX}/sbin/xinetd && ${ECHO} -n ' xinetd'" >> ${PREFIX}/etc/rc.d/xinetd.sh; \
 		${CHMOD} 751 ${PREFIX}/etc/rc.d/xinetd.sh; \
 	fi
 	strip ${PREFIX}/sbin/xinetd
-- 
cgit v1.2.3