From 0b1020495087240f21a4fa421e92e457fc065310 Mon Sep 17 00:00:00 2001 From: Akinori MUSHA Date: Tue, 29 Jan 2002 11:08:52 +0000 Subject: 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. Use command macros where appropriate. --- japanese/bjfilter850/Makefile | 2 +- japanese/easypr/Makefile | 2 +- japanese/edict-utf-8/Makefile | 36 +++++++++++++------------- japanese/edict/Makefile | 36 +++++++++++++------------- japanese/emacs-emcws/Makefile | 8 +++--- japanese/emacs20-emcws/Makefile | 8 +++--- japanese/emacs21-emcws/Makefile | 8 +++--- japanese/epwutil/Makefile | 6 ++--- japanese/ghostscript-gnu-cjk/Makefile | 2 +- japanese/ghostscript-gnu-jpnfont/Makefile | 2 +- japanese/gnomelibs/Makefile | 2 +- japanese/jvim/Makefile | 4 +-- japanese/jvim3/Makefile | 12 ++++----- japanese/linux-JM/Makefile | 16 ++++++------ japanese/lookup-emacs21/Makefile | 2 +- japanese/lookup/Makefile | 2 +- japanese/man-doc/Makefile | 12 ++++----- japanese/mnews/Makefile | 4 +-- japanese/p5-manual/Makefile | 4 +-- japanese/plan/Makefile | 2 +- japanese/rskkserv/Makefile | 42 +++++++++++++++---------------- japanese/skkserv/Makefile | 26 +++++++++---------- japanese/tcsh/Makefile | 2 +- japanese/vje30-trial/Makefile | 2 +- japanese/vje30/Makefile | 4 +-- japanese/xjman/Makefile | 16 ++++++------ 26 files changed, 131 insertions(+), 131 deletions(-) (limited to 'japanese') diff --git a/japanese/bjfilter850/Makefile b/japanese/bjfilter850/Makefile index 674a1cb4a30a..5123145233e2 100644 --- a/japanese/bjfilter850/Makefile +++ b/japanese/bjfilter850/Makefile @@ -29,7 +29,7 @@ FILTER= ${FILESDIR}/filter do-install: ${MKDIR} ${PREFIX}/usr/local/share/printui - ${ECHO} "LANG=ja_JP.eucJP" > ${PREFIX}/usr/local/share/printui/i18n + ${ECHO_CMD} "LANG=ja_JP.eucJP" > ${PREFIX}/usr/local/share/printui/i18n .include diff --git a/japanese/easypr/Makefile b/japanese/easypr/Makefile index 8a446021d54c..448d4dbea3c6 100644 --- a/japanese/easypr/Makefile +++ b/japanese/easypr/Makefile @@ -19,7 +19,7 @@ RUN_DEPENDS= e2ps:${PORTSDIR}/japanese/e2ps \ giftopnm:${PORTSDIR}/graphics/netpbm do-build: - ${ECHO} '#!${PREFIX}/bin/wish8.0jp' > ${WRKSRC}/easypr + ${ECHO_CMD} '#!${PREFIX}/bin/wish8.0jp' > ${WRKSRC}/easypr ${CAT} ${WRKSRC}/easypr.in >> ${WRKSRC}/easypr cd ${WRKSRC}; ${CC} -o setcap setcap.c diff --git a/japanese/edict-utf-8/Makefile b/japanese/edict-utf-8/Makefile index ed0e5feb3230..f7c2a245cf99 100644 --- a/japanese/edict-utf-8/Makefile +++ b/japanese/edict-utf-8/Makefile @@ -124,23 +124,23 @@ do-install: # # Only 9 dictionaries can be enabled # - @${ECHO} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc - @${ECHO} dicfile edict >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile enamdict >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile compdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile j_places >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile lawgledt >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile geodic >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile pandpdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile aviation >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile findic >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile mktdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile compverb >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile 4jwords >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile concrete.doc >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile lingdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile edict >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile enamdict >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile compdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile j_places >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile geodic >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile pandpdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile aviation >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile compverb >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile 4jwords >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc @${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/.xjdicrc @${CHMOD} ${SHAREMODE} ${DATADIR}/.xjdicrc ${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1 @@ -151,7 +151,7 @@ do-install: fi ${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR} @for docfile in ${DOCFILES} ; do \ - ${ECHO} InstalLing ${DOCDIR}/$$docfile ; \ + ${ECHO_CMD} Installing ${DOCDIR}/$$docfile ; \ ${INSTALL_MAN} ${_DISTDIR}/$$docfile ${DOCDIR} ; \ done .endif diff --git a/japanese/edict/Makefile b/japanese/edict/Makefile index ed0e5feb3230..f7c2a245cf99 100644 --- a/japanese/edict/Makefile +++ b/japanese/edict/Makefile @@ -124,23 +124,23 @@ do-install: # # Only 9 dictionaries can be enabled # - @${ECHO} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc - @${ECHO} dicfile edict >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile enamdict >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile compdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile j_places >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile lawgledt >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile geodic >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile pandpdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile aviation >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile findic >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile mktdic >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile compverb >> ${DATADIR}/.xjdicrc - @${ECHO} dicfile 4jwords >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile concrete.doc >> ${DATADIR}/.xjdicrc - # @${ECHO} dicfile lingdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicdir ${DATADIR} > ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile edict >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile enamdict >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile compdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile ediclsd3 >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile jddict.v02 >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile j_places >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile lawgledt >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile geodic >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile pandpdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile aviation >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile findic >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile mktdic >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile compverb >> ${DATADIR}/.xjdicrc + @${ECHO_CMD} dicfile 4jwords >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile concrete.doc >> ${DATADIR}/.xjdicrc + # @${ECHO_CMD} dicfile lingdic >> ${DATADIR}/.xjdicrc @${CHOWN} ${SHAREOWN}:${SHAREGRP} ${DATADIR}/.xjdicrc @${CHMOD} ${SHAREMODE} ${DATADIR}/.xjdicrc ${INSTALL_MAN} ${WRKSRC}/xjdic.1 ${PREFIX}/man/man1 @@ -151,7 +151,7 @@ do-install: fi ${INSTALL_MAN} ${WRKSRC}/xjdic23.inf ${DOCDIR} @for docfile in ${DOCFILES} ; do \ - ${ECHO} InstalLing ${DOCDIR}/$$docfile ; \ + ${ECHO_CMD} Installing ${DOCDIR}/$$docfile ; \ ${INSTALL_MAN} ${_DISTDIR}/$$docfile ${DOCDIR} ; \ done .endif diff --git a/japanese/emacs-emcws/Makefile b/japanese/emacs-emcws/Makefile index bf834ab8f26b..97cd04822a94 100644 --- a/japanese/emacs-emcws/Makefile +++ b/japanese/emacs-emcws/Makefile @@ -164,13 +164,13 @@ do-install: @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \ ${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp @if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ]; then \ - (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - ${ECHO} " (normal-top-level-add-subdirs-to-load-path))") \ + (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + ${ECHO_CMD} " (normal-top-level-add-subdirs-to-load-path))") \ > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ; \ fi @if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ]; then \ - (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - ${ECHO} " (normal-top-level-add-subdirs-to-load-path))") \ + (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + ${ECHO_CMD} " (normal-top-level-add-subdirs-to-load-path))") \ > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \ fi diff --git a/japanese/emacs20-emcws/Makefile b/japanese/emacs20-emcws/Makefile index bf834ab8f26b..97cd04822a94 100644 --- a/japanese/emacs20-emcws/Makefile +++ b/japanese/emacs20-emcws/Makefile @@ -164,13 +164,13 @@ do-install: @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \ ${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp @if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ]; then \ - (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - ${ECHO} " (normal-top-level-add-subdirs-to-load-path))") \ + (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + ${ECHO_CMD} " (normal-top-level-add-subdirs-to-load-path))") \ > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ; \ fi @if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ]; then \ - (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - ${ECHO} " (normal-top-level-add-subdirs-to-load-path))") \ + (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + ${ECHO_CMD} " (normal-top-level-add-subdirs-to-load-path))") \ > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \ fi diff --git a/japanese/emacs21-emcws/Makefile b/japanese/emacs21-emcws/Makefile index bf834ab8f26b..97cd04822a94 100644 --- a/japanese/emacs21-emcws/Makefile +++ b/japanese/emacs21-emcws/Makefile @@ -164,13 +164,13 @@ do-install: @test -d ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp || \ ${MKDIR} ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp @if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ]; then \ - (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - ${ECHO} " (normal-top-level-add-subdirs-to-load-path))") \ + (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + ${ECHO_CMD} " (normal-top-level-add-subdirs-to-load-path))") \ > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/site-lisp/subdirs.el ; \ fi @if [ ! -f ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ]; then \ - (${ECHO} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ - ${ECHO} " (normal-top-level-add-subdirs-to-load-path))") \ + (${ECHO_CMD} "(if (fboundp 'normal-top-level-add-subdirs-to-load-path)"; \ + ${ECHO_CMD} " (normal-top-level-add-subdirs-to-load-path))") \ > ${PREFIX}/share/emacs/${EMACS_VER}-emcws/lisp/subdirs.el ; \ fi diff --git a/japanese/epwutil/Makefile b/japanese/epwutil/Makefile index 8b91e96853a3..aa344bac482b 100644 --- a/japanese/epwutil/Makefile +++ b/japanese/epwutil/Makefile @@ -35,11 +35,11 @@ do-install: post-install: .for file in ${EPWPROGS} - ${ECHO} man/${MANLANG}/cat1/${file}.1${MANEXT} >> ${TMPPLIST} + ${ECHO_CMD} man/${MANLANG}/cat1/${file}.1${MANEXT} >> ${TMPPLIST} .endfor .if !defined(NOPORTDOCS) - ${ECHO} ${EPWDOCDIR}/${EPWDOCS} >> ${TMPPLIST} - ${ECHO} "@dirrm ${EPWDOCDIR}" >> ${TMPPLIST} + ${ECHO_CMD} ${EPWDOCDIR}/${EPWDOCS} >> ${TMPPLIST} + ${ECHO_CMD} "@dirrm ${EPWDOCDIR}" >> ${TMPPLIST} .endif .include diff --git a/japanese/ghostscript-gnu-cjk/Makefile b/japanese/ghostscript-gnu-cjk/Makefile index e7e4140473ff..123d34edfc61 100644 --- a/japanese/ghostscript-gnu-cjk/Makefile +++ b/japanese/ghostscript-gnu-cjk/Makefile @@ -29,6 +29,6 @@ do-install: ${MV} ${GSLIB_DIR}/CIDFnmap ${GSLIB_DIR}/CIDFnmap.orig ${GREP} -v -e "CIDFnmap.jp" ${GSLIB_DIR}/CIDFnmap.orig > \ ${GSLIB_DIR}/CIDFnmap - ${ECHO} '(CIDFnmap.jp) .runlibfile' >> ${GSLIB_DIR}/CIDFnmap + ${ECHO_CMD} '(CIDFnmap.jp) .runlibfile' >> ${GSLIB_DIR}/CIDFnmap .include diff --git a/japanese/ghostscript-gnu-jpnfont/Makefile b/japanese/ghostscript-gnu-jpnfont/Makefile index e7e4140473ff..123d34edfc61 100644 --- a/japanese/ghostscript-gnu-jpnfont/Makefile +++ b/japanese/ghostscript-gnu-jpnfont/Makefile @@ -29,6 +29,6 @@ do-install: ${MV} ${GSLIB_DIR}/CIDFnmap ${GSLIB_DIR}/CIDFnmap.orig ${GREP} -v -e "CIDFnmap.jp" ${GSLIB_DIR}/CIDFnmap.orig > \ ${GSLIB_DIR}/CIDFnmap - ${ECHO} '(CIDFnmap.jp) .runlibfile' >> ${GSLIB_DIR}/CIDFnmap + ${ECHO_CMD} '(CIDFnmap.jp) .runlibfile' >> ${GSLIB_DIR}/CIDFnmap .include diff --git a/japanese/gnomelibs/Makefile b/japanese/gnomelibs/Makefile index 819ceb605aaa..96d8a8f25777 100644 --- a/japanese/gnomelibs/Makefile +++ b/japanese/gnomelibs/Makefile @@ -18,7 +18,7 @@ MAINTAINER= nakai@FreeBSD.org PLIST= ${WRKDIR}/pkg-plist post-extract: - ${ECHO} bin/gnome-libs-jp > ${PLIST} + ${ECHO_CMD} bin/gnome-libs-jp > ${PLIST} ${CAT} ${MASTERDIR}/pkg-plist >> ${PLIST} post-install: diff --git a/japanese/jvim/Makefile b/japanese/jvim/Makefile index 7c9e522314c3..5e845d5827f5 100644 --- a/japanese/jvim/Makefile +++ b/japanese/jvim/Makefile @@ -51,7 +51,7 @@ JPLIB+= -ljd -lcrypt # # Make a value of INPUT_METHOD .if defined(INPUT_METHOD) -INPUT_METHOD!= ${ECHO} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' +INPUT_METHOD!= ${ECHO_CMD} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' .endif # # For ONEW library @@ -60,7 +60,7 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/o JPDEF+= -DONEW # If we use ONEW libray, then -lonew*.a should appear # before the other libraries. -JPLIB!= echo ${JPLIB} | sed 's%^%-lonew${INPUT_METHOD} %' +JPLIB!= ${ECHO_CMD} ${JPLIB} | sed 's%^%-lonew${INPUT_METHOD} %' .endif pre-build: diff --git a/japanese/jvim3/Makefile b/japanese/jvim3/Makefile index 2eff169563cc..dc209c40e56e 100644 --- a/japanese/jvim3/Makefile +++ b/japanese/jvim3/Makefile @@ -82,8 +82,8 @@ FEPLIBS+= -L${LOCALBASE}/lib -ljd -lcrypt # .if defined(INPUT_METHOD) # Make a value of INPUT_METHOD -## 'echo' and 'sed' in the next line cannot replace by '${ECHO}' and '${SED}' -INPUT_METHOD!= echo ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' +## 'sed' in the next line cannot be replaced with '${SED}' +INPUT_METHOD!= ${ECHO_CMD} ${INPUT_METHOD} | sed -e 's/^/-/' -e 's/ /+/g' FEPOPT+= -DFEPCTRL .if !defined(DIRECT_CANNA) # For ONEW library @@ -91,8 +91,8 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libonew${INPUT_METHOD}.a:${PORTSDIR}/japanese/o FEPOPT+= -DONEW # If we use ONEW libray, then -lonew-* needs appear # before the other libraries in ${FEPLIBS}. -### 'sed' and 'echo' in the next line cannot replace by '${SED}' and ${ECHO} -FEPLIBS!= echo ${FEPLIBS} | sed 's%^%-lonew${INPUT_METHOD} %' +$## 'sed' in the next line cannot be replaced with '${SED}' +FEPLIBS!= ${ECHO_CMD} ${FEPLIBS} | sed 's%^%-lonew${INPUT_METHOD} %' FEPOBJS= feponew.o ### .endif @@ -123,9 +123,9 @@ do-install: ${INSTALL_PROGRAM} ${WRKSRC}/src/grep/grep ${PREFIX}/bin/jgrep .if defined(INPUT_METHOD) .if defined(DIRECT_CANNA) - ${ECHO} "set fepctrl" > ${PREFIX}/etc/jvim3rc + ${ECHO_CMD} "set fepctrl" > ${PREFIX}/etc/jvim3rc .else - ${ECHO} "set fepctrl onewredraw" > ${PREFIX}/etc/jvim3rc + ${ECHO_CMD} "set fepctrl onewredraw" > ${PREFIX}/etc/jvim3rc .endif .endif .if !defined(NOPORTDOCS) diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile index 4b4019cbe09b..b8c4726c0047 100644 --- a/japanese/linux-JM/Makefile +++ b/japanese/linux-JM/Makefile @@ -38,10 +38,10 @@ MANPAGES_OTHERS= \ .include DISTFILES_GNU!=\ - ${ECHO} ${MANPAGES_GNU} \ + ${ECHO_CMD} ${MANPAGES_GNU} \ | ${SED} 's/[^ ]*/man-pages-ja-GNU_&-${DATESPEC}.tar.gz/g' DISTFILES_OTHERS!=\ - ${ECHO} ${MANPAGES_OTHERS} \ + ${ECHO_CMD} ${MANPAGES_OTHERS} \ | ${SED} 's/[^ ]*/man-pages-ja-&-${DATESPEC}.tar.gz/g' post-extract: @@ -55,27 +55,27 @@ post-extract: .endfor post-build: - @${ECHO} -n "" > ${PLIST} + @${ECHO_CMD} -n "" > ${PLIST} @for sec in ${MANSECS}; do \ if [ -d ${WRKSRC}/man$${sec} ]; then \ cd ${WRKSRC}/man$${sec}; \ list=`${MAKE} pages-list`; \ - set `${ECHO} $$list " "|${SED} 's/\.\([0-9]\) /.\1 \1 /g'`; \ + set `${ECHO_CMD} $$list " "|${SED} 's/\.\([0-9]\) /.\1 \1 /g'`; \ while : ; do \ case $$# in \ 0) break;; \ - [1]) ${ECHO} "can not happen" >/dev/tty; \ + [1]) ${ECHO_CMD} "can not happen" >/dev/tty; \ exit 1;; \ esac; \ - ${ECHO} man/ja/man$$2/$$1.gz; shift 2; \ + ${ECHO_CMD} man/ja/man$$2/$$1.gz; shift 2; \ done; \ fi; \ done|sort|uniq >>${PLIST} .for sec in ${MANSECS} - @${ECHO} '@unexec rmdir %D/man/ja/man'${sec}' 2>/dev/null || true' \ + @${ECHO_CMD} '@unexec rmdir %D/man/ja/man'${sec}' 2>/dev/null || true' \ >>${PLIST} .endfor - @${ECHO} '@unexec rmdir %D/man/ja 2>/dev/null || true' >>${PLIST} + @${ECHO_CMD} '@unexec rmdir %D/man/ja 2>/dev/null || true' >>${PLIST} pre-install: .for sec in ${MANSECS} diff --git a/japanese/lookup-emacs21/Makefile b/japanese/lookup-emacs21/Makefile index 6ec408a3e9b4..d85097f14888 100644 --- a/japanese/lookup-emacs21/Makefile +++ b/japanese/lookup-emacs21/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ post-install: .if (${EMACS_PORT_NAME} == "xemacs21-mule") ${RM} -f ${WRKDIR}/${MANIFEST} - emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \ + emacsdir=`${ECHO_CMD} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \ ${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \ ${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST} ${MKDIR} ${EMACSDIR}/pkginfo diff --git a/japanese/lookup/Makefile b/japanese/lookup/Makefile index 6ec408a3e9b4..d85097f14888 100644 --- a/japanese/lookup/Makefile +++ b/japanese/lookup/Makefile @@ -38,7 +38,7 @@ CONFIGURE_ARGS= --with-emacs=${EMACS_CMD} \ post-install: .if (${EMACS_PORT_NAME} == "xemacs21-mule") ${RM} -f ${WRKDIR}/${MANIFEST} - emacsdir=`${ECHO} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \ + emacsdir=`${ECHO_CMD} ${EMACSDIR} | ${SED} -e "s;^${PREFIX}/;;"`; \ ${CAT} ${PLIST} | ${GREP} -e "^$${emacsdir}" | \ ${SED} -e "s;^$${emacsdir}/;;" > ${WRKDIR}/${MANIFEST} ${MKDIR} ${EMACSDIR}/pkginfo diff --git a/japanese/man-doc/Makefile b/japanese/man-doc/Makefile index 1347218c73bc..da0deeb590cb 100644 --- a/japanese/man-doc/Makefile +++ b/japanese/man-doc/Makefile @@ -34,9 +34,9 @@ do-extract: .for sec in ${MANSECS} @if [ -d ${JAMANDIR}/man${sec} ]; then \ ${CP} -R ${JAMANDIR}/man${sec} ${WRKSRC}/ ; \ - ${ECHO} >>${WRKSRC}/man${sec}/Makefile; \ - ${ECHO} pages-list: >>${WRKSRC}/man${sec}/Makefile; \ - ${ECHO} " @\$${ECHO} \$${MAN${sec}} \$${MLINKS}" \ + ${ECHO_CMD} >>${WRKSRC}/man${sec}/Makefile; \ + ${ECHO_CMD} pages-list: >>${WRKSRC}/man${sec}/Makefile; \ + ${ECHO_CMD} " @\$${ECHO_CMD} \$${MAN${sec}} \$${MLINKS}" \ >>${WRKSRC}/man${sec}/Makefile; \ fi .endfor @@ -47,13 +47,13 @@ post-build: if [ -d ${WRKSRC}/man$${sec} ]; then \ cd ${WRKSRC}/man$${sec}; \ list=`${MAKE} pages-list`; \ - set `${ECHO} $$list " "|${SED} 's/\.\([^.]*\) /.\1 \1 /g'`; \ + set `${ECHO_CMD} $$list " "|${SED} 's/\.\([^.]*\) /.\1 \1 /g'`; \ while : ; do \ case $$# in \ 0) break;; \ - [1]) ${ECHO} "can not happen"; break;; \ + [1]) ${ECHO_CMD} "can not happen"; break;; \ esac; \ - ${ECHO} share/man/ja/man$$2/$$1.gz; shift 2; \ + ${ECHO_CMD} share/man/ja/man$$2/$$1.gz; shift 2; \ done; \ fi; \ done|sort|uniq >>${PLIST} diff --git a/japanese/mnews/Makefile b/japanese/mnews/Makefile index 6ac23cd9ca0b..245825be7c2d 100644 --- a/japanese/mnews/Makefile +++ b/japanese/mnews/Makefile @@ -59,13 +59,13 @@ do-install: .endif post-install: - @${ECHO} my.domain.com > ${PREFIX}/etc/mnews/default-domain.default + @${ECHO_CMD} my.domain.com > ${PREFIX}/etc/mnews/default-domain.default @if [ \! -e ${PREFIX}/etc/mnews/default-domain ]; then \ if [ X${BATCH} = X ]; then \ while [ X$$domain = X ]; do \ read -p "Enter the domain name of this host>" domain; \ done; \ - ${ECHO} $$domain > ${PREFIX}/etc/mnews/default-domain; \ + ${ECHO_CMD} $$domain > ${PREFIX}/etc/mnews/default-domain; \ else \ ${ECHO} "Now, you need to make sure ${PREFIX}/etc/mnews/default-domain"; \ ${ECHO} "contains correct domain name."; \ diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile index 4a57ade2665d..a0054362d7c3 100644 --- a/japanese/p5-manual/Makefile +++ b/japanese/p5-manual/Makefile @@ -52,9 +52,9 @@ do-install: .include plist: - @${ECHO} -n >${PLIST} + @${ECHO_CMD} -n >${PLIST} .for item in 1 3 .for file in ${CAT${item}} - @${ECHO} man/ja/cat${item}/${file}.gz >>${PLIST} + @${ECHO_CMD} man/ja/cat${item}/${file}.gz >>${PLIST} .endfor .endfor diff --git a/japanese/plan/Makefile b/japanese/plan/Makefile index 9943e98e2071..bcdc01ccbcff 100644 --- a/japanese/plan/Makefile +++ b/japanese/plan/Makefile @@ -20,7 +20,7 @@ PLIST= ${WRKDIR}/PLIST EXTRA_PATCHES= ${.CURDIR}/files/patch-* post-build: - ${ECHO} share/doc/plan/plan_calEUC.ps > ${WRKDIR}/PLIST + ${ECHO_CMD} share/doc/plan/plan_calEUC.ps > ${WRKDIR}/PLIST ${CAT} ${MASTERDIR}/pkg-plist >> ${WRKDIR}/PLIST post-install: diff --git a/japanese/rskkserv/Makefile b/japanese/rskkserv/Makefile index dfd0f14ce4e9..a9e9558b1dec 100644 --- a/japanese/rskkserv/Makefile +++ b/japanese/rskkserv/Makefile @@ -55,27 +55,27 @@ post-install: @if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} file."; \ ( \ - ${ECHO} "#!/bin/sh"; \ - ${ECHO} "case \$$1 in"; \ - ${ECHO} "start)"; \ - ${ECHO} " if [ -f ${PREFIX}/libexec/rskkserv ]; then"; \ - ${ECHO} " ${ECHO} -n ' rskkserv: '"; \ - ${ECHO} " ${PREFIX}/libexec/rskkserv --verbose"; \ - ${ECHO} " fi"; \ - ${ECHO} " ;;"; \ - ${ECHO} "stop)"; \ - ${ECHO} " pidfile=/var/run/rskkserv.pid"; \ - ${ECHO} " if [ -f \$$pidfile ]; then"; \ - ${ECHO} " kill \`cat \$$pidfile\` && echo -n ' rskkserv'"; \ - ${ECHO} " ${RM} \$$pidfile"; \ - ${ECHO} " else"; \ - ${ECHO} " ${ECHO} ' rskkserv: not running'"; \ - ${ECHO} " fi"; \ - ${ECHO} " ;;"; \ - ${ECHO} "*)"; \ - ${ECHO} " ${ECHO} \"usage: \$$0 {start|stop}\" 1>&2"; \ - ${ECHO} " ;;"; \ - ${ECHO} "esac"; \ + ${ECHO_CMD} "#!/bin/sh"; \ + ${ECHO_CMD} "case \$$1 in"; \ + ${ECHO_CMD} "start)"; \ + ${ECHO_CMD} " if [ -f ${PREFIX}/libexec/rskkserv ]; then"; \ + ${ECHO_CMD} " ${ECHO_CMD} -n ' rskkserv: '"; \ + ${ECHO_CMD} " ${PREFIX}/libexec/rskkserv --verbose"; \ + ${ECHO_CMD} " fi"; \ + ${ECHO_CMD} " ;;"; \ + ${ECHO_CMD} "stop)"; \ + ${ECHO_CMD} " pidfile=/var/run/rskkserv.pid"; \ + ${ECHO_CMD} " if [ -f \$$pidfile ]; then"; \ + ${ECHO_CMD} " kill \`cat \$$pidfile\` && echo -n ' rskkserv'"; \ + ${ECHO_CMD} " ${RM} \$$pidfile"; \ + ${ECHO_CMD} " else"; \ + ${ECHO_CMD} " ${ECHO_CMD} ' rskkserv: not running'"; \ + ${ECHO_CMD} " fi"; \ + ${ECHO_CMD} " ;;"; \ + ${ECHO_CMD} "*)"; \ + ${ECHO_CMD} " ${ECHO_CMD} \"usage: \$$0 {start|stop}\" 1>&2"; \ + ${ECHO_CMD} " ;;"; \ + ${ECHO_CMD} "esac"; \ ) > ${STARTUP_SCRIPT}; \ ${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \ fi diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile index 9f31d7a57a4a..2e49bd3dcc5a 100644 --- a/japanese/skkserv/Makefile +++ b/japanese/skkserv/Makefile @@ -27,21 +27,21 @@ STARTUP_SCRIPT= ${PREFIX}/etc/rc.d/skkserv.sh post-install: @if [ ! -f ${STARTUP_SCRIPT} ]; then \ ${ECHO} "Installing ${STARTUP_SCRIPT} file."; \ - ${ECHO} "#!/bin/sh" > ${STARTUP_SCRIPT}; \ - ${ECHO} 'case $$1 in' >> ${STARTUP_SCRIPT}; \ - ${ECHO} "start)" >> ${STARTUP_SCRIPT}; \ - ${ECHO} " if [ -f ${PREFIX}/sbin/skkserv ]; then" >> \ + ${ECHO_CMD} "#!/bin/sh" > ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} 'case $$1 in' >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} "start)" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} " if [ -f ${PREFIX}/sbin/skkserv ]; then" >> \ ${STARTUP_SCRIPT}; \ - ${ECHO} " ${ECHO} -n ' skkserv'; ${PREFIX}/sbin/skkserv" >> \ + ${ECHO_CMD} " ${ECHO_CMD} -n ' skkserv'; ${PREFIX}/sbin/skkserv" >> \ ${STARTUP_SCRIPT}; \ - ${ECHO} " fi" >> ${STARTUP_SCRIPT}; \ - ${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \ - ${ECHO} "stop)" >> ${STARTUP_SCRIPT}; \ - ${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \ - ${ECHO} "*)" >> ${STARTUP_SCRIPT}; \ - ${ECHO} ' ${ECHO} "usage: $$0 {start|stop}" 1>&2' >> ${STARTUP_SCRIPT}; \ - ${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \ - ${ECHO} 'esac' >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} " fi" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} " ;;" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} "stop)" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} " ;;" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} "*)" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} ' ${ECHO_CMD} "usage: $$0 {start|stop}" 1>&2' >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} " ;;" >> ${STARTUP_SCRIPT}; \ + ${ECHO_CMD} 'esac' >> ${STARTUP_SCRIPT}; \ ${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \ fi diff --git a/japanese/tcsh/Makefile b/japanese/tcsh/Makefile index 5f29c780aa46..d07f98744649 100644 --- a/japanese/tcsh/Makefile +++ b/japanese/tcsh/Makefile @@ -36,7 +36,7 @@ post-install: .endif @${ECHO} "updating /etc/shells" @${CP} /etc/shells /etc/shells.bak - @(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO} ${PREFIX}/bin/tcsh) >/etc/shells + @(${GREP} -v ${PREFIX}/bin/tcsh /etc/shells.bak; ${ECHO_CMD} ${PREFIX}/bin/tcsh) >/etc/shells @${CAT} ${PKGMESSAGE} .include diff --git a/japanese/vje30-trial/Makefile b/japanese/vje30-trial/Makefile index 571842e57b5a..054ed48af078 100644 --- a/japanese/vje30-trial/Makefile +++ b/japanese/vje30-trial/Makefile @@ -66,7 +66,7 @@ do-install: @${CHMOD} a+w ${PREFIX}/vje30/dic/vjed95m.dic @[ X${PREFIX} = X"/usr/local" ] || (${LN} -s ${PREFIX}/vje30 /usr/local/; ${LN} -s ${PREFIX}/etc/vje30 /usr/local/etc/) @${CP} -Pp /etc/services /etc/services.bak - @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services + @${GREP} -qw '^vjed' /etc/services || ${ECHO_CMD} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services post-install: @${CAT} ${PKGMESSAGE} diff --git a/japanese/vje30/Makefile b/japanese/vje30/Makefile index bb7312b3e3c9..d0ae71866df6 100644 --- a/japanese/vje30/Makefile +++ b/japanese/vje30/Makefile @@ -103,10 +103,10 @@ do-install: @${CHMOD} a+w ${PREFIX}/vje30/dic/vjed95m.dic @[ X${PREFIX} = X"/usr/local" ] || (${LN} -s ${PREFIX}/vje30 /usr/local/; ${LN} -s ${PREFIX}/etc/vje30 /usr/local/etc/) @${CP} ${WRKDIR}/vjed.bin /tmp/ - @${ECHO} '' | ${WRKDIR}/vjesetup + @${ECHO_CMD} '' | ${WRKDIR}/vjesetup @${RM} /tmp/vjed.bin @${CP} -Pp /etc/services /etc/services.bak - @${GREP} -qw '^vjed' /etc/services || ${ECHO} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services + @${GREP} -qw '^vjed' /etc/services || ${ECHO_CMD} "vjed 11493/tcp # VJE-Delta Server" >> /etc/services post-install: @${CAT} ${PKGMESSAGE} diff --git a/japanese/xjman/Makefile b/japanese/xjman/Makefile index 88ed7da9ba6b..fab78da1de8a 100644 --- a/japanese/xjman/Makefile +++ b/japanese/xjman/Makefile @@ -39,21 +39,21 @@ post-build: if [ -d ${WRKSRC}/man$${sec} ]; then \ cd ${WRKSRC}/man$${sec}; \ list=`${MAKE} pages-list`; \ - set `${ECHO} $$list " "|${SED} 's/\.\([0-9]\) /.\1 \1 /g'`; \ + set `${ECHO_CMD} $$list " "|${SED} 's/\.\([0-9]\) /.\1 \1 /g'`; \ while : ; do \ case $$# in \ 0) break;; \ - [1]) ${ECHO} "can not happen"; break;; \ + [1]) ${ECHO_CMD} "can not happen"; break;; \ esac; \ - ${ECHO} man/ja/man$$2/$$1.gz; shift 2; \ + ${ECHO_CMD} man/ja/man$$2/$$1.gz; shift 2; \ done; \ fi; \ done|sort|uniq >>${PLIST} - @${ECHO} "@exec ${LN} -sf %D/man/ja %D/man/ja_JP.EUC" >>${PLIST} - @${ECHO} "@unexec ${RM} -f %D/man/ja_JP.EUC" >>${PLIST} - @${ECHO} "share/doc/xjman/COPYRIGHT" >>${PLIST} - @${ECHO} "share/doc/xjman/COPYRIGHT.XJDP" >>${PLIST} - @${ECHO} "@dirrm share/doc/xjman" >>${PLIST} + @${ECHO_CMD} "@exec ${LN} -sf %D/man/ja %D/man/ja_JP.EUC" >>${PLIST} + @${ECHO_CMD} "@unexec ${RM} -f %D/man/ja_JP.EUC" >>${PLIST} + @${ECHO_CMD} "share/doc/xjman/COPYRIGHT" >>${PLIST} + @${ECHO_CMD} "share/doc/xjman/COPYRIGHT.XJDP" >>${PLIST} + @${ECHO_CMD} "@dirrm share/doc/xjman" >>${PLIST} pre-install: .for sec in ${MANSECS} -- cgit v1.2.3