diff options
99 files changed, 415 insertions, 415 deletions
diff --git a/dns/ddup/Makefile b/dns/ddup/Makefile index 22099e710d5b..2b83fa97279d 100644 --- a/dns/ddup/Makefile +++ b/dns/ddup/Makefile @@ -32,7 +32,7 @@ post-patch: pre-build: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ - ${ECHO} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h + ${ECHO_CMD} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h post-install: ${INSTALL_SCRIPT} ${WRKSRC}/ddupcron.sh ${PREFIX}/sbin/ diff --git a/dns/dhisd/Makefile b/dns/dhisd/Makefile index f41aa96458df..03e6c16643cc 100644 --- a/dns/dhisd/Makefile +++ b/dns/dhisd/Makefile @@ -24,23 +24,23 @@ do-install: post-install: ${ECHO} "===> Installing ${PREFIX}/bin/dhisd." ${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${PREFIX}/bin - @${ECHO} "bin/dhisd" >> ${TMPPLIST} + @${ECH_CMDO} "bin/dhisd" >> ${TMPPLIST} ${ECHO} "===> Installing ${PREFIX}/bin/genkeys." ${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/bin - @${ECHO} "bin/genkeys" >> ${TMPPLIST} + @${ECH_CMDO} "bin/genkeys" >> ${TMPPLIST} ${ECHO} "===> Creating ${PREFIX}/etc/dhis and installing sample db files." @${MKDIR} ${PREFIX}/etc/dhis @${CHMOD} 700 ${PREFIX}/etc/dhis @${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${PREFIX}/etc/dhis/dhis.db.sample - @${ECHO} "etc/dhis/dhis.db.sample" >> ${TMPPLIST} + @${ECHO_CMD} "etc/dhis/dhis.db.sample" >> ${TMPPLIST} @${INSTALL_DATA} ${WRKSRC}/services.db.sample ${PREFIX}/etc/dhis/services.db.sample - @${ECHO} "etc/dhis/services.db.sample" >> ${TMPPLIST} + @${ECHO_CMD} "etc/dhis/services.db.sample" >> ${TMPPLIST} @${CHMOD} 600 ${PREFIX}/etc/dhis/* - @${ECHO} "@dirrm etc/dhis" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm etc/dhis" >> ${TMPPLIST} .if !exists(${PREFIX}/etc/rc.d/dhisd.sh) ${ECHO} "===> Installing ${PREFIX}/etc/rc.d/dhid.sh startup file." ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhisd.sh ${PREFIX}/etc/rc.d/dhisd.sh - @${ECHO} "etc/rc.d/dhisd.sh" >> ${TMPPLIST} + @${ECHO_CMD} "etc/rc.d/dhisd.sh" >> ${TMPPLIST} .endif .if !defined(NOPORTDOCS) ${ECHO} "===> Installing documentation in ${DOCSDIR}" @@ -48,11 +48,11 @@ post-install: @${CHMOD} 755 ${DOCSDIR} .for DOCFILE in ${DOCFILES} @${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR} - @${ECHO} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST} + @${ECHO_CMD} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST} .endfor ${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${DOCSDIR} - @${ECHO} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST} - @${ECHO} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST} + @${ECHO_CMD} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST} .endif @${ECHO} "--------------------------------------------------------------------------" @${ECHO} "Before dhisd can run, you will need configure BIND." 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> diff --git a/math/glove/Makefile b/math/glove/Makefile index 54bb1241aebe..2425b53059ba 100644 --- a/math/glove/Makefile +++ b/math/glove/Makefile @@ -72,7 +72,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants pre-build: diff --git a/math/pygist/Makefile b/math/pygist/Makefile index 9442c5c5705a..46ba62d92d51 100644 --- a/math/pygist/Makefile +++ b/math/pygist/Makefile @@ -46,7 +46,7 @@ post-install: @${MKDIR} ${GISTDIR} ${INSTALL_DATA} ${WRKSRC}/*/Lib/* ${GISTDIR} @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${GISTDIR} - @${ECHO} "PyGist" > ${GISTDIR}/../PyGist.pth + @${ECHO_CMD} "PyGist" > ${GISTDIR}/../PyGist.pth ${MKDIR} ${EXAMPLEDIR} ${INSTALL_DATA} ${WRKSRC}/*/Demo/* ${EXAMPLEDIR} diff --git a/math/simpack/Makefile b/math/simpack/Makefile index b75c3b76ae11..f14e602550f7 100644 --- a/math/simpack/Makefile +++ b/math/simpack/Makefile @@ -130,17 +130,17 @@ create-lib-queuing: create-scripts: create-sdsmt-alias create-deq-alias create-sdsmt-alias: - @${ECHO} SDSMTLIB=${PREFIX}/lib/SimPack/func/slice/sdsmt \ + @${ECHO_CMD} SDSMTLIB=${PREFIX}/lib/SimPack/func/slice/sdsmt \ > ${WRKDIR}/temp/sdsmt.alias - @${ECHO} export SDSMTLIB >> ${WRKDIR}/temp/sdsmt.alias - @${ECHO} wish4.1 ${PREFIX}/lib/SimPack/func/slice/sdsmt/sdsmt \ + @${ECHO_CMD} export SDSMTLIB >> ${WRKDIR}/temp/sdsmt.alias + @${ECHO_CMD} wish4.1 ${PREFIX}/lib/SimPack/func/slice/sdsmt/sdsmt \ >> ${WRKDIR}/temp/sdsmt.alias create-deq-alias: - @${ECHO} PATCH=${PREFIX}/lib/SimPack/constraint/differential:$$PATCH \ + @${ECHO_CMD} PATCH=${PREFIX}/lib/SimPack/constraint/differential:$$PATCH \ > ${WRKDIR}/temp/deq.alias - @${ECHO} export PATCH >> ${WRKDIR}/temp/deq.alias - @${ECHO} ${PREFIX}/lib/SimPack/constraint/differential/deq $$* \ + @${ECHO_CMD} export PATCH >> ${WRKDIR}/temp/deq.alias + @${ECHO_CMD} ${PREFIX}/lib/SimPack/constraint/differential/deq $$* \ >> ${WRKDIR}/temp/deq.alias .include <bsd.port.post.mk> diff --git a/math/thx_1138/Makefile b/math/thx_1138/Makefile index 33e1ebefb12a..d9f8553dd216 100644 --- a/math/thx_1138/Makefile +++ b/math/thx_1138/Makefile @@ -73,7 +73,7 @@ post-extract: .endfor post-patch: - @${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \ + @${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \ ${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants pre-build: diff --git a/misc/afbackup/Makefile b/misc/afbackup/Makefile index 630f4ea6cd7c..4392d06e97cb 100644 --- a/misc/afbackup/Makefile +++ b/misc/afbackup/Makefile @@ -162,14 +162,14 @@ pre-install: @${ECHO} "==> Creating custom pkg-plist..." @${RM} -rf ${PLIST} .if !defined(NOPORTDOCS) - @for docfile in $(AFBACKUP_DOCS:S/^/share\/doc\/${PORTNAME}\//); do ${ECHO} $$docfile >>${PLIST}; done + @for docfile in $(AFBACKUP_DOCS:S/^/share\/doc\/${PORTNAME}\//); do ${ECHO_CMD} $$docfile >>${PLIST}; done .endif @for plistfile in ${PLIST_SRC}; do ${CAT} ${FILESDIR}/$$plistfile >>${PLIST}; done @${CAT} ${PLIST} | perl -nle 'print unless $$lines{$$_}++' >${PLIST}.tmp @${CAT} ${PLIST}.tmp ${FILESDIR}/pkg-plist.fixedorder >${PLIST} .if !defined(NOPORTDOCS) - @${ECHO} @cwd ${PREFIX} >>${PLIST} - @${ECHO} @dirrm share/doc/${PORTNAME} >>${PLIST} + @${ECHO_CMD} @cwd ${PREFIX} >>${PLIST} + @${ECHO_CMD} @dirrm share/doc/${PORTNAME} >>${PLIST} .endif @$(PKGINSTALL_ENV) ${PKGINSTALL} ${PKGNAME} PRE-INSTALL diff --git a/misc/compat22/Makefile b/misc/compat22/Makefile index 190cc1786cec..6f897b522fd0 100644 --- a/misc/compat22/Makefile +++ b/misc/compat22/Makefile @@ -39,7 +39,7 @@ do-extract: cd ${_DISTDIR} && ${CAT} ${DISTFILES} | ${TAR} -xzf - -C ${WRKDIR} do-build: - @( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ + @( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh do-install: diff --git a/misc/compat3x/Makefile b/misc/compat3x/Makefile index 8827893646b8..82b111ba92b9 100644 --- a/misc/compat3x/Makefile +++ b/misc/compat3x/Makefile @@ -69,7 +69,7 @@ do-extract: fi do-build: - @( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ + @( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh do-install: diff --git a/misc/compat4x/Makefile b/misc/compat4x/Makefile index bdfbadc8c9e4..c51586d5d122 100644 --- a/misc/compat4x/Makefile +++ b/misc/compat4x/Makefile @@ -90,7 +90,7 @@ do-extract: .endif do-build: - @( ${ECHO} '#!/bin/sh'; ${ECHO} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ + @( ${ECHO_CMD} '#!/bin/sh'; ${ECHO_CMD} '${LDCONFIG} -m ${LDCONFIG_RUNLIST}'; \ ) > ${WRKDIR}/000.${PORTNAME}.sh do-install: diff --git a/misc/libh/Makefile b/misc/libh/Makefile index 1a3c630ebc6c..f489b976736f 100644 --- a/misc/libh/Makefile +++ b/misc/libh/Makefile @@ -29,7 +29,7 @@ DISTFILES!= ${CAT} ${FILESDIR}/distfiles CVS_CMD?= cvs -z3 # arbitrary date for now. CVS_DATE= Thu December 21 18:20:00 GMT 2001 -CVS_DATE_!= ${ECHO} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g' +CVS_DATE_!= ${ECHO_CMD} -n "${CVS_DATE}" | ${SED} 's/[ \t:]/_/g' CVS_SITES?= :pserver:anonymous@usw4.freebsd.org:/home/libh/cvs STAMPFILE= ${DISTDIR}/${DISTNAME}/.stamp @@ -50,7 +50,7 @@ do-fetch: cd ${DISTDIR}; \ ${TAR} xfz ${DISTNAME}.${CVS_DATE_}.tar.gz \ ${DISTFILES}; \ - ${ECHO} -n "${CVS_DATE}" > ${STAMPFILE}; \ + ${ECHO_CMD} -n "${CVS_DATE}" > ${STAMPFILE}; \ exit; \ fi; \ unset CVS_RSH CVS_SERVER CVS_LOGIN || ${TRUE}; \ @@ -80,7 +80,7 @@ do-fetch: if [ "X$${CVS_LOGIN}" = "Xyes" ]; then \ ${CVS_CMD} -d $${CVS_SITE} logout < /dev/null; \ fi; \ - ${ECHO} -n ${CVS_DATE} > ${STAMPFILE}; \ + ${ECHO_CMD} -n ${CVS_DATE} > ${STAMPFILE}; \ ${ECHO_MSG} ">> CVS checkout successful." ;\ exit; \ fi ;\ diff --git a/misc/lile/Makefile b/misc/lile/Makefile index 30d1748c88cb..ea4d93a456a6 100644 --- a/misc/lile/Makefile +++ b/misc/lile/Makefile @@ -20,6 +20,6 @@ MAN1= ile.1 do-configure: @(cd ${WRKSRC}; ${MV} Makefile Makefile.old; \ ${SED} -e s:/usr/local:${PREFIX}: <Makefile.old > Makefile; \ - ${ECHO} all: ile >> Makefile; ${ECHO} CC=cc ${CFLAGS} >> Makefile) + ${ECHO_CMD} all: ile >> Makefile; ${ECHO_CMD} CC=cc ${CFLAGS} >> Makefile) .include <bsd.port.mk> diff --git a/misc/man.el/Makefile b/misc/man.el/Makefile index e3d1979a5781..2e62aacdf524 100644 --- a/misc/man.el/Makefile +++ b/misc/man.el/Makefile @@ -32,9 +32,9 @@ do-install: ${MKDIR} ${SITEPKGDIR}/lisp/${f} ${LN} -sf ${ELISPDIR}/${f}.el ${SITEPKGDIR}/lisp/${f}/${f}.el ${LN} -sf ${ELISPDIR}/i18n-man.el ${SITEPKGDIR}/lisp/${f}/i18n-man.el - ${ECHO} "pkginfo/MANIFEST.${f}" > ${SITEPKGDIR}/pkginfo/MANIFEST.${f} - ${ECHO} "lisp/${f}/${f}.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f} - ${ECHO} "lisp/${f}/i18n-man.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f} + ${ECHO_CMD} "pkginfo/MANIFEST.${f}" > ${SITEPKGDIR}/pkginfo/MANIFEST.${f} + ${ECHO_CMD} "lisp/${f}/${f}.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f} + ${ECHO_CMD} "lisp/${f}/i18n-man.el" >> ${SITEPKGDIR}/pkginfo/MANIFEST.${f} .endfor ${INSTALL_SCRIPT} ${FILESDIR}/byte-compile ${PREFIX}/share/doc/i18n-man diff --git a/misc/mc/Makefile b/misc/mc/Makefile index b6df70df3e42..08dc1ac3414c 100644 --- a/misc/mc/Makefile +++ b/misc/mc/Makefile @@ -45,7 +45,7 @@ pre-patch: PLIST= ${WRKDIR}/PLIST pre-install: @${CAT} ${PKGDIR}/pkg-plist > ${PLIST} - @${ECHO} bin/mcedit >> ${PLIST} + @${ECHO_CMD} bin/mcedit >> ${PLIST} .endif .include <bsd.port.mk> diff --git a/misc/patanjali/Makefile b/misc/patanjali/Makefile index ef948beb01ad..cb0470bf7e55 100644 --- a/misc/patanjali/Makefile +++ b/misc/patanjali/Makefile @@ -27,8 +27,8 @@ do-build: -DVERSION=\"1.0\" ${WRKSRC}/patanjali.c -o ${WRKSRC}/patanjali pre-install: - ${ECHO} bin/patanjali > ${PLIST} - ${ECHO} share/patanjali/patanjali-sutras-english.txt >> ${PLIST} + ${ECHO_CMD} bin/patanjali > ${PLIST} + ${ECHO_CMD} share/patanjali/patanjali-sutras-english.txt >> ${PLIST} do-install: ${MKDIR} ${DATADIR} diff --git a/misc/sword-modules/Makefile b/misc/sword-modules/Makefile index b6f4297eadbb..e090de95cdfd 100644 --- a/misc/sword-modules/Makefile +++ b/misc/sword-modules/Makefile @@ -70,12 +70,12 @@ post-install: for i in ${MODULE_FILES}; do \ tfiles=`${EXTRACT_CMD} -Z -1 ${DISTDIR}/${DIST_SUBDIR}/$${i}`; \ for j in $${tfiles}; do \ - ${ECHO} "share/sword/$${j}" >>${TMPPLIST}; \ - if [ "`${ECHO} $${j} | ${GREP} -v mods.d`" ]; then \ + ${ECHO_CMD} "share/sword/$${j}" >>${TMPPLIST}; \ + if [ "`${ECHO_CMD} $${j} | ${GREP} -v mods.d`" ]; then \ dirn=`${DIRNAME} $${j}`; \ while [ "$${dirn}" -a "$${dirn}" != "." -a \ "$${dirn}" != "/" ]; do \ - if [ ! "`${ECHO} \"$${tdirs}\" | ${GREP} \"$${dirn} \"`" ]; then \ + if [ ! "`${ECHO_CMD} \"$${tdirs}\" | ${GREP} \"$${dirn} \"`" ]; then \ tdirs="$${tdirs}$${dirn} "; \ fi; \ dirn=`${DIRNAME} $${dirn}`; \ @@ -85,8 +85,8 @@ post-install: done; \ ksorted=`for k in $${tdirs}; do printf "%s\n" $${k}; done | ${SORT} -r -t" "`;\ for j in $${ksorted}; do \ - ${ECHO} "@dirrm share/sword/$${j}" >>${TMPPLIST}; \ + ${ECHO_CMD} "@dirrm share/sword/$${j}" >>${TMPPLIST}; \ done; \ - ${ECHO} "@dirrm share/sword/mods.d" >>${TMPPLIST}; + ${ECHO_CMD} "@dirrm share/sword/mods.d" >>${TMPPLIST}; .include <bsd.port.mk> diff --git a/misc/sword/Makefile b/misc/sword/Makefile index d8b0d13efcf6..a025c3492fc8 100644 --- a/misc/sword/Makefile +++ b/misc/sword/Makefile @@ -34,14 +34,14 @@ INCLUDES= Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \ zipcomprs.h zlib.h ztext.h zverse.h pre-build: - @${ECHO} "instdir:= ${PREFIX}" >${WRKSRC}/localport.cfg + @${ECHO_CMD} "instdir:= ${PREFIX}" >${WRKSRC}/localport.cfg do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1 ${LN} -sf ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so - @${ECHO} "[Install]" >${PREFIX}/etc/sword.conf - @${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf + @${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf + @${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf ${MKDIR} ${DATADIR} ${MKDIR} ${PREFIX}/include/sword .for file in ${INCLUDES} diff --git a/misc/sword15/Makefile b/misc/sword15/Makefile index d8b0d13efcf6..a025c3492fc8 100644 --- a/misc/sword15/Makefile +++ b/misc/sword15/Makefile @@ -34,14 +34,14 @@ INCLUDES= Greek2Greek.h GreekChars.h canon.h cipherfil.h defs.h \ zipcomprs.h zlib.h ztext.h zverse.h pre-build: - @${ECHO} "instdir:= ${PREFIX}" >${WRKSRC}/localport.cfg + @${ECHO_CMD} "instdir:= ${PREFIX}" >${WRKSRC}/localport.cfg do-install: ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.a ${PREFIX}/lib ${INSTALL_PROGRAM} ${WRKSRC}/lib/libsword.so ${PREFIX}/lib/libsword.so.1 ${LN} -sf ${PREFIX}/lib/libsword.so.1 ${PREFIX}/lib/libsword.so - @${ECHO} "[Install]" >${PREFIX}/etc/sword.conf - @${ECHO} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf + @${ECHO_CMD} "[Install]" >${PREFIX}/etc/sword.conf + @${ECHO_CMD} "DataPath=${DATADIR}" >>${PREFIX}/etc/sword.conf ${MKDIR} ${DATADIR} ${MKDIR} ${PREFIX}/include/sword .for file in ${INCLUDES} diff --git a/net-im/climm/Makefile b/net-im/climm/Makefile index b53f3602be11..98035b204192 100644 --- a/net-im/climm/Makefile +++ b/net-im/climm/Makefile @@ -28,7 +28,7 @@ pre-configure: @${ECHO_MSG} "make WITH_MICQ_LANG=<your_lang>" @${ECHO_MSG} "" @${ECHO_MSG} "Currently supported <your_lang> values are:" - @${ECHO} " "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt + @${ECHO_CMD} " "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt .else @/usr/bin/printf "#define ${WITH_MICQ_LANG}_LANG\n#undef ENGLISH_LANG" >> \ ${WRKSRC}/../include/config.h diff --git a/net-im/micq/Makefile b/net-im/micq/Makefile index b53f3602be11..98035b204192 100644 --- a/net-im/micq/Makefile +++ b/net-im/micq/Makefile @@ -28,7 +28,7 @@ pre-configure: @${ECHO_MSG} "make WITH_MICQ_LANG=<your_lang>" @${ECHO_MSG} "" @${ECHO_MSG} "Currently supported <your_lang> values are:" - @${ECHO} " "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt + @${ECHO_CMD} " "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt .else @/usr/bin/printf "#define ${WITH_MICQ_LANG}_LANG\n#undef ENGLISH_LANG" >> \ ${WRKSRC}/../include/config.h diff --git a/net-im/tik/Makefile b/net-im/tik/Makefile index f2a753261923..7bc7b18da639 100644 --- a/net-im/tik/Makefile +++ b/net-im/tik/Makefile @@ -40,26 +40,26 @@ do-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} .for d in ${SRCDIRS} @${MKDIR} ${PREFIX}/${d} - @${ECHO} @dirrm ${d} >> ${PLIST}.dirrm + @${ECHO_CMD} @dirrm ${d} >> ${PLIST}.dirrm .endfor .for f in ${SRCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/tik/${f} - @${ECHO} share/tik/${f} >> ${PLIST} + @${ECHO_CMD} share/tik/${f} >> ${PLIST} .endfor @${MKDIR} ${PREFIX}/${EGDIR} - @${ECHO} @dirrm ${EGDIR} >> ${PLIST}.dirrm + @${ECHO_CMD} @dirrm ${EGDIR} >> ${PLIST}.dirrm .for f in ${EGFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${EGDIR}/${f} - @${ECHO} ${EGDIR}/${f} >> ${PLIST} + @${ECHO_CMD} ${EGDIR}/${f} >> ${PLIST} .endfor @${SED} 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/tik >${WRKDIR}/tik.sh ${INSTALL_SCRIPT} ${WRKDIR}/tik.sh ${PREFIX}/bin/tik .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${DOCDIR} - @${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm + @${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}.dirrm .for f in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f} - @${ECHO} ${DOCDIR}/${f} >> ${PLIST} + @${ECHO_CMD} ${DOCDIR}/${f} >> ${PLIST} .endfor .endif @${SORT} -r ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm diff --git a/net-p2p/dctc-gui/Makefile b/net-p2p/dctc-gui/Makefile index bcf02d9fc839..4c5f2015f370 100644 --- a/net-p2p/dctc-gui/Makefile +++ b/net-p2p/dctc-gui/Makefile @@ -38,10 +38,10 @@ post-patch: ${WRKSRC}/src/init_fnc.c post-configure: - @${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#ifndef SEMVMX' >> ${WRKSRC}/config.h - @${ECHO} '#define SEMVMX 32767' >> ${WRKSRC}/config.h - @${ECHO} '#endif' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#ifndef SEMVMX' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#define SEMVMX 32767' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#endif' >> ${WRKSRC}/config.h post-install: .ifndef(NOPORTDOCS) diff --git a/net-p2p/dctc/Makefile b/net-p2p/dctc/Makefile index 2ff8087bf380..3bebe965560c 100644 --- a/net-p2p/dctc/Makefile +++ b/net-p2p/dctc/Makefile @@ -41,14 +41,14 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-configure: - @${ECHO} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#endif' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#endif' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h do-install: .ifndef(NOPORTDOCS) diff --git a/net/citrix_ica/Makefile b/net/citrix_ica/Makefile index b988519800fd..f726fa22f8c3 100644 --- a/net/citrix_ica/Makefile +++ b/net/citrix_ica/Makefile @@ -52,13 +52,13 @@ do-install: ${FALSE} ; \ fi - @${ECHO} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ; + @${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ; @for dir in ${NSCP}; do \ if [ -e $${dir}/plugins/libnullplugin.so ]; then \ BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \ case $${BIN} in \ \(SYSV\),) \ - ${ECHO} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \ + ${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \ esac \ fi \ done diff --git a/net/citrix_xenapp/Makefile b/net/citrix_xenapp/Makefile index b988519800fd..f726fa22f8c3 100644 --- a/net/citrix_xenapp/Makefile +++ b/net/citrix_xenapp/Makefile @@ -52,13 +52,13 @@ do-install: ${FALSE} ; \ fi - @${ECHO} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ; + @${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\ny\n3" > ${WRKSRC}/response ; @for dir in ${NSCP}; do \ if [ -e $${dir}/plugins/libnullplugin.so ]; then \ BIN=`${FILE} $${dir}/plugins/libnullplugin.so | ${AWK} '{print $$11}'` ; \ case $${BIN} in \ \(SYSV\),) \ - ${ECHO} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \ + ${ECHO_CMD} -e "1\n${CDIR}\ny\ny\ny\n3" > ${WRKSRC}/response ; \ esac \ fi \ done diff --git a/net/dctc-gui/Makefile b/net/dctc-gui/Makefile index bcf02d9fc839..4c5f2015f370 100644 --- a/net/dctc-gui/Makefile +++ b/net/dctc-gui/Makefile @@ -38,10 +38,10 @@ post-patch: ${WRKSRC}/src/init_fnc.c post-configure: - @${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#ifndef SEMVMX' >> ${WRKSRC}/config.h - @${ECHO} '#define SEMVMX 32767' >> ${WRKSRC}/config.h - @${ECHO} '#endif' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#ifndef SEMVMX' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#define SEMVMX 32767' >> ${WRKSRC}/config.h + @${ECHO_CMD} '#endif' >> ${WRKSRC}/config.h post-install: .ifndef(NOPORTDOCS) diff --git a/net/dctc/Makefile b/net/dctc/Makefile index 2ff8087bf380..3bebe965560c 100644 --- a/net/dctc/Makefile +++ b/net/dctc/Makefile @@ -41,14 +41,14 @@ post-patch: ${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT} post-configure: - @${ECHO} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#endif' >> ${CONFIGURE_WRKSRC}/config.h - @${ECHO} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#ifndef MSG_NOSIGNAL' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '# define MSG_NOSIGNAL 0' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#endif' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#include <errno.h>' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#ifndef ENODATA' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '# define ENODATA ENOMSG' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#endif' >> ${CONFIGURE_WRKSRC}/config.h + @${ECHO_CMD} '#include <sys/param.h>' >> ${CONFIGURE_WRKSRC}/config.h do-install: .ifndef(NOPORTDOCS) diff --git a/net/ddup/Makefile b/net/ddup/Makefile index 22099e710d5b..2b83fa97279d 100644 --- a/net/ddup/Makefile +++ b/net/ddup/Makefile @@ -32,7 +32,7 @@ post-patch: pre-build: ${CP} ${FILESDIR}/Makefile ${WRKSRC}/ - ${ECHO} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h + ${ECHO_CMD} "#define file_name \"${PREFIX}/etc/ddup.conf\"" > ${WRKSRC}/options.h post-install: ${INSTALL_SCRIPT} ${WRKSRC}/ddupcron.sh ${PREFIX}/sbin/ diff --git a/net/dhisd/Makefile b/net/dhisd/Makefile index f41aa96458df..03e6c16643cc 100644 --- a/net/dhisd/Makefile +++ b/net/dhisd/Makefile @@ -24,23 +24,23 @@ do-install: post-install: ${ECHO} "===> Installing ${PREFIX}/bin/dhisd." ${INSTALL_PROGRAM} ${WRKSRC}/dhisd ${PREFIX}/bin - @${ECHO} "bin/dhisd" >> ${TMPPLIST} + @${ECH_CMDO} "bin/dhisd" >> ${TMPPLIST} ${ECHO} "===> Installing ${PREFIX}/bin/genkeys." ${INSTALL_PROGRAM} ${WRKSRC}/genkeys ${PREFIX}/bin - @${ECHO} "bin/genkeys" >> ${TMPPLIST} + @${ECH_CMDO} "bin/genkeys" >> ${TMPPLIST} ${ECHO} "===> Creating ${PREFIX}/etc/dhis and installing sample db files." @${MKDIR} ${PREFIX}/etc/dhis @${CHMOD} 700 ${PREFIX}/etc/dhis @${INSTALL_DATA} ${WRKSRC}/dhis.db.sample ${PREFIX}/etc/dhis/dhis.db.sample - @${ECHO} "etc/dhis/dhis.db.sample" >> ${TMPPLIST} + @${ECHO_CMD} "etc/dhis/dhis.db.sample" >> ${TMPPLIST} @${INSTALL_DATA} ${WRKSRC}/services.db.sample ${PREFIX}/etc/dhis/services.db.sample - @${ECHO} "etc/dhis/services.db.sample" >> ${TMPPLIST} + @${ECHO_CMD} "etc/dhis/services.db.sample" >> ${TMPPLIST} @${CHMOD} 600 ${PREFIX}/etc/dhis/* - @${ECHO} "@dirrm etc/dhis" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm etc/dhis" >> ${TMPPLIST} .if !exists(${PREFIX}/etc/rc.d/dhisd.sh) ${ECHO} "===> Installing ${PREFIX}/etc/rc.d/dhid.sh startup file." ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/dhisd.sh ${PREFIX}/etc/rc.d/dhisd.sh - @${ECHO} "etc/rc.d/dhisd.sh" >> ${TMPPLIST} + @${ECHO_CMD} "etc/rc.d/dhisd.sh" >> ${TMPPLIST} .endif .if !defined(NOPORTDOCS) ${ECHO} "===> Installing documentation in ${DOCSDIR}" @@ -48,11 +48,11 @@ post-install: @${CHMOD} 755 ${DOCSDIR} .for DOCFILE in ${DOCFILES} @${INSTALL_DATA} ${WRKSRC}/${DOCFILE} ${DOCSDIR} - @${ECHO} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST} + @${ECHO_CMD} "share/doc/${PORTNAME}/${DOCFILE}" >> ${TMPPLIST} .endfor ${INSTALL_DATA} ${FILESDIR}/INSTALL.bsd ${DOCSDIR} - @${ECHO} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST} - @${ECHO} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST} + @${ECHO_CMD} "share/doc/${PORTNAME}/INSTALL.bsd" >> ${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >> ${TMPPLIST} .endif @${ECHO} "--------------------------------------------------------------------------" @${ECHO} "Before dhisd can run, you will need configure BIND." diff --git a/net/freeradius-devel/Makefile b/net/freeradius-devel/Makefile index d27b279c6bdd..2355ad86b0e8 100644 --- a/net/freeradius-devel/Makefile +++ b/net/freeradius-devel/Makefile @@ -59,8 +59,8 @@ UNWANTED_LIBS=${STATIC_MODULES:S/^/lib\/rlm_/:S/$/.a/} \ post-install: .if defined(WANT_KRB5) && defined(KRB5_HOME) @${RM} ${PREFIX}/lib/rlm_krb5.a - @${ECHO} 'lib/rlm_krb5.so' >> ${TMPPLIST} - @${ECHO} 'lib/rlm_krb5.so.0' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/rlm_krb5.so' >> ${TMPPLIST} + @${ECHO_CMD} 'lib/rlm_krb5.so.0' >> ${TMPPLIST} .endif @cd ${PREFIX} && ${RM} ${UNWANTED_LIBS} .for f in acct_users attrs clients clients.conf hints huntgroups ldap.attrmap \ diff --git a/net/fspd/Makefile b/net/fspd/Makefile index e77e5c217624..03cd87b391a1 100644 --- a/net/fspd/Makefile +++ b/net/fspd/Makefile @@ -26,14 +26,14 @@ do-patch: ${WRKSRC}/include/server_conf.h pre-install: - ${ECHO} "sbin/fspd" > ${PLIST} + ${ECHO_CMD} "sbin/fspd" > ${PLIST} .if !defined(NOPORTDOCS) .for i in ${DOCFILES} - ${ECHO} ${DOCDIR}/${i} >> ${PLIST} + ${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST} .endfor - ${ECHO} share/examples/fspd/example.conf >> ${PLIST} - ${ECHO} @dirrm ${DOCDIR} >> ${PLIST} - ${ECHO} @dirrm share/examples/fspd >> ${PLIST} + ${ECHO_CMD} share/examples/fspd/example.conf >> ${PLIST} + ${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} @dirrm share/examples/fspd >> ${PLIST} .endif do-install: diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile index 3aea4515288c..136395b6998b 100644 --- a/net/gnu-finger/Makefile +++ b/net/gnu-finger/Makefile @@ -23,7 +23,7 @@ post-install: @${CP} ${WRKSRC}/support/ttylocs ${PREFIX}/etc/fingerdir/ttylocs.sample @${CP} ${FILESDIR}/clients.sample ${PREFIX}/etc/fingerdir/clients.sample @${INSTALL} ${COPY} -m 744 -o root ${FILESDIR}/fingerd.sh.sample ${PREFIX}/etc/rc.d/fingerd.sh.sample - @${ECHO} "GNU.finger.server.hostname" > ${PREFIX}/etc/fingerdir/serverhost.sample - @${ECHO} "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample + @${ECHO_CMD} "GNU.finger.server.hostname" > ${PREFIX}/etc/fingerdir/serverhost.sample + @${ECHO_CMD} "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample .include <bsd.port.mk> diff --git a/net/kxicq-devel/Makefile b/net/kxicq-devel/Makefile index f8894397b174..2dd93b87f852 100644 --- a/net/kxicq-devel/Makefile +++ b/net/kxicq-devel/Makefile @@ -49,8 +49,8 @@ pre-install: .for skin in ${SKINS} @for f in ${WRKDIR}/${skin}/* ; do \ file=`${BASENAME} $$f`; \ - ${ECHO} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done - @${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm + ${ECHO_CMD} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done + @${ECHO_CMD} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm .endfor @${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} diff --git a/net/kxicq/Makefile b/net/kxicq/Makefile index f8894397b174..2dd93b87f852 100644 --- a/net/kxicq/Makefile +++ b/net/kxicq/Makefile @@ -49,8 +49,8 @@ pre-install: .for skin in ${SKINS} @for f in ${WRKDIR}/${skin}/* ; do \ file=`${BASENAME} $$f`; \ - ${ECHO} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done - @${ECHO} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm + ${ECHO_CMD} share/apps/kxicq/skins/${skin}/$$file >> ${PLIST} ; done + @${ECHO_CMD} @dirrm share/apps/kxicq/skins/${skin} >> ${PLIST}.dirrm .endfor @${CAT} ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm @${CAT} ${PKGDIR}/pkg-plist >> ${PLIST} diff --git a/net/micq/Makefile b/net/micq/Makefile index b53f3602be11..98035b204192 100644 --- a/net/micq/Makefile +++ b/net/micq/Makefile @@ -28,7 +28,7 @@ pre-configure: @${ECHO_MSG} "make WITH_MICQ_LANG=<your_lang>" @${ECHO_MSG} "" @${ECHO_MSG} "Currently supported <your_lang> values are:" - @${ECHO} " "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt + @${ECHO_CMD} " "${SUP_LANGS} | ${SED} 's|,$$|.|' | /usr/bin/fmt .else @/usr/bin/printf "#define ${WITH_MICQ_LANG}_LANG\n#undef ENGLISH_LANG" >> \ ${WRKSRC}/../include/config.h diff --git a/net/pim6dd/Makefile b/net/pim6dd/Makefile index 87aec586b1e9..3f04d8465767 100644 --- a/net/pim6dd/Makefile +++ b/net/pim6dd/Makefile @@ -35,9 +35,9 @@ post-install: ${MKDIR} ${PREFIX}/share/doc/${PORTNAME} .for file in ${DOCS} ${INSTALL_DATA} ${BUILD_WRKSRC}/${file} ${PREFIX}/share/doc/${PORTNAME} - @${ECHO} share/doc/${PORTNAME}/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif .include <bsd.port.mk> diff --git a/net/pim6sd/Makefile b/net/pim6sd/Makefile index 41461703b09d..29917df1fde0 100644 --- a/net/pim6sd/Makefile +++ b/net/pim6sd/Makefile @@ -36,9 +36,9 @@ post-install: ${MKDIR} ${PREFIX}/share/doc/${PORTNAME} .for file in ${DOCS} ${INSTALL_DATA} ${BUILD_WRKSRC}/${file} ${PREFIX}/share/doc/${PORTNAME} - @${ECHO} share/doc/${PORTNAME}/${file} >>${TMPPLIST} + @${ECHO_CMD} share/doc/${PORTNAME}/${file} >>${TMPPLIST} .endfor - @${ECHO} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} + @${ECHO_CMD} "@dirrm share/doc/${PORTNAME}" >>${TMPPLIST} .endif .include <bsd.port.mk> diff --git a/net/ruby-drb/Makefile b/net/ruby-drb/Makefile index 190a7db30d80..88c661fac453 100644 --- a/net/ruby-drb/Makefile +++ b/net/ruby-drb/Makefile @@ -32,7 +32,7 @@ post-patch: .if !defined(NOPORTDOCS) cd ${WRKSRC}/doc && for f in drb-ref.rd*; do \ ${MV} $$f $$f.orig; \ - ( ${ECHO} '=begin'; ${CAT} $$f.orig; ${ECHO} '=end' ) > $$f; \ + ( ${ECHO_CMD} '=begin'; ${CAT} $$f.orig; ${ECHO_CMD} '=end' ) > $$f; \ ${RM} $$f.orig; \ done .endif @@ -40,10 +40,10 @@ post-patch: do-build: .if !defined(NOPORTDOCS) cd ${WRKSRC}/doc && for f in *.rd; do \ - ${RUBY_RD} $$f > `${ECHO} $$f | ${SED} 's/\.rd$$/.html/'`; \ + ${RUBY_RD} $$f > `${ECHO_CMD} $$f | ${SED} 's/\.rd$$/.html/'`; \ done cd ${WRKSRC}/doc && for f in *.rd.ja; do \ - ${RUBY_RD} $$f > `${ECHO} $$f | ${SED} 's/\.rd.ja$$/.ja.html/'`; \ + ${RUBY_RD} $$f > `${ECHO_CMD} $$f | ${SED} 's/\.rd.ja$$/.ja.html/'`; \ done ${MKDIR} ${WRKSRC}/doc/ja cd ${WRKSRC}/doc && ${MV} *.rd.ja *.ja.html ja/ diff --git a/net/samba-devel/Makefile b/net/samba-devel/Makefile index d6bd4af498b1..a400d2dc0330 100644 --- a/net/samba-devel/Makefile +++ b/net/samba-devel/Makefile @@ -103,10 +103,10 @@ post-install: ${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd ${CHMOD} 111 ${PREFIX}/bin/smbpasswd .if defined(PACKAGE_BUILDING) - ${ECHO} "private/smbpasswd" >> ${TMPPLIST} - ${ECHO} "@dirrm private" >> ${TMPPLIST} + ${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrm private" >> ${TMPPLIST} .else - ${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST} .endif .if !defined(NOPORTDOCS) diff --git a/net/samba/Makefile b/net/samba/Makefile index 21c46ef7cfa9..7756fd140097 100644 --- a/net/samba/Makefile +++ b/net/samba/Makefile @@ -103,10 +103,10 @@ post-install: ${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd ${CHMOD} 111 ${PREFIX}/bin/smbpasswd .if defined(PACKAGE_BUILDING) - ${ECHO} "private/smbpasswd" >> ${TMPPLIST} - ${ECHO} "@dirrm private" >> ${TMPPLIST} + ${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrm private" >> ${TMPPLIST} .else - ${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST} .endif .if !defined(NOPORTDOCS) diff --git a/net/samba3/Makefile b/net/samba3/Makefile index d6bd4af498b1..a400d2dc0330 100644 --- a/net/samba3/Makefile +++ b/net/samba3/Makefile @@ -103,10 +103,10 @@ post-install: ${CHOWN} root:wheel ${PREFIX}/bin/smbpasswd ${CHMOD} 111 ${PREFIX}/bin/smbpasswd .if defined(PACKAGE_BUILDING) - ${ECHO} "private/smbpasswd" >> ${TMPPLIST} - ${ECHO} "@dirrm private" >> ${TMPPLIST} + ${ECHO_CMD} "private/smbpasswd" >> ${TMPPLIST} + ${ECHO_CMD} "@dirrm private" >> ${TMPPLIST} .else - ${ECHO} "@unexec ${ECHO} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST} + ${ECHO_CMD} "@unexec ${ECHO_CMD} \"Warning: If you will *NOT* use this package anymore, please remove %D/private/smbpasswd manually.\"" >> ${TMPPLIST} .endif .if !defined(NOPORTDOCS) diff --git a/net/svnc/Makefile b/net/svnc/Makefile index 98e8731f2c35..0be34e39e4cf 100644 --- a/net/svnc/Makefile +++ b/net/svnc/Makefile @@ -45,14 +45,14 @@ do-build: ${WRKDIR}/vnc_unixsrc/libvncauth/libvncauth.a pre-install: - ${ECHO} "bin/svncviewer" > ${PLIST} + ${ECHO_CMD} "bin/svncviewer" > ${PLIST} .if !defined(NOPORTDOCS) .for i in ${DOCFILES} - ${ECHO} -n ${DOCDIR} >> ${PLIST} - ${ECHO} ${i} >> ${PLIST} + ${ECHO_CMD} -n ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} ${i} >> ${PLIST} .endfor - ${ECHO} -n "@dirrm " >> ${PLIST} - ${ECHO} ${DOCDIR} >> ${PLIST} + ${ECHO_CMD} -n "@dirrm " >> ${PLIST} + ${ECHO_CMD} ${DOCDIR} >> ${PLIST} .endif do-install: diff --git a/net/tik/Makefile b/net/tik/Makefile index f2a753261923..7bc7b18da639 100644 --- a/net/tik/Makefile +++ b/net/tik/Makefile @@ -40,26 +40,26 @@ do-install: @${CP} ${PKGDIR}/pkg-plist ${PLIST} .for d in ${SRCDIRS} @${MKDIR} ${PREFIX}/${d} - @${ECHO} @dirrm ${d} >> ${PLIST}.dirrm + @${ECHO_CMD} @dirrm ${d} >> ${PLIST}.dirrm .endfor .for f in ${SRCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/share/tik/${f} - @${ECHO} share/tik/${f} >> ${PLIST} + @${ECHO_CMD} share/tik/${f} >> ${PLIST} .endfor @${MKDIR} ${PREFIX}/${EGDIR} - @${ECHO} @dirrm ${EGDIR} >> ${PLIST}.dirrm + @${ECHO_CMD} @dirrm ${EGDIR} >> ${PLIST}.dirrm .for f in ${EGFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${EGDIR}/${f} - @${ECHO} ${EGDIR}/${f} >> ${PLIST} + @${ECHO_CMD} ${EGDIR}/${f} >> ${PLIST} .endfor @${SED} 's#@PREFIX@#${PREFIX}#g' < ${FILESDIR}/tik >${WRKDIR}/tik.sh ${INSTALL_SCRIPT} ${WRKDIR}/tik.sh ${PREFIX}/bin/tik .if !defined(NOPORTDOCS) @${MKDIR} ${PREFIX}/${DOCDIR} - @${ECHO} @dirrm ${DOCDIR} >> ${PLIST}.dirrm + @${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}.dirrm .for f in ${DOCFILES} ${INSTALL_DATA} ${WRKSRC}/${f} ${PREFIX}/${DOCDIR}/${f} - @${ECHO} ${DOCDIR}/${f} >> ${PLIST} + @${ECHO_CMD} ${DOCDIR}/${f} >> ${PLIST} .endfor .endif @${SORT} -r ${PLIST}.dirrm >> ${PLIST} && ${RM} ${PLIST}.dirrm diff --git a/net/tn3270/Makefile b/net/tn3270/Makefile index 0de218f7fec5..bb39f1685b40 100644 --- a/net/tn3270/Makefile +++ b/net/tn3270/Makefile @@ -31,8 +31,8 @@ post-extract: ${CP} -rp ${LIBTELNETDIR} ${WRKSRC} do-configure: - ${ECHO} "BINDIR= ${PREFIX}/bin" > ${WRKDIR}/Makefile.inc - ${ECHO} "MANDIR= ${PREFIX}/man/man" >> ${WRKDIR}/Makefile.inc + ${ECHO_CMD} "BINDIR= ${PREFIX}/bin" > ${WRKDIR}/Makefile.inc + ${ECHO_CMD} "MANDIR= ${PREFIX}/man/man" >> ${WRKDIR}/Makefile.inc do-build: cd ${WRKSRC}; \ ${MAKE} depend; \ diff --git a/net/vnc/Makefile b/net/vnc/Makefile index 756b22e957b7..a7c889d71528 100644 --- a/net/vnc/Makefile +++ b/net/vnc/Makefile @@ -52,6 +52,6 @@ post-install: # Add to PLIST because VNC developers can't/won't freeze their doc # distfile. (cd ${PREFIX}; ls share/doc/vnc/* >> ${TMPPLIST}) - ${ECHO} '@dirrm share/doc/vnc' >> ${TMPPLIST} + ${ECHO_CMD} '@dirrm share/doc/vnc' >> ${TMPPLIST} .endif .include <bsd.port.mk> diff --git a/net/xipdump/Makefile b/net/xipdump/Makefile index c2a9897831a5..49c9c7ead919 100644 --- a/net/xipdump/Makefile +++ b/net/xipdump/Makefile @@ -31,8 +31,8 @@ post-build: @${CP} ${PKGDIR}/pkg-plist ${PLIST} @(cd ${WRKSRC}/data; find pkc pkt ! -type d | \ ${SED} -e 's|^|share/xipdump/|' >> ${PLIST}) - @${ECHO} "@dirrm share/xipdump/pkt" >> ${PLIST} - @${ECHO} "@dirrm share/xipdump/pkc" >> ${PLIST} - @${ECHO} "@dirrm share/xipdump" >> ${PLIST} + @${ECHO_CMD} "@dirrm share/xipdump/pkt" >> ${PLIST} + @${ECHO_CMD} "@dirrm share/xipdump/pkc" >> ${PLIST} + @${ECHO_CMD} "@dirrm share/xipdump" >> ${PLIST} .include <bsd.port.mk> diff --git a/news/newsfetch/Makefile b/news/newsfetch/Makefile index 5171279c821d..d201bbca1e8a 100644 --- a/news/newsfetch/Makefile +++ b/news/newsfetch/Makefile @@ -20,9 +20,9 @@ MANCOMPRESSED= maybe do-configure: cd ${WRKSRC} && ( \ - ${ECHO} "PROG= newsfetch"; \ - ${ECHO} "SRCS=" *.c; \ - ${ECHO} ".include <bsd.prog.mk>"; \ + ${ECHO_CMD} "PROG= newsfetch"; \ + ${ECHO_CMD} "SRCS=" *.c; \ + ${ECHO_CMD} ".include <bsd.prog.mk>"; \ ) > Makefile .include <bsd.port.mk> diff --git a/news/t-gnus-emacs20/Makefile b/news/t-gnus-emacs20/Makefile index e3c5f8e174b8..9b2f1e80bd74 100644 --- a/news/t-gnus-emacs20/Makefile +++ b/news/t-gnus-emacs20/Makefile @@ -79,7 +79,7 @@ PLIST= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} .if (${EMACS_PORT_NAME} == "mule") post-extract: - ${ECHO} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel + ${ECHO_CMD} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel ${CHMOD} +x ${WRKDIR}/mule-apel .endif diff --git a/news/t-gnus/Makefile b/news/t-gnus/Makefile index e3c5f8e174b8..9b2f1e80bd74 100644 --- a/news/t-gnus/Makefile +++ b/news/t-gnus/Makefile @@ -79,7 +79,7 @@ PLIST= ${PKGDIR}/pkg-plist.${EMACS_PORT_NAME} .if (${EMACS_PORT_NAME} == "mule") post-extract: - ${ECHO} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel + ${ECHO_CMD} "${EMACS_CMD} -l apel-setupel.el \$$@" > ${WRKDIR}/mule-apel ${CHMOD} +x ${WRKDIR}/mule-apel .endif diff --git a/news/tin/Makefile b/news/tin/Makefile index 9f104a9dfc0d..477d07eba199 100644 --- a/news/tin/Makefile +++ b/news/tin/Makefile @@ -59,11 +59,11 @@ pre-configure: post-configure: if nm /usr/lib/libc.a | ${GREP} -q strcasestr; then \ - ${ECHO} "#define HAVE_STRCASESTR 1" \ + ${ECHO_CMD} "#define HAVE_STRCASESTR 1" \ >> ${WRKSRC}/include/autoconf.h; \ fi - ${ECHO} "#define HAVE_ICONV_H 1" >> ${WRKSRC}/include/autoconf.h - ${ECHO} "#define HAVE_ICONV 1" >> ${WRKSRC}/include/autoconf.h + ${ECHO_CMD} "#define HAVE_ICONV_H 1" >> ${WRKSRC}/include/autoconf.h + ${ECHO_CMD} "#define HAVE_ICONV 1" >> ${WRKSRC}/include/autoconf.h post-build: cd ${WRKSRC}/po; ${GMAKE} diff --git a/palm/prc-tools-gcc/Makefile b/palm/prc-tools-gcc/Makefile index 94fb4c98e6c6..bdd268506a9e 100644 --- a/palm/prc-tools-gcc/Makefile +++ b/palm/prc-tools-gcc/Makefile @@ -38,7 +38,7 @@ MAN1= cccp.1 m68k-palmos-g++.1 m68k-palmos-gcc.1 .include <bsd.port.pre.mk> -CFLAGS!= ${ECHO} "${CFLAGS}" | ${SED} -e 's/-m[0-9a-z]*//g' +CFLAGS!= ${ECHO_CMD} "${CFLAGS}" | ${SED} -e 's/-m[0-9a-z]*//g' post-extract: @(cd ${WRKDIR} && ${GZIP_CMD} ${EXTRACT_BEFORE_ARGS} ${_DISTDIR}/${DISTNAME}.tar.gz ${EXTRACT_AFTER_ARGS}) diff --git a/palm/sitescooper/Makefile b/palm/sitescooper/Makefile index 9041c0d1a701..43d3b76c98b8 100644 --- a/palm/sitescooper/Makefile +++ b/palm/sitescooper/Makefile @@ -27,9 +27,9 @@ post-patch: ${PERL} -pi -e "s|^#!.+|#!${PERL}|; \ s|/usr/local/etc/sitescooper.cf|${PREFIX}/etc/sitescooper.cf|g; \ s|/usr/local/etc/sitescooper/sitescooper.cf|${PREFIX}/etc/sitescooper.cf.sample|g;" ${WRKSRC}/*.pl - ${ECHO} "MakeDoc: pilot_makedoc" >> ${WRKSRC}/sitescooper.cf - ${ECHO} "iSilo: iSiloBSD" >> ${WRKSRC}/sitescooper.cf - ${ECHO} "SitescooperDir: ${PREFIX}/share/sitescooper" >> \ + ${ECHO_CMD} "MakeDoc: pilot_makedoc" >> ${WRKSRC}/sitescooper.cf + ${ECHO_CMD} "iSilo: iSiloBSD" >> ${WRKSRC}/sitescooper.cf + ${ECHO_CMD} "SitescooperDir: ${PREFIX}/share/sitescooper" >> \ ${WRKSRC}/sitescooper.cf do-install: diff --git a/print/hugelatex/Makefile b/print/hugelatex/Makefile index a9970919d270..d9db052fd083 100644 --- a/print/hugelatex/Makefile +++ b/print/hugelatex/Makefile @@ -26,7 +26,7 @@ do-install: ${CP} -p ${TEXMF_CNF} ${TEXMF_CNF}-before-hugelatex ${CAT} ${FILESDIR}/texmf.cnf-add >>${TEXMF_CNF} cd `dirname ${TEXMF_CNF}`; \ - ${ECHO} "" | ${PREFIX}/bin/latex -ini -fmt=hugelatex -progname=hugelatex latex.ini || ${TRUE}; \ + ${ECHO_CMD} "" | ${PREFIX}/bin/latex -ini -fmt=hugelatex -progname=hugelatex latex.ini || ${TRUE}; \ ${RM} -f texsys.aux ${RM} -f ${PREFIX}/bin/hugelatex ${LN} -s latex ${PREFIX}/bin/hugelatex diff --git a/print/jadetex/Makefile b/print/jadetex/Makefile index 9b3715fc62bd..b58603796b23 100644 --- a/print/jadetex/Makefile +++ b/print/jadetex/Makefile @@ -27,8 +27,8 @@ PKGMESSAGE= ${WRKDIR}/pkg-message post-patch: patch-makefile patch-message patch-makefile: - @${ECHO} all: betterdefault > ${WRKSRC}/Makefile.tmp - @${ECHO} betterdefault: jadetex.fmt pdfjadetex.fmt >> ${WRKSRC}/Makefile.tmp + @${ECHO_CMD} all: betterdefault > ${WRKSRC}/Makefile.tmp + @${ECHO_CMD} betterdefault: jadetex.fmt pdfjadetex.fmt >> ${WRKSRC}/Makefile.tmp @${CAT} ${WRKSRC}/Makefile >> ${WRKSRC}/Makefile.tmp @${MV} ${WRKSRC}/Makefile.tmp ${WRKSRC}/Makefile diff --git a/print/latex/Makefile b/print/latex/Makefile index 22de61480d1c..f45bd9eb773d 100644 --- a/print/latex/Makefile +++ b/print/latex/Makefile @@ -51,8 +51,8 @@ do-install: if [ -f $$f ]; then ${INSTALL_DATA} $$f ${PREFIX}/share/texmf/tex/latex; fi; done) @(cd ${WRKSRC}/graphics; for f in *.sty *.tex *.def; do \ if [ -f $$f ]; then ${INSTALL_DATA} $$f ${PREFIX}/share/texmf/tex/latex; fi; done;\ - ${ECHO} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/graphics.cfg;\ - ${ECHO} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/color.cfg) + ${ECHO_CMD} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/graphics.cfg;\ + ${ECHO_CMD} '\ExecuteOptions{dvips}' >${PREFIX}/share/texmf/tex/latex/color.cfg) @(cd ${WRKSRC}/psnfss; for f in *.sty *.tex; do \ if [ -f $$f ]; then ${INSTALL_DATA} $$f ${PREFIX}/share/texmf/tex/latex; fi; done;\ tar cf - tex fonts | tar -C ${PREFIX}/share/texmf/ -xf -) diff --git a/print/yatex/Makefile b/print/yatex/Makefile index 40df51b12b9a..8342648ba01c 100644 --- a/print/yatex/Makefile +++ b/print/yatex/Makefile @@ -91,7 +91,7 @@ do-build: -e 's,%%BASENAME%%,${BASENAME},g' \ -e 's,%%CAT%%,${CAT},g' \ -e 's,%%CP%%,${CP},g' \ - -e 's,%%ECHO%%,${ECHO},g' \ + -e 's,%%ECHO%%,${ECHO_CMD},g' \ -e 's,%%GREP%%,${GREP},g' \ -e 's,%%RM%%,${RM},g' \ -e 's,%%SED%%,${SED},g' \ @@ -127,12 +127,12 @@ do-install: ${MKDIR} ${INFODIR} .if (${EMACS_PORT_NAME} == xemacs21) || (${EMACS_PORT_NAME} == xemacs21-mule) cd ${WRKSRC}; \ - for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \ + for file in `${ECHO_CMD} ${INFOFILES} | ${SED} "s,:, ,g"`; do \ ${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}/$${file}.info; \ done .else cd ${WRKSRC}; \ - for file in `${ECHO} ${INFOFILES} | ${SED} "s,:, ,g"`; do \ + for file in `${ECHO_CMD} ${INFOFILES} | ${SED} "s,:, ,g"`; do \ ${INSTALL_DATA} ${WRKSRC}/docs/$${file} ${INFODIR}; \ done .endif diff --git a/russian/apache13-modssl/Makefile b/russian/apache13-modssl/Makefile index 585e5efd339e..e3e9a76e6e84 100644 --- a/russian/apache13-modssl/Makefile +++ b/russian/apache13-modssl/Makefile @@ -121,7 +121,7 @@ post-install: ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/rc.apache.sh ${PREFIX}/etc/rc.d/apache.sh; \ fi .if defined(WITH_SUEXEC) - @${ECHO} "sbin/suexec" >> ${TMPPLIST} + @${ECHO_CMD} "sbin/suexec" >> ${TMPPLIST} .endif .include <bsd.port.post.mk> diff --git a/russian/koi8r-ps/Makefile b/russian/koi8r-ps/Makefile index 8fa537998fb9..a8f357a0b289 100644 --- a/russian/koi8r-ps/Makefile +++ b/russian/koi8r-ps/Makefile @@ -24,14 +24,14 @@ FONTMAP!= if which gs > /dev/null 2>&1 ; then \ d=`gs -h | awk '/^Search path:$$/ { nl=1; next } \ nl { print $$3; exit }'`; \ if [ -e $$d/Fontmap.GS ] ; then \ - ${ECHO} $$d/Fontmap.GS; \ + ${ECHO_CMD} $$d/Fontmap.GS; \ elif [ -e $$d/Fontmap ] ; then \ - ${ECHO} $$d/Fontmap \ + ${ECHO_CMD} $$d/Fontmap \ else \ - ${ECHO} /nicht/ ; \ + ${ECHO_CMD} /nicht/ ; \ fi; \ else \ - ${ECHO} /nicht/ ; \ + ${ECHO_CMD} /nicht/ ; \ fi .endif @@ -46,7 +46,7 @@ do-extract: > ${WRKSRC}/XFree86-Type1_fonts.dir.scale do-build: - ${ECHO} `${GREP} koi8 ${WRKSRC}/XFree86-Type1_fonts.dir.scale | wc -l` \ + ${ECHO_CMD} `${GREP} koi8 ${WRKSRC}/XFree86-Type1_fonts.dir.scale | wc -l` \ > ${WRKSRC}/fonts.dir ${GREP} koi8 ${WRKSRC}/XFree86-Type1_fonts.dir.scale \ >> ${WRKSRC}/fonts.dir @@ -82,7 +82,7 @@ do-install: ${RM} -f "${FONTMAP}".CyrPS ; \ fi .endif - ${ECHO} ${FONTMAP} > ${CPS_DIR}/fontmap.path + ${ECHO_CMD} ${FONTMAP} > ${CPS_DIR}/fontmap.path ${INSTALL_DATA} ${WRKSRC}/Fontmap.diff ${CPS_DIR} ${INSTALL_DATA} ${WRKSRC}/fonts.dir ${CPS_DIR} ${LN} -s fonts.dir ${CPS_DIR}/fonts.scale |