KATO mega patch

- ECHO -> ECHO_MSG

For some ports:
- pre-fetch -> pre-everything
- ECHO -> ECHO_CMD

PR:		ports/56820-56858
Submitted by:	KATO Tsuguru <tkato@prontomail.com>

9 files changed, 44 insertions, 44 deletions

diff --git a/print/font2svg/Makefile b/print/font2svg/Makefile
index e2b492d1c38c..1ab3bf4a476f 100644
--- a/print/font2svg/Makefile
+++ b/print/font2svg/Makefile
@@ -27,12 +27,12 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
 USE_REINPLACE=	yes
 NO_BUILD=	yes
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-patch:
diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile
index 3c2742c923db..142259b2d9a3 100644
--- a/print/html2ps-letter/Makefile
+++ b/print/html2ps-letter/Makefile
@@ -40,12 +40,12 @@ MAN1=		html2ps.1
 MAN5=		html2psrc.5
 SCRIPTS_ENV+=	PERL=${PERL} PAPERSIZE=${PAPERSIZE}
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 do-install:
diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile
index 5be8c120ba3a..b481ee2c8323 100644
--- a/print/lprps-letter/Makefile
+++ b/print/lprps-letter/Makefile
@@ -25,8 +25,8 @@ PS!=		echo ${PAPERSIZE} | awk '{print toupper($$1)}'
 
 .if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter
 .BEGIN:
-	@${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
-	@${ECHO} "Possible values are:  a4 or letter"
+	@${ECHO_MSG} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\""
+	@${ECHO_MSG} "Possible values are:  a4 or letter"
 	@${FALSE}
 .endif
 
@@ -48,9 +48,9 @@ do-install:
 	@${INSTALL_MAN} ${WRKSRC}/lprps.n ${PREFIX}/man/man8/lprps.8
 	@${INSTALL_MAN} ${WRKSRC}/psif.n ${PREFIX}/man/man8/psif.8
 	@${INSTALL_MAN} ${WRKSRC}/psof.n ${PREFIX}/man/man8/psof.8
-	@${ECHO} ""
-	@${ECHO} Now edit your /etc/printcap
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} Now edit your /etc/printcap
+	@${ECHO_MSG} ""
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile
index e2e2097b4c63..9b52589b0e15 100644
--- a/print/pkfonts300/Makefile
+++ b/print/pkfonts300/Makefile
@@ -28,8 +28,8 @@ RESOLUTION=	300
 	${RESOLUTION} != 300 && ${RESOLUTION} != 360 && \
 	${RESOLUTION} != 400 && ${RESOLUTION} != 600
 .BEGIN:
-	@${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
-	@${ECHO} "Possible values are: 118, 240, 300, 360, 400 and 600."
+	@${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\""
+	@${ECHO_MSG} "Possible values are: 118, 240, 300, 360, 400 and 600."
 	@${FALSE}
 .endif
 .endif
diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile
index 8c5fc1229571..5beba20d658f 100644
--- a/print/pnm2ppa/Makefile
+++ b/print/pnm2ppa/Makefile
@@ -29,12 +29,12 @@ CFLAGS+=	${CPPFLAGS}
 
 MAN1=		pnm2ppa.1
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-patch:
diff --git a/print/preview-latex/Makefile b/print/preview-latex/Makefile
index 9d2bf8f98f4c..0fdd3e441309 100644
--- a/print/preview-latex/Makefile
+++ b/print/preview-latex/Makefile
@@ -40,12 +40,12 @@ CONFIGURE_ARGS+=	--disable-8bit-test
 
 DOCS=	ChangeLog INSTALL PROBLEMS README latex/README-preview RELEASE TODO
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-install:
diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile
index 179829416d02..79f0f1dbba9d 100644
--- a/print/scribus-devel/Makefile
+++ b/print/scribus-devel/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
 
-.if defined(WITH_GHOSTSCRIPT_AFP1) && ${WITH_GHOSTSCRIPT_AFP1} == yes
+.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
 GSPORT?=	print/ghostscript-afpl
 .else
 GSPORT?=	print/ghostscript-gnu
@@ -35,12 +35,12 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/scribus/libs \
 
 QTCFGLIBS+=	-lm
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-patch:
diff --git a/print/scribus/Makefile b/print/scribus/Makefile
index 179829416d02..79f0f1dbba9d 100644
--- a/print/scribus/Makefile
+++ b/print/scribus/Makefile
@@ -15,7 +15,7 @@ MASTER_SITES=	http://web2.altmuehlnet.de/fschmid/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A comprehensive desktop publishing program
 
-.if defined(WITH_GHOSTSCRIPT_AFP1) && ${WITH_GHOSTSCRIPT_AFP1} == yes
+.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes
 GSPORT?=	print/ghostscript-afpl
 .else
 GSPORT?=	print/ghostscript-gnu
@@ -35,12 +35,12 @@ LDCONFIG_DIRS=	%%PREFIX%%/lib/scribus/libs \
 
 QTCFGLIBS+=	-lm
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 post-patch:
diff --git a/print/transfig/Makefile b/print/transfig/Makefile
index 457cfca3f25f..b2a4af1e12a7 100644
--- a/print/transfig/Makefile
+++ b/print/transfig/Makefile
@@ -31,12 +31,12 @@ USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1
 
-pre-fetch:
+pre-everything::
 .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes
-	@${ECHO} ""
-	@${ECHO} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
-	@${ECHO} "      AFPL Postscript interpreter instead of GNU one"
-	@${ECHO} ""
+	@${ECHO_MSG} ""
+	@${ECHO_MSG} "      Define WITH_GHOSTSCRIPT_AFPL=yes to use"
+	@${ECHO_MSG} "      AFPL Postscript interpreter instead of GNU one"
+	@${ECHO_MSG} ""
 .endif
 
 .include <bsd.port.mk>