diff options
| author | Akinori MUSHA <knu@FreeBSD.org> | 2002-01-29 11:48:57 +0000 |
|---|---|---|
| committer | Akinori MUSHA <knu@FreeBSD.org> | 2002-01-29 11:48:57 +0000 |
| commit | 897d06aa9731645e0a7fa7c315028dcdbfa3c798 (patch) | |
| tree | 485cefa9621a788f5d27ac4dcab7fc6aa9843be6 /mail | |
| parent | c982f5faf1c27ba011ef14e71aadc2182660d704 (diff) | |
| download | ports-897d06aa9731645e0a7fa7c315028dcdbfa3c798.tar.gz ports-897d06aa9731645e0a7fa7c315028dcdbfa3c798.zip | |
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.
Notes
Notes:
svn path=/head/; revision=53958
Diffstat (limited to 'mail')
41 files changed, 249 insertions, 249 deletions
diff --git a/mail/arrow/Makefile b/mail/arrow/Makefile index d1f00e5ac206..7d51479578af 100644 --- a/mail/arrow/Makefile +++ b/mail/arrow/Makefile @@ -75,7 +75,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants @${PERL} -pi -e 's|/var/spool/mail/|/var/mail/|' \ ${WRKSRC}/programs/arrow/code/*.cc diff --git a/mail/cclient/Makefile b/mail/cclient/Makefile index f1abec4a6c57..090348a0e8ee 100644 --- a/mail/cclient/Makefile +++ b/mail/cclient/Makefile @@ -60,11 +60,11 @@ HEADERS= c-client.h dummy.h env.h env_unix.h fdstring.h flocksim.h \ PORTREV_H= ${WRKDIR}/portrevision.h post-build: - @${ECHO} "#define CCLIENT_PORTVERSION \"${PORTVERSION}\"" >${PORTREV_H} + @${ECHO_CMD} "#define CCLIENT_PORTVERSION \"${PORTVERSION}\"" >${PORTREV_H} .if defined(WITH_SSL) - @${ECHO} "#define CCLIENT_SSLENABLED \"yes\"" >>${PORTREV_H} + @${ECHO_CMD} "#define CCLIENT_SSLENABLED \"yes\"" >>${PORTREV_H} .else - @${ECHO} "#define CCLIENT_SSLENABLED \"no\"" >>${PORTREV_H} + @${ECHO_CMD} "#define CCLIENT_SSLENABLED \"no\"" >>${PORTREV_H} .endif do-install: diff --git a/mail/cyrus-imapd/Makefile b/mail/cyrus-imapd/Makefile index fded530a49ce..5a997716c5ea 100644 --- a/mail/cyrus-imapd/Makefile +++ b/mail/cyrus-imapd/Makefile @@ -74,27 +74,27 @@ post-install: .for file in ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | sed s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \ - ${ECHO} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ + ${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ fi .endfor ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ ${PREFIX}/share/doc/cyrus/text - @${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample diff --git a/mail/cyrus-imapd2/Makefile b/mail/cyrus-imapd2/Makefile index fded530a49ce..5a997716c5ea 100644 --- a/mail/cyrus-imapd2/Makefile +++ b/mail/cyrus-imapd2/Makefile @@ -74,27 +74,27 @@ post-install: .for file in ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | sed s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \ - ${ECHO} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ + ${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ fi .endfor ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ ${PREFIX}/share/doc/cyrus/text - @${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile index fded530a49ce..5a997716c5ea 100644 --- a/mail/cyrus-imapd22/Makefile +++ b/mail/cyrus-imapd22/Makefile @@ -74,27 +74,27 @@ post-install: .for file in ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | sed s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \ - ${ECHO} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ + ${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ fi .endfor ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ ${PREFIX}/share/doc/cyrus/text - @${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile index fded530a49ce..5a997716c5ea 100644 --- a/mail/cyrus-imapd23/Makefile +++ b/mail/cyrus-imapd23/Makefile @@ -74,27 +74,27 @@ post-install: .for file in ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | sed s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \ - ${ECHO} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ + ${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ fi .endfor ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ ${PREFIX}/share/doc/cyrus/text - @${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile index fded530a49ce..5a997716c5ea 100644 --- a/mail/cyrus-imapd24/Makefile +++ b/mail/cyrus-imapd24/Makefile @@ -74,27 +74,27 @@ post-install: .for file in ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file}.html \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file}.html >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/${file}.html >>${TMPPLIST} .endfor .for file in ${MAN1} ${MAN3} ${MAN5} ${MAN8} ofile=`echo ${file} | sed s/cyrquota/quota/`; \ if [ -f ${WRKSRC}/doc/man/$${ofile}.html ]; then \ ${INSTALL_DATA} ${WRKSRC}/doc/man/$${ofile}.html \ ${PREFIX}/share/doc/cyrus/man/$${ofile}.html; \ - ${ECHO} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ + ${ECHO_CMD} share/doc/cyrus/man/$${ofile}.html >>${TMPPLIST}; \ fi .endfor ${INSTALL_DATA} ${WRKSRC}/doc/cyrusv2.mc \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/cyrusv2.mc >>${TMPPLIST} .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/text/${file} \ ${PREFIX}/share/doc/cyrus/text - @${ECHO} share/doc/cyrus/text/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/text/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/text" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/man" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif ${INSTALL_SCRIPT} ${FILESDIR}/imapd.sh \ ${PREFIX}/etc/rc.d/imapd.sh.sample diff --git a/mail/cyrus/Makefile b/mail/cyrus/Makefile index bed854867282..379a6ff825e8 100644 --- a/mail/cyrus/Makefile +++ b/mail/cyrus/Makefile @@ -53,15 +53,15 @@ post-install: .for file in ${DOCS} ${INSTALL_DATA} ${WRKSRC}/doc/${file} \ ${PREFIX}/share/doc/cyrus - @${ECHO} share/doc/cyrus/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/${file} >>${TMPPLIST} .endfor .for file in ${HTDOCS} ${INSTALL_DATA} ${WRKSRC}/doc/html/${file}.html \ ${PREFIX}/share/doc/cyrus/html - @${ECHO} share/doc/cyrus/html/${file}.html >>${TMPPLIST} + @${ECHO_CMD} share/doc/cyrus/html/${file}.html >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/cyrus/html" >>${TMPPLIST} - @${ECHO} "@dirrm share/doc/cyrus" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus/html" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/cyrus" >>${TMPPLIST} .endif ${INSTALL_DATA} ${FILESDIR}/imapd.conf \ ${PREFIX}/etc/imapd.conf.dist @@ -78,22 +78,22 @@ post-install: ${TOUCH} ${PREFIX}/etc/imap/mailboxes ${CHMOD} 640 ${PREFIX}/etc/imap/mailboxes ${CHOWN} cyrus:cyrus ${PREFIX}/etc/imap/mailboxes - @${ECHO} "@exec ${MKDIR} %D/etc/imap" >>${TMPPLIST} - @${ECHO} "@unexec if [ ! -s %D/etc/imap/mailboxes ]; then ${RM} %D/etc/imap/mailboxes; fi" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${MKDIR} %D/etc/imap" >>${TMPPLIST} + @${ECHO_CMD} "@unexec if [ ! -s %D/etc/imap/mailboxes ]; then ${RM} %D/etc/imap/mailboxes; fi" >>${TMPPLIST} .for dir in user quota proc log msg - @${ECHO} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST} - @${ECHO} "@unexec rmdir %D/etc/imap/${dir} 2>/dev/null || true" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${MKDIR} %D/etc/imap/${dir}" >>${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir %D/etc/imap/${dir} 2>/dev/null || true" >>${TMPPLIST} .endfor - @${ECHO} "@unexec rmdir %D/etc/imap 2>/dev/null || true" >>${TMPPLIST} - @${ECHO} "@exec ${TOUCH} %D/etc/imap/mailboxes" >>${TMPPLIST} - @${ECHO} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST} - @${ECHO} "@mode u=rwx,go=" >>${TMPPLIST} - @${ECHO} "@exec ${MKDIR} /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CHOWN} cyrus:cyrus /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@exec ${CHMOD} g-w,o= /var/spool/imap" >>${TMPPLIST} - @${ECHO} "@cwd /var" >>${TMPPLIST} - @${ECHO} "@dirrm spool/imap" >>${TMPPLIST} + @${ECHO_CMD} "@unexec rmdir %D/etc/imap 2>/dev/null || true" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${TOUCH} %D/etc/imap/mailboxes" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${CHOWN} -R cyrus:cyrus %D/etc/imap" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${CHMOD} -R g-w,o= %D/etc/imap" >>${TMPPLIST} + @${ECHO_CMD} "@mode u=rwx,go=" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${MKDIR} /var/spool/imap" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${CHOWN} cyrus:cyrus /var/spool/imap" >>${TMPPLIST} + @${ECHO_CMD} "@exec ${CHMOD} g-w,o= /var/spool/imap" >>${TMPPLIST} + @${ECHO_CMD} "@cwd /var" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm spool/imap" >>${TMPPLIST} @PKG_PREFIX=${PREFIX} ${PKGINSTALL} ${PKGNAME} POST-INSTALL .include <bsd.port.mk> diff --git a/mail/ezmlm-idx/Makefile b/mail/ezmlm-idx/Makefile index c2ae1614a81f..2887b0821790 100644 --- a/mail/ezmlm-idx/Makefile +++ b/mail/ezmlm-idx/Makefile @@ -82,21 +82,21 @@ pre-patch: @cd ${WRKSRC} && ${PATCH} < idx.patch post-patch: - @${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin - @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - @${ECHO} ${CC} -s > ${WRKSRC}/conf-ld + @${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin + @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc + @${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld .if defined(WITH_MYSQL) - @${ECHO} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_mysql/conf-sqlcc - @${ECHO} ${EXTRACT_LIB} > ${WRKSRC}/sub_mysql/conf-sqlld + @${ECHO_CMD} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_mysql/conf-sqlcc + @${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_mysql/conf-sqlld .elif defined(WITH_POSTGRESQL) - @${ECHO} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_pgsql/conf-sqlcc - @${ECHO} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld + @${ECHO_CMD} ${EXTRACT_INCLUDE} > ${WRKSRC}/sub_pgsql/conf-sqlcc + @${ECHO_CMD} ${EXTRACT_LIB} > ${WRKSRC}/sub_pgsql/conf-sqlld .endif - @${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man - @${ECHO} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail - @${ECHO} ${PREFIX} > ${WRKDIR}/.PPREFIX - @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX - @${ECHO} ${NOPORTDOCS} ${WITH_MYSQL} ${WITH_POSTGRESQL}>> ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man + @${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${NOPORTDOCS} ${WITH_MYSQL} ${WITH_POSTGRESQL}>> ${WRKDIR}/.PPREFIX @${MV} ${WRKSRC}/idx.h ${WRKSRC}/idx.h.orig @${SED} -e 's#/etc/ezmlm/#'${PREFIX}'/etc/ezmlm/#' \ < ${WRKSRC}/idx.h.orig > ${WRKSRC}/idx.h @@ -106,9 +106,9 @@ post-patch: .endif pre-install: - @${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX - @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX - @${ECHO} ${NOPORTDOCS} ${WITH_MYSQL} ${WITH_POSTGRESQL}>> ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${NOPORTDOCS} ${WITH_MYSQL} ${WITH_POSTGRESQL}>> ${WRKDIR}/.IPREFIX @diff ${WRKDIR}/.[PI]PREFIX || (${ECHO} ${DIFF_MSG} && exit 1) do-install: diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index 3f12920b520d..9a660391f541 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -39,17 +39,17 @@ MY_PROGRAMS= ezmlm-make ezmlm-manage ezmlm-send ezmlm-reject ezmlm-return \ ezmlm-warn ezmlm-weed ezmlm-list ezmlm-sub ezmlm-unsub post-patch: - @${ECHO} ${PREFIX}/bin > ${WRKSRC}/conf-bin - @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - @${ECHO} ${CC} -s > ${WRKSRC}/conf-ld - @${ECHO} ${PREFIX}/man > ${WRKSRC}/conf-man - @${ECHO} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail - @${ECHO} ${PREFIX} > ${WRKDIR}/.PPREFIX - @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${PREFIX}/bin > ${WRKSRC}/conf-bin + @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc + @${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld + @${ECHO_CMD} ${PREFIX}/man > ${WRKSRC}/conf-man + @${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX pre-install: - @${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX - @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX @diff ${WRKDIR}/.[PI]PREFIX || (${ECHO} ${DIFF_MSG} && exit 1) do-install: diff --git a/mail/faces/Makefile b/mail/faces/Makefile index a7ac33282650..ae3605c75a16 100644 --- a/mail/faces/Makefile +++ b/mail/faces/Makefile @@ -58,7 +58,7 @@ post-install: ${CP} -f ${WRKSRC}/scripts/README.kinzler ${PREFIX}/share/doc/${PORTNAME}; \ ${CP} -f ${WRKSRC}/scripts/from.allrc-eg ${PREFIX}/share/doc/${PORTNAME}; \ ${MKDIR} ${DATADIR}/lib; \ - ${ECHO} ";# See ${PREFIX}/share/doc/${PORTNAME}/from.allrc-eg for an example" \ + ${ECHO_CMD} ";# See ${PREFIX}/share/doc/${PORTNAME}/from.allrc-eg for an example" \ > ${DATADIR}/lib/allrc; \ fi .endif diff --git a/mail/mew/Makefile b/mail/mew/Makefile index 42f8eb662fd0..e9f596d3ba26 100644 --- a/mail/mew/Makefile +++ b/mail/mew/Makefile @@ -85,7 +85,7 @@ post-install: # ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp # #pre-arrange: -# ${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment +# ${ECHO_CMD} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment # ${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \ # ${SH} ${FILESDIR}/tmpl2file.sh # ${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} ${SH} ${FILESDIR}/message.sh diff --git a/mail/mew2/Makefile b/mail/mew2/Makefile index bd2ca7ea3946..59478f718e58 100644 --- a/mail/mew2/Makefile +++ b/mail/mew2/Makefile @@ -77,7 +77,7 @@ post-install: # ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp # #pre-arrange: -# ${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment +# ${ECHO_CMD} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment # ${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \ # MEW_MAJOR_VER=${MEW_MAJOR_VER} \ # ${SH} ${FILESDIR}/tmpl2file.sh diff --git a/mail/mew3/Makefile b/mail/mew3/Makefile index bd2ca7ea3946..59478f718e58 100644 --- a/mail/mew3/Makefile +++ b/mail/mew3/Makefile @@ -77,7 +77,7 @@ post-install: # ${PREFIX}/${EMACS_LIBDIR_WITH_VER}/site-lisp # #pre-arrange: -# ${ECHO} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment +# ${ECHO_CMD} ${COMMENT_TEXT} > ${PKGDIR}/pkg-comment # ${SETENV} ${SCRIPTS_ENV} WRKTMPDIR=${PKGDIR} TMPL_FILES=pkg-descr \ # MEW_MAJOR_VER=${MEW_MAJOR_VER} \ # ${SH} ${FILESDIR}/tmpl2file.sh diff --git a/mail/popa3d/Makefile b/mail/popa3d/Makefile index 5840477613c0..fb8c4dd2ee29 100644 --- a/mail/popa3d/Makefile +++ b/mail/popa3d/Makefile @@ -27,9 +27,9 @@ EXTRA_PATCHES+= ${FILESDIR}/pop-before-sendmail.patch PLIST= ${WRKDIR}/.PLIST.more pre-configure: - @${ECHO} "%%PORTDOCS%%share/doc/popa3d/POPAUTH" >${PLIST} + @${ECHO_CMD} "%%PORTDOCS%%share/doc/popa3d/POPAUTH" >${PLIST} @${CAT} ${PKGDIR}/pkg-plist >>${PLIST} - @${ECHO} "share/sendmail/cf/hack/popauth.m4" >>${PLIST} + @${ECHO_CMD} "share/sendmail/cf/hack/popauth.m4" >>${PLIST} post-patch: @${PERL5} -pi -e "s=db1/db.h=db.h=" ${WRKSRC}/pop_root.c diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile index d62581431253..4d1d50123bcc 100644 --- a/mail/postfix-current/Makefile +++ b/mail/postfix-current/Makefile @@ -87,7 +87,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -185,14 +185,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix/Makefile b/mail/postfix/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix/Makefile +++ b/mail/postfix/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix1/Makefile b/mail/postfix1/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix1/Makefile +++ b/mail/postfix1/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix20/Makefile b/mail/postfix20/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix20/Makefile +++ b/mail/postfix20/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix21/Makefile b/mail/postfix21/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix21/Makefile +++ b/mail/postfix21/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix22/Makefile b/mail/postfix22/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix22/Makefile +++ b/mail/postfix22/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix23/Makefile b/mail/postfix23/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix23/Makefile +++ b/mail/postfix23/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix24/Makefile b/mail/postfix24/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix24/Makefile +++ b/mail/postfix24/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix25/Makefile b/mail/postfix25/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix25/Makefile +++ b/mail/postfix25/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix26/Makefile b/mail/postfix26/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix26/Makefile +++ b/mail/postfix26/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix27/Makefile +++ b/mail/postfix27/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/postfix28/Makefile b/mail/postfix28/Makefile index 9a23d6b607b9..0093acf6de50 100644 --- a/mail/postfix28/Makefile +++ b/mail/postfix28/Makefile @@ -83,7 +83,7 @@ post-extract: post-patch: (cd ${WRKSRC} && ${MAKE} -f Makefile.init makefiles ${MAKEFILEFLAGS} \ CCARGS="${POSTFIX_CCARGS}" AUXLIBS="${POSTFIX_AUXLIBS}" && \ - ${ECHO} "all: default" >> Makefile) + ${ECHO_CMD} "all: default" >> Makefile) pre-install: @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL @@ -170,14 +170,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating postfix in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - ${ECHO} "#" > /etc/mail/mailer.conf - ${ECHO} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf - ${ECHO} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "#" >> /etc/mail/mailer.conf - ${ECHO} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf - ${ECHO} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" > /etc/mail/mailer.conf + ${ECHO_CMD} -n "# Execute the Postfix sendmail program" >> /etc/mail/mailer.conf + ${ECHO_CMD} ", named ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "#" >> /etc/mail/mailer.conf + ${ECHO_CMD} "sendmail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "send-mail ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "mailq ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf + ${ECHO_CMD} "newaliases ${PREFIX}/sbin/sendmail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail" @if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/prom-mew/Makefile b/mail/prom-mew/Makefile index 5f9f57cd935e..594783ab8d96 100644 --- a/mail/prom-mew/Makefile +++ b/mail/prom-mew/Makefile @@ -34,7 +34,7 @@ do-install: # For xemacs package install configuration @${MKDIR} ${SITEPKGDIR}/lisp/prom-mew ${SITEPKGDIR}/pkginfo @${LN} -sf ${ELISPDIR}/prom-mew.el ${SITEPKGDIR}/lisp/prom-mew/prom-mew.el - @${ECHO} 'pkginfo/MANIFEST.prom-mew' > ${SITEPKGDIR}/pkginfo/MANIFEST.prom-mew - @${ECHO} 'lisp/prom-mew/prom-mew.el' >> ${SITEPKGDIR}/pkginfo/MANIFEST.prom-mew + @${ECHO_CMD} 'pkginfo/MANIFEST.prom-mew' > ${SITEPKGDIR}/pkginfo/MANIFEST.prom-mew + @${ECHO_CMD} 'lisp/prom-mew/prom-mew.el' >> ${SITEPKGDIR}/pkginfo/MANIFEST.prom-mew .include <bsd.port.mk> diff --git a/mail/prom-wl/Makefile b/mail/prom-wl/Makefile index 2a92996f5565..04d34dedf2d9 100644 --- a/mail/prom-wl/Makefile +++ b/mail/prom-wl/Makefile @@ -34,7 +34,7 @@ do-install: # For xemacs package install configuration @${MKDIR} ${SITEPKGDIR}/lisp/prom-wl ${SITEPKGDIR}/pkginfo @${LN} -sf ${ELISPDIR}/prom-wl.el ${SITEPKGDIR}/lisp/prom-wl/prom-wl.el - @${ECHO} 'pkginfo/MANIFEST.prom-wl' > ${SITEPKGDIR}/pkginfo/MANIFEST.prom-wl - @${ECHO} 'lisp/prom-wl/prom-wl.el' >> ${SITEPKGDIR}/pkginfo/MANIFEST.prom-wl + @${ECHO_CMD} 'pkginfo/MANIFEST.prom-wl' > ${SITEPKGDIR}/pkginfo/MANIFEST.prom-wl + @${ECHO_CMD} 'lisp/prom-wl/prom-wl.el' >> ${SITEPKGDIR}/pkginfo/MANIFEST.prom-wl .include <bsd.port.mk> diff --git a/mail/pygmy/Makefile b/mail/pygmy/Makefile index d526e641f2cc..d6c646252958 100644 --- a/mail/pygmy/Makefile +++ b/mail/pygmy/Makefile @@ -22,8 +22,8 @@ MAKE_ENV= PYTHON_VERSION="${PYTHON_VERSION}" ALL_TARGET= pythonprogs do-configure: - @${ECHO} "PYGMY_PREFIX='${PREFIX}/share'" > ${WRKSRC}/prefix.py - @${ECHO} "PYGMY_ICONDIR='${PREFIX}/share/pygmy/icons'" >> ${WRKSRC}/prefix.py + @${ECHO_CMD} "PYGMY_PREFIX='${PREFIX}/share'" > ${WRKSRC}/prefix.py + @${ECHO_CMD} "PYGMY_ICONDIR='${PREFIX}/share/pygmy/icons'" >> ${WRKSRC}/prefix.py do-install: ${MKDIR} ${PREFIX}/share/pygmy/icons diff --git a/mail/qmail/Makefile b/mail/qmail/Makefile index 6736e725c198..a9c203910b84 100644 --- a/mail/qmail/Makefile +++ b/mail/qmail/Makefile @@ -226,14 +226,14 @@ post-post-patch: do-configure: @# Create/Check the necessary groups/users @PKG_PREFIX=${PREFIX} ${PERL5} ${PKGINSTALL} - @${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc - @${ECHO} ${PREFIX} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc + @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-qmail .if defined(WITH_BIG_CONCURRENCY_PATCH) \ && !defined(MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER) \ && defined(WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT) @if [ ${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT} -gt 0 ]; \ then \ - ${ECHO} "${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT}" \ + ${ECHO_CMD} "${WITH_BIG_CONCURRENCY_PATCH_CONCURRENCY_LIMIT}" \ > ${WRKSRC}/conf-spawn ; \ fi .endif # MAIN_QMAIL_PORT_WITH_BIG_CONCURRENCY_PATCH_BARRIER @@ -258,7 +258,7 @@ do-install: ${INSTALL_DATA} ${DOCFILES} ${PREFIX}/${DOCDIR} .endif .if defined(PACKAGE_BUILDING) - @${ECHO} "FreeBSD Binary package qmail installation" \ + @${ECHO_CMD} "FreeBSD Binary package qmail installation" \ > ${PREFIX}/${DOCDIR}/SYSDEPS .else @cd ${WRKSRC} && ${CAT} `${CAT} SYSDEPS` \ @@ -287,10 +287,10 @@ thereal-post-patch: .for i in ${BOOTFILES} @if [ -f ${i}.sh ] ; \ then \ - ${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO} "Usage: `basename \$$0` {start|stop}" >&2\n\texit 64\n\t;;\nesac!' $i.sh > ${WRKDIR}/${i:T} ; \ + ${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO_CMD} "Usage: `basename \$$0` {start|stop}" >&2\n\texit 64\n\t;;\nesac!' $i.sh > ${WRKDIR}/${i:T} ; \ elif [ -f ${i} ] ; \ then \ - ${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO} "Usage: `basename \$$0` {start|stop}" >&2\n\texit 64\n\t;;\nesac!' $i > ${WRKDIR}/${i:T} ; \ + ${PERL} -p -ne 's!QMAIL/!${PREFIX}/!;s!^(exec)!case "\$$1" in\nstart)\n\t\1!;s!(qmail)$$!\1\&\n\texit 0\n\t;;\nstop)\n\texec killall qmail-send\n\t;;\n*)\n\t${ECHO_CMD} "Usage: `basename \$$0` {start|stop}" >&2\n\texit 64\n\t;;\nesac!' $i > ${WRKDIR}/${i:T} ; \ fi .endfor @${SED} s!/var/qmail/!${PREFIX}/!g ${FILESDIR}/mailer.conf.sample > \ @@ -327,7 +327,7 @@ disable-sendmail: thereal-disable-sendmail @${ECHO_MSG} "===> (i.e., added sendmail_enable=\¨NO\¨ to rc.conf)" @if [ -f ${RC_CONF_FILE} ]; \ then \ - ${ECHO} sendmail_enable=\"NO\" >> ${RC_CONF_FILE} ; \ + ${ECHO_CMD} sendmail_enable=\"NO\" >> ${RC_CONF_FILE} ; \ fi enable-sendmail: thereal-disable-sendmail diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile index 790b0365d627..396af1c4d9cc 100644 --- a/mail/qmailanalog/Makefile +++ b/mail/qmailanalog/Makefile @@ -44,14 +44,14 @@ post-patch: @perl -pi.bak -e "s|.usr.local.qmailanalog|${QMPREFIX}|" ${WRKSRC}/conf-home @perl -pi.bak -e "s|-O2|${CFLAGS}|" ${WRKSRC}/conf-cc @perl -pi.bak -e '$$_ = "" if /cat/' ${WRKSRC}/hier.c - @${ECHO} ${PREFIX} > ${WRKDIR}/.PPREFIX - @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.PPREFIX + @${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX pre-install: - @${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX - @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${PREFIX} > ${WRKDIR}/.IPREFIX + @${ECHO_CMD} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX @diff ${WRKDIR}/.[PI]PREFIX > /dev/null \ - || (${ECHO} ${DIFF_MSG} && exit 1) + || (${ECHO_CMD} ${DIFF_MSG} && exit 1) @${MKDIR} ${QMPREFIX} .include <bsd.port.mk> diff --git a/mail/qtools/Makefile b/mail/qtools/Makefile index 3bbbcdf185ad..1dc333632364 100644 --- a/mail/qtools/Makefile +++ b/mail/qtools/Makefile @@ -27,8 +27,8 @@ NO_PACKAGE= A possibly inherited DJB-style license would prohibit \ distribution of modified binary packages post-patch: - @${ECHO} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc - @${ECHO} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld + @${ECHO_CMD} "${CC} ${CFLAGS}" > ${WRKSRC}/conf-cc + @${ECHO_CMD} "${CC} ${CFLAGS} ${STRIP}" > ${WRKSRC}/conf-ld @${PERL} -pi -e 's!/usr/local!${PREFIX}!g' ${WRKSRC}/conf-home .include <bsd.port.mk> diff --git a/mail/sendmail-old/Makefile b/mail/sendmail-old/Makefile index 3d670ffbf35a..9463e2be41c7 100644 --- a/mail/sendmail-old/Makefile +++ b/mail/sendmail-old/Makefile @@ -113,12 +113,12 @@ pre-install: ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} @cd ${WRKSRC} && find -d cf -type d | \ ${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST} - @${ECHO} "@dirrm share/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST} .for i in ${DOCS} - @${ECHO} `${BASENAME} ${i}` | \ + @${ECHO_CMD} `${BASENAME} ${i}` | \ ${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST} .endfor - @${ECHO} "@dirrm share/doc/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST} .endif # We want mail.local and rmail for our system. diff --git a/mail/sendmail/Makefile b/mail/sendmail/Makefile index 54160e195a81..462b7f9d4b5a 100644 --- a/mail/sendmail/Makefile +++ b/mail/sendmail/Makefile @@ -110,12 +110,12 @@ pre-install: ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} @cd ${WRKSRC} && find -d cf -type d | \ ${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST} - @${ECHO} "@dirrm share/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST} .for i in ${DOCS} - @${ECHO} `${BASENAME} ${i}` | \ + @${ECHO_CMD} `${BASENAME} ${i}` | \ ${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST} .endfor - @${ECHO} "@dirrm share/doc/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST} .endif # We want mail.local and rmail for our system. diff --git a/mail/sendmail811/Makefile b/mail/sendmail811/Makefile index 3d670ffbf35a..9463e2be41c7 100644 --- a/mail/sendmail811/Makefile +++ b/mail/sendmail811/Makefile @@ -113,12 +113,12 @@ pre-install: ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} @cd ${WRKSRC} && find -d cf -type d | \ ${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST} - @${ECHO} "@dirrm share/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST} .for i in ${DOCS} - @${ECHO} `${BASENAME} ${i}` | \ + @${ECHO_CMD} `${BASENAME} ${i}` | \ ${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST} .endfor - @${ECHO} "@dirrm share/doc/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST} .endif # We want mail.local and rmail for our system. diff --git a/mail/sendmail812/Makefile b/mail/sendmail812/Makefile index 54160e195a81..462b7f9d4b5a 100644 --- a/mail/sendmail812/Makefile +++ b/mail/sendmail812/Makefile @@ -110,12 +110,12 @@ pre-install: ${AWK} '{print "share/sendmail/" $$1}' >>${PLIST} @cd ${WRKSRC} && find -d cf -type d | \ ${AWK} '{print "@dirrm share/sendmail/" $$1}' >>${PLIST} - @${ECHO} "@dirrm share/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/sendmail" >>${PLIST} .for i in ${DOCS} - @${ECHO} `${BASENAME} ${i}` | \ + @${ECHO_CMD} `${BASENAME} ${i}` | \ ${AWK} '{print "share/doc/sendmail/" $$1}' >>${PLIST} .endfor - @${ECHO} "@dirrm share/doc/sendmail" >>${PLIST} + @${ECHO_CMD} "@dirrm share/doc/sendmail" >>${PLIST} .endif # We want mail.local and rmail for our system. diff --git a/mail/serialmail/Makefile b/mail/serialmail/Makefile index a29fb08fe5c1..37ef07d21a5e 100644 --- a/mail/serialmail/Makefile +++ b/mail/serialmail/Makefile @@ -34,10 +34,10 @@ NO_PACKAGE= Unsure of djb's license ALL_TARGET= it post-configure: - @${ECHO} ${PREFIX} > ${WRKSRC}/conf-home - @${ECHO} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc - @${ECHO} ${CC} -s > ${WRKSRC}/conf-ld - @${ECHO} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail + @${ECHO_CMD} ${PREFIX} > ${WRKSRC}/conf-home + @${ECHO_CMD} ${CC} ${CFLAGS} > ${WRKSRC}/conf-cc + @${ECHO_CMD} ${CC} -s > ${WRKSRC}/conf-ld + @${ECHO_CMD} ${QMAIL_DIR} > ${WRKSRC}/conf-qmail do-install: .for file in serialqmtp serialsmtp maildirserial setlock diff --git a/mail/smail/Makefile b/mail/smail/Makefile index 5e0bf7e1bc53..20e3f5f1a7f5 100644 --- a/mail/smail/Makefile +++ b/mail/smail/Makefile @@ -41,14 +41,14 @@ replace: .if ${OSVERSION} >= 400014 @${ECHO_MSG} "===> Activating smail in /etc/mail/mailer.conf" ${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.bak - @${ECHO} "#" > /etc/mail/mailer.conf - @${ECHO} -n "# Execute the smail sendmail program" >> /etc/mail/mailer.conf - @${ECHO} ", named ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf - @${ECHO} "#" >> /etc/mail/mailer.conf - @${ECHO} "sendmail ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf - @${ECHO} "send-mail ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf - @${ECHO} "mailq ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf - @${ECHO} "newaliases ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf + @${ECHO_CMD} "#" > /etc/mail/mailer.conf + @${ECHO_CMD} -n "# Execute the smail sendmail program" >> /etc/mail/mailer.conf + @${ECHO_CMD} ", named ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf + @${ECHO_CMD} "#" >> /etc/mail/mailer.conf + @${ECHO_CMD} "sendmail ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf + @${ECHO_CMD} "send-mail ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf + @${ECHO_CMD} "mailq ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf + @${ECHO_CMD} "newaliases ${PREFIX}/bin/smail" >> /etc/mail/mailer.conf .else @${ECHO_MSG} "===> Replacing sendmail programs" if [ -e /usr/sbin/sendmail ]; then \ diff --git a/mail/ssmtp/Makefile b/mail/ssmtp/Makefile index de6db386ccb4..811ce44c2380 100644 --- a/mail/ssmtp/Makefile +++ b/mail/ssmtp/Makefile @@ -37,10 +37,10 @@ replace: @${ECHO} backuping old /etc/mail/mailer.conf @${MV} -f /etc/mail/mailer.conf /etc/mail/mailer.conf.old-ssmtp @${ECHO} Replacing mailwarpper config - @${ECHO} "sendmail ${PREFIX}/sbin/ssmtp" > /etc/mail/mailer.conf - @${ECHO} "send-mail ${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf - @${ECHO} "mailq /bin/echo" >> /etc/mail/mailer.conf - @${ECHO} "newaliases /bin/echo" >> /etc/mail/mailer.conf + @${ECHO_CMD} "sendmail ${PREFIX}/sbin/ssmtp" > /etc/mail/mailer.conf + @${ECHO_CMD} "send-mail ${PREFIX}/sbin/ssmtp" >> /etc/mail/mailer.conf + @${ECHO_CMD} "mailq /bin/echo" >> /etc/mail/mailer.conf + @${ECHO_CMD} "newaliases /bin/echo" >> /etc/mail/mailer.conf .else @${ECHO} backuping old /usr/sbin/sendmail @${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.OFF diff --git a/mail/zmailer/Makefile b/mail/zmailer/Makefile index 9f85720dffc0..983a6b6ac46e 100644 --- a/mail/zmailer/Makefile +++ b/mail/zmailer/Makefile @@ -70,12 +70,12 @@ post-install: -e s:@PORTSDIR@:${PORTSDIR}:g # set up the initial mail.conf with reasonable settings. - @${ECHO} "# Where am I?" > ${PREFIX}/etc/zmailer/mail.conf.sample - @${ECHO} "orgdomain="${DOMAIN} >> ${PREFIX}/etc/zmailer/mail.conf.sample - @${ECHO} "# Who am I?" >> ${PREFIX}/etc/zmailer/mail.conf.sample - @${ECHO} "hostname="`/bin/hostname -s`'.$$orgdomain' >> ${PREFIX}/etc/zmailer/mail.conf.sample - @${ECHO} "# Who do I claim to be?" >> ${PREFIX}/etc/zmailer/mail.conf.sample - @${ECHO} 'mydomain=$$orgdomain' >> ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} "# Where am I?" > ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} "orgdomain="${DOMAIN} >> ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} "# Who am I?" >> ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} "hostname="`/bin/hostname -s`'.$$orgdomain' >> ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} "# Who do I claim to be?" >> ${PREFIX}/etc/zmailer/mail.conf.sample + @${ECHO_CMD} 'mydomain=$$orgdomain' >> ${PREFIX}/etc/zmailer/mail.conf.sample # obtained directly from ports/mail/postfix # with minor hacks by the originator of this port <veers@disturbed.net> |