diff options
45 files changed, 191 insertions, 189 deletions
diff --git a/net-im/jarl/Makefile b/net-im/jarl/Makefile index 4443db666019..b107cbc7f607 100644 --- a/net-im/jarl/Makefile +++ b/net-im/jarl/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_PERL5= yes makeplist: - ${ECHO} bin/jarl > ${PLIST} + ${ECHO_CMD} bin/jarl > ${PLIST} ${FIND} ${PREFIX}/share/jarl -type f -print | ${CUT} -d/ -f4- >> \ ${PLIST} ${FIND} ${PREFIX}/share/jarl -type d -print | ${CUT} -d/ -f4- | \ diff --git a/net-mgmt/cricket/Makefile b/net-mgmt/cricket/Makefile index e805b6ef90a0..488fa0239f8a 100644 --- a/net-mgmt/cricket/Makefile +++ b/net-mgmt/cricket/Makefile @@ -43,14 +43,14 @@ do-install: -name \*.bak | ${XARGS} ${RM} -f ${CHOWN} -R ${CRICKET_USER}:${CRICKET_GROUP} ${PREFIX}/cricket @if [ -L ${PREFIX}/cricket/cricket ]; then \ - ${ECHO} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \ + ${ECHO_MSG} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \ ${RM} ${PREFIX}/cricket/cricket ; \ fi ${LN} -s ${PREFIX}/cricket/cricket-${PORTVERSION} \ ${PREFIX}/cricket/cricket @if [ -f ${LOCALBASE}/cricket/compile ] ; then \ - ${ECHO} "You should migrate manually to use new cricket" ; \ - ${ECHO} "installation scheme." ; \ + ${ECHO_MSG} "You should migrate manually to use new cricket" ; \ + ${ECHO_MSG} "installation scheme." ; \ fi post-install: diff --git a/net-p2p/nicotine-plus/Makefile b/net-p2p/nicotine-plus/Makefile index a0f8fdb06b7d..c809fb3f3531 100644 --- a/net-p2p/nicotine-plus/Makefile +++ b/net-p2p/nicotine-plus/Makefile @@ -25,9 +25,9 @@ USE_PYDISTUTILS= yes RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/vorbismodule.so:${PORTSDIR}/audio/py-vorbis .else pre-everything:: - @${ECHO} "" - @${ECHO} "Define WITH_VORBIS=yes to enable OGG/Vorbis support" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} "Define WITH_VORBIS=yes to enable OGG/Vorbis support" + @${ECHO_MSG} "" .endif .if !defined(NOPORTDOCS) diff --git a/net-p2p/nicotine/Makefile b/net-p2p/nicotine/Makefile index a0f8fdb06b7d..c809fb3f3531 100644 --- a/net-p2p/nicotine/Makefile +++ b/net-p2p/nicotine/Makefile @@ -25,9 +25,9 @@ USE_PYDISTUTILS= yes RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/vorbismodule.so:${PORTSDIR}/audio/py-vorbis .else pre-everything:: - @${ECHO} "" - @${ECHO} "Define WITH_VORBIS=yes to enable OGG/Vorbis support" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} "Define WITH_VORBIS=yes to enable OGG/Vorbis support" + @${ECHO_MSG} "" .endif .if !defined(NOPORTDOCS) diff --git a/net/cricket/Makefile b/net/cricket/Makefile index e805b6ef90a0..488fa0239f8a 100644 --- a/net/cricket/Makefile +++ b/net/cricket/Makefile @@ -43,14 +43,14 @@ do-install: -name \*.bak | ${XARGS} ${RM} -f ${CHOWN} -R ${CRICKET_USER}:${CRICKET_GROUP} ${PREFIX}/cricket @if [ -L ${PREFIX}/cricket/cricket ]; then \ - ${ECHO} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \ + ${ECHO_MSG} "Updating ${PREFIX}/cricket/cricket symbolic link" ; \ ${RM} ${PREFIX}/cricket/cricket ; \ fi ${LN} -s ${PREFIX}/cricket/cricket-${PORTVERSION} \ ${PREFIX}/cricket/cricket @if [ -f ${LOCALBASE}/cricket/compile ] ; then \ - ${ECHO} "You should migrate manually to use new cricket" ; \ - ${ECHO} "installation scheme." ; \ + ${ECHO_MSG} "You should migrate manually to use new cricket" ; \ + ${ECHO_MSG} "installation scheme." ; \ fi post-install: diff --git a/net/delegate/Makefile b/net/delegate/Makefile index bc1b5ff0251e..30952aee934b 100644 --- a/net/delegate/Makefile +++ b/net/delegate/Makefile @@ -19,29 +19,29 @@ USE_BZIP2= YES NO_PACKAGE= "Insecure program." IS_INTERACTIVE= YES -pre-fetch: +pre-everything:: .if !defined(FORCE_BUILD) || ${FORCE_BUILD}!="YES" - @${ECHO} "*********************************************************************" - @${ECHO} "* WARNING! WARNING! WARNING! WARNING! WARNING! *" - @${ECHO} "* This program has known security problems which may allow a remote *" - @${ECHO} "* attacker to take control of your machine. *" - @${ECHO} "* See FreeBSD security advisory 00:04 for more information. *" - @${ECHO} "* *" - @${ECHO} "* It is strongly recommended that you avoid using this program. *" - @${ECHO} "* *" - @${ECHO} "* If you would like to use this program despite the danger, run *" - @${ECHO} "* make with ``FORCE_BUILD=YES'' *" - @${ECHO} "* WARNING! WARNING! WARNING! WARNING! WARNING! *" - @${ECHO} "*********************************************************************" + @${ECHO_MSG} "*********************************************************************" + @${ECHO_MSG} "* WARNING! WARNING! WARNING! WARNING! WARNING! *" + @${ECHO_MSG} "* This program has known security problems which may allow a remote *" + @${ECHO_MSG} "* attacker to take control of your machine. *" + @${ECHO_MSG} "* See FreeBSD security advisory 00:04 for more information. *" + @${ECHO_MSG} "* *" + @${ECHO_MSG} "* It is strongly recommended that you avoid using this program. *" + @${ECHO_MSG} "* *" + @${ECHO_MSG} "* If you would like to use this program despite the danger, run *" + @${ECHO_MSG} "* make with ``FORCE_BUILD=YES'' *" + @${ECHO_MSG} "* WARNING! WARNING! WARNING! WARNING! WARNING! *" + @${ECHO_MSG} "*********************************************************************" @${FALSE} .else - @${ECHO} "*********************************************************************" - @${ECHO} "* WARNING! WARNING! WARNING! WARNING! WARNING! *" - @${ECHO} "* You have chosen to build an insecure program. *" - @${ECHO} "* This program has known security problems which may allow a remote *" - @${ECHO} "* attacker to take control of your machine. *" - @${ECHO} "* See FreeBSD security advisory 00:04 for more information. *" - @${ECHO} "*********************************************************************" + @${ECHO_MSG} "*********************************************************************" + @${ECHO_MSG} "* WARNING! WARNING! WARNING! WARNING! WARNING! *" + @${ECHO_MSG} "* You have chosen to build an insecure program. *" + @${ECHO_MSG} "* This program has known security problems which may allow a remote *" + @${ECHO_MSG} "* attacker to take control of your machine. *" + @${ECHO_MSG} "* See FreeBSD security advisory 00:04 for more information. *" + @${ECHO_MSG} "*********************************************************************" .endif do-install: diff --git a/net/jarl/Makefile b/net/jarl/Makefile index 4443db666019..b107cbc7f607 100644 --- a/net/jarl/Makefile +++ b/net/jarl/Makefile @@ -24,7 +24,7 @@ USE_REINPLACE= yes USE_PERL5= yes makeplist: - ${ECHO} bin/jarl > ${PLIST} + ${ECHO_CMD} bin/jarl > ${PLIST} ${FIND} ${PREFIX}/share/jarl -type f -print | ${CUT} -d/ -f4- >> \ ${PLIST} ${FIND} ${PREFIX}/share/jarl -type d -print | ${CUT} -d/ -f4- | \ diff --git a/net/nicotine/Makefile b/net/nicotine/Makefile index a0f8fdb06b7d..c809fb3f3531 100644 --- a/net/nicotine/Makefile +++ b/net/nicotine/Makefile @@ -25,9 +25,9 @@ USE_PYDISTUTILS= yes RUN_DEPENDS= ${PYTHON_SITELIBDIR}/ogg/vorbismodule.so:${PORTSDIR}/audio/py-vorbis .else pre-everything:: - @${ECHO} "" - @${ECHO} "Define WITH_VORBIS=yes to enable OGG/Vorbis support" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} "Define WITH_VORBIS=yes to enable OGG/Vorbis support" + @${ECHO_MSG} "" .endif .if !defined(NOPORTDOCS) diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile index 1a6c55c22962..e264e7c596e2 100644 --- a/news/nntpcache/Makefile +++ b/news/nntpcache/Makefile @@ -62,13 +62,13 @@ MAN8= nntpcached.8 newshound.8 DOCS= AUTHORS ChangeLog FAQ FAQ.html HACKING HTML \ INSTALL LICENSING NEWS README README.INN VERSION +pre-everything:: .if !defined(BATCH) -post-fetch: - @${ECHO} "To enable LDAP support use either:" - @${ECHO} " WITH_LDAP - LDAP v1 support" - @${ECHO} " WITH_LDAP2 - LDAP v2 support" - @${ECHO} - @${ECHO} "To disable radius support use WITHOUT_RADIUS" + @${ECHO_MSG} "To enable LDAP support use either:" + @${ECHO_MSG} " WITH_LDAP - LDAP v1 support" + @${ECHO_MSG} " WITH_LDAP2 - LDAP v2 support" + @${ECHO_MSG} + @${ECHO_MSG} "To disable radius support use WITHOUT_RADIUS" .endif post-configure: @@ -79,7 +79,7 @@ post-install: @ ${SED} -e 's#%%PREFIX%%#${PREFIX}#g' ${FILESDIR}/nntpcached.rc \ > ${WRKDIR}/nntpcached.sh .if !defined(BATCH) - @ ${ECHO} "Installing ${PREFIX}/etc/rc.d/nntpcached.sh startup file" + @ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/nntpcached.sh startup file" .endif @ ${INSTALL_SCRIPT} -m 751 ${WRKDIR}/nntpcached.sh \ ${PREFIX}/etc/rc.d diff --git a/news/pyne/Makefile b/news/pyne/Makefile index f31801bf11f6..f29a2ad30479 100644 --- a/news/pyne/Makefile +++ b/news/pyne/Makefile @@ -43,7 +43,7 @@ pre-install: @${RM} -f ${WRKDIR}/.Xvfb.pid .endif - ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO} $$! > \ + ${X11BASE}/bin/Xvfb :1001 -screen 0 800x600x24 > /dev/null 2>&1 & ${ECHO_CMD} $$! > \ ${WRKDIR}/.Xvfb.pid @${REINPLACE_CMD} -e "s@--compile@--compile --display ${DISPLAYHACK}@" \ ${WRKSRC}/Makefile diff --git a/news/trn/Makefile b/news/trn/Makefile index 3fc07d4e0f11..0560688db364 100644 --- a/news/trn/Makefile +++ b/news/trn/Makefile @@ -25,12 +25,12 @@ CONFIGURE_ARGS= -S post-install: .if !defined(BATCH) - @${ECHO} "" - @${ECHO} "############################################################################" - @${ECHO} "# Please edit lines 48 through 69 in ${PREFIX}/bin/Pnews #" - @${ECHO} "# to customize news posting for your site. #" - @${ECHO} "# Remember to set the NNTPSERVER environment variable to your news server. #" - @${ECHO} "############################################################################" + @${ECHO_MSG} "" + @${ECHO_MSG} "############################################################################" + @${ECHO_MSG} "# Please edit lines 48 through 69 in ${PREFIX}/bin/Pnews #" + @${ECHO_MSG} "# to customize news posting for your site. #" + @${ECHO_MSG} "# Remember to set the NNTPSERVER environment variable to your news server. #" + @${ECHO_MSG} "############################################################################" .endif .include <bsd.port.mk> diff --git a/print/font2svg/Makefile b/print/font2svg/Makefile index e2b492d1c38c..1ab3bf4a476f 100644 --- a/print/font2svg/Makefile +++ b/print/font2svg/Makefile @@ -27,12 +27,12 @@ RUN_DEPENDS= bash:${PORTSDIR}/shells/bash2 \ USE_REINPLACE= yes NO_BUILD= yes -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif post-patch: diff --git a/print/html2ps-letter/Makefile b/print/html2ps-letter/Makefile index 3c2742c923db..142259b2d9a3 100644 --- a/print/html2ps-letter/Makefile +++ b/print/html2ps-letter/Makefile @@ -40,12 +40,12 @@ MAN1= html2ps.1 MAN5= html2psrc.5 SCRIPTS_ENV+= PERL=${PERL} PAPERSIZE=${PAPERSIZE} -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif do-install: diff --git a/print/lprps-letter/Makefile b/print/lprps-letter/Makefile index 5be8c120ba3a..b481ee2c8323 100644 --- a/print/lprps-letter/Makefile +++ b/print/lprps-letter/Makefile @@ -25,8 +25,8 @@ PS!= echo ${PAPERSIZE} | awk '{print toupper($$1)}' .if ${PAPERSIZE} != a4 && ${PAPERSIZE} != letter .BEGIN: - @${ECHO} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" - @${ECHO} "Possible values are: a4 or letter" + @${ECHO_MSG} "Error: invalid value for PAPERSIZE: \"${PAPERSIZE}\"" + @${ECHO_MSG} "Possible values are: a4 or letter" @${FALSE} .endif @@ -48,9 +48,9 @@ do-install: @${INSTALL_MAN} ${WRKSRC}/lprps.n ${PREFIX}/man/man8/lprps.8 @${INSTALL_MAN} ${WRKSRC}/psif.n ${PREFIX}/man/man8/psif.8 @${INSTALL_MAN} ${WRKSRC}/psof.n ${PREFIX}/man/man8/psof.8 - @${ECHO} "" - @${ECHO} Now edit your /etc/printcap - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} Now edit your /etc/printcap + @${ECHO_MSG} "" post-install: .if !defined(NOPORTDOCS) diff --git a/print/pkfonts300/Makefile b/print/pkfonts300/Makefile index e2e2097b4c63..9b52589b0e15 100644 --- a/print/pkfonts300/Makefile +++ b/print/pkfonts300/Makefile @@ -28,8 +28,8 @@ RESOLUTION= 300 ${RESOLUTION} != 300 && ${RESOLUTION} != 360 && \ ${RESOLUTION} != 400 && ${RESOLUTION} != 600 .BEGIN: - @${ECHO} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" - @${ECHO} "Possible values are: 118, 240, 300, 360, 400 and 600." + @${ECHO_MSG} "Error: invalid value for RESOLUTION: \"${RESOLUTION}\"" + @${ECHO_MSG} "Possible values are: 118, 240, 300, 360, 400 and 600." @${FALSE} .endif .endif diff --git a/print/pnm2ppa/Makefile b/print/pnm2ppa/Makefile index 8c5fc1229571..5beba20d658f 100644 --- a/print/pnm2ppa/Makefile +++ b/print/pnm2ppa/Makefile @@ -29,12 +29,12 @@ CFLAGS+= ${CPPFLAGS} MAN1= pnm2ppa.1 -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif post-patch: diff --git a/print/preview-latex/Makefile b/print/preview-latex/Makefile index 9d2bf8f98f4c..0fdd3e441309 100644 --- a/print/preview-latex/Makefile +++ b/print/preview-latex/Makefile @@ -40,12 +40,12 @@ CONFIGURE_ARGS+= --disable-8bit-test DOCS= ChangeLog INSTALL PROBLEMS README latex/README-preview RELEASE TODO -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif post-install: diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 179829416d02..79f0f1dbba9d 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://web2.altmuehlnet.de/fschmid/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A comprehensive desktop publishing program -.if defined(WITH_GHOSTSCRIPT_AFP1) && ${WITH_GHOSTSCRIPT_AFP1} == yes +.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes GSPORT?= print/ghostscript-afpl .else GSPORT?= print/ghostscript-gnu @@ -35,12 +35,12 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/scribus/libs \ QTCFGLIBS+= -lm -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif post-patch: diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 179829416d02..79f0f1dbba9d 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -15,7 +15,7 @@ MASTER_SITES= http://web2.altmuehlnet.de/fschmid/ \ MAINTAINER= ports@FreeBSD.org COMMENT= A comprehensive desktop publishing program -.if defined(WITH_GHOSTSCRIPT_AFP1) && ${WITH_GHOSTSCRIPT_AFP1} == yes +.if defined(WITH_GHOSTSCRIPT_AFPL) && ${WITH_GHOSTSCRIPT_AFPL} == yes GSPORT?= print/ghostscript-afpl .else GSPORT?= print/ghostscript-gnu @@ -35,12 +35,12 @@ LDCONFIG_DIRS= %%PREFIX%%/lib/scribus/libs \ QTCFGLIBS+= -lm -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif post-patch: diff --git a/print/transfig/Makefile b/print/transfig/Makefile index 457cfca3f25f..b2a4af1e12a7 100644 --- a/print/transfig/Makefile +++ b/print/transfig/Makefile @@ -31,12 +31,12 @@ USE_IMAKE= yes USE_XPM= yes MAN1= fig2dev.1 fig2ps2tex.1 pic2tpic.1 transfig.1 -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif .include <bsd.port.mk> diff --git a/security/amavisd/Makefile b/security/amavisd/Makefile index d2f61def113b..f39ac11c1587 100644 --- a/security/amavisd/Makefile +++ b/security/amavisd/Makefile @@ -86,9 +86,9 @@ post-install: .for FILE in FAQ INSTALL README README.exim README.milter README.postfix README.qmail README.scanners README.sendmail doc/amavis.html doc/amavis.m4 doc/amavis.png doc/amavis.txt ${INSTALL_DATA} ${WRKSRC}/${FILE} ${DOCSDIR} .endfor - @${ECHO} "===============================================================================" - @${ECHO} "Please read ${DOCSDIR}/README.${MTA}" - @${ECHO} "===============================================================================" + @${ECHO_MSG} "===============================================================================" + @${ECHO_MSG} "Please read ${DOCSDIR}/README.${MTA}" + @${ECHO_MSG} "===============================================================================" .endif .include <bsd.port.mk> diff --git a/security/p5-PGP-Sign/Makefile b/security/p5-PGP-Sign/Makefile index e61dcf25265f..0e62136c8aa1 100644 --- a/security/p5-PGP-Sign/Makefile +++ b/security/p5-PGP-Sign/Makefile @@ -39,28 +39,28 @@ DEFAULTPGP= PGP2 RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp PGPSTYLE?= PGP2 .ifndef PGP -PGP!= which pgp || ${ECHO} ${PREFIX}/bin/pgp +PGP!= which pgp || ${ECHO_CMD} ${PREFIX}/bin/pgp .endif .elif (${DEFAULTPGP} == PGP5 ) RUN_DEPENDS= pgps:${PORTSDIR}/security/pgp5 PGPSTYLE?= PGP5 .ifndef PGPS -PGPS!= which pgps || ${ECHO} ${PREFIX}/bin/pgps +PGPS!= which pgps || ${ECHO_CMD} ${PREFIX}/bin/pgps .endif .ifndef PGPV -PGPV!= which pgpv || ${ECHO} ${PREFIX}/bin/pgpv +PGPV!= which pgpv || ${ECHO_CMD} ${PREFIX}/bin/pgpv .endif .elif (${DEFAULTPGP} == PGP6) RUN_DEPENDS= pgp:${PORTSDIR}/security/pgp6 PGPSTYLE?= PGP6 .ifndef PGP -PGP!= which pgp || ${ECHO} ${PREFIX}/bin/pgp +PGP!= which pgp || ${ECHO_CMD} ${PREFIX}/bin/pgp .endif .elif (${DEFAULTPGP} == GPG) RUN_DEPENDS= gpg:${PORTSDIR}/security/gnupg PGPSTYLE?= GPG .ifndef PGP -PGP!= which gpg || ${ECHO} ${PREFIX}/bin/gpg +PGP!= which gpg || ${ECHO_CMD} ${PREFIX}/bin/gpg .endif .else .error Unsupported DEFAULTPGP value. See the Makefile for a list of acceptable values. diff --git a/security/ssh/Makefile b/security/ssh/Makefile index 4dd71f5405d6..7d2e70d21139 100644 --- a/security/ssh/Makefile +++ b/security/ssh/Makefile @@ -89,12 +89,12 @@ pre-patch: post-install: @if [ ! -f ${PREFIX}/etc/ssh_host_key ]; then \ - ${ECHO} "Generating a secret host key..."; \ + ${ECHO_MSG} "Generating a secret host key..."; \ ${PREFIX}/bin/ssh-keygen -f ${PREFIX}/etc/ssh_host_key -N ""; \ fi; \ if [ "`grep ssh /etc/inetd.conf|grep -v ^#ssh`" = "" ]; then \ if [ ! -f ${PREFIX}/etc/rc.d/sshd.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \ + ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/sshd.sh startup file."; \ ${SED} -e 's+!!PREFIX!!+${PREFIX}+g' ${FILESDIR}/sshd.sh \ > ${PREFIX}/etc/rc.d/sshd.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/sshd.sh; \ diff --git a/shells/44bsd-csh/Makefile b/shells/44bsd-csh/Makefile index 2dd572da52e0..b279d437cc59 100644 --- a/shells/44bsd-csh/Makefile +++ b/shells/44bsd-csh/Makefile @@ -33,7 +33,7 @@ do-install: @${MKDIR} ${DOCSDIR} @${INSTALL_DATA} ${WRKSRC}/USD.doc/paper.ascii.gz ${DOCSDIR} .endif - @${ECHO} "Updating /etc/shells" + @${ECHO_MSG} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/44bsd-csh /etc/shells.bak; \ ${ECHO_CMD} ${PREFIX}/bin/44bsd-csh) > /etc/shells diff --git a/shells/esh/Makefile b/shells/esh/Makefile index 487a5ae105d2..ba96404580ed 100644 --- a/shells/esh/Makefile +++ b/shells/esh/Makefile @@ -22,7 +22,7 @@ pre-build: do-install: ${INSTALL_PROGRAM} ${WRKSRC}/esh ${PREFIX}/bin/esh - @${ECHO} "updating /etc/shells" + @${ECHO_MSG} "updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/esh /etc/shells.bak; \ ${ECHO_CMD} ${PREFIX}/bin/esh) > /etc/shells diff --git a/shells/flash/Makefile b/shells/flash/Makefile index 66a2ff6fb1f9..16f52174c2d2 100644 --- a/shells/flash/Makefile +++ b/shells/flash/Makefile @@ -62,7 +62,7 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/orcasetup/flashdocs/* ${PREFIX}/lib/flash/flashdocs post-install: - @${ECHO} "Updating /etc/shells" + @${ECHO_MSG} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/flash /etc/shells.bak; \ ${ECHO_CMD} ${PREFIX}/bin/flash) > /etc/shells diff --git a/shells/perlsh/Makefile b/shells/perlsh/Makefile index e2cefeb57fb6..81595a0ebe44 100644 --- a/shells/perlsh/Makefile +++ b/shells/perlsh/Makefile @@ -45,7 +45,7 @@ pre-install: ${REINPLACE_CMD} -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile; post-install: - @${ECHO} "Updating /etc/shells" + @${ECHO_MSG} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \ ${ECHO_CMD} ${PREFIX}/bin/psh) > /etc/shells diff --git a/shells/psh/Makefile b/shells/psh/Makefile index e2cefeb57fb6..81595a0ebe44 100644 --- a/shells/psh/Makefile +++ b/shells/psh/Makefile @@ -45,7 +45,7 @@ pre-install: ${REINPLACE_CMD} -e "s:/usr/local/lib/perl5/5.00503/man/man3:${MAN3PREFIX}/man/man3:g" ${WRKSRC}/Makefile; post-install: - @${ECHO} "Updating /etc/shells" + @${ECHO_MSG} "Updating /etc/shells" @${CP} /etc/shells /etc/shells.bak @(${GREP} -v ${PREFIX}/bin/psh /etc/shells.bak; \ ${ECHO_CMD} ${PREFIX}/bin/psh) > /etc/shells diff --git a/sysutils/cd9660_unicode/Makefile b/sysutils/cd9660_unicode/Makefile index 1427f26fd869..1243f191cb31 100644 --- a/sysutils/cd9660_unicode/Makefile +++ b/sysutils/cd9660_unicode/Makefile @@ -29,12 +29,12 @@ FLAG!= /usr/bin/grep -e cd9660_wchar2char \ BROKEN= "your FreeBSD version is not supported. Please update to the latest version and try again" .endif -pre-fetch: +pre-everything:: @if [ ! -d /sys -o ! -d ${SRCPREFIX}/sys ]; then \ - ${ECHO} "****************************************" ; \ - ${ECHO} " You need to extract kernel source tree" ; \ - ${ECHO} " before you build this package..." ; \ - ${ECHO} "****************************************" ; \ + ${ECHO_MSG} "****************************************" ; \ + ${ECHO_MSG} " You need to extract kernel source tree" ; \ + ${ECHO_MSG} " before you build this package..." ; \ + ${ECHO_MSG} "****************************************" ; \ ${FALSE} ; \ fi diff --git a/sysutils/upsd/Makefile b/sysutils/upsd/Makefile index 8aa9f13914b6..387b5adbd9ec 100644 --- a/sysutils/upsd/Makefile +++ b/sysutils/upsd/Makefile @@ -22,7 +22,7 @@ pre-build: post-install: @if [ ! -f ${PREFIX}/etc/rc.d/upsd.sh ]; then \ - ${ECHO} "Installing ${PREFIX}/etc/rc.d/upsd.sh startup file."; \ + ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/upsd.sh startup file."; \ ${INSTALL_SCRIPT} -m 751 ${FILESDIR}/upsd.sh ${PREFIX}/etc/rc.d/upsd.sh; \ fi if [ ! -f ${PREFIX}/etc/upsd.conf ] ; then \ diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile index accaa4536abc..752fd29342dd 100644 --- a/textproc/latex2html/Makefile +++ b/textproc/latex2html/Makefile @@ -51,12 +51,12 @@ DOC_FILES= FAQ INSTALL LICENSE README # Inform message # -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif # Port-patch diff --git a/textproc/tth/Makefile b/textproc/tth/Makefile index 60d9b32ed48b..c19dc4f9f13a 100644 --- a/textproc/tth/Makefile +++ b/textproc/tth/Makefile @@ -29,12 +29,12 @@ RUN_DEPENDS= gs:${PORTSDIR}/${GSPORT} \ MAN1= tth.1 -pre-fetch: +pre-everything:: .if !defined(WITH_GHOSTSCRIPT_AFPL) || ${WITH_GHOSTSCRIPT_AFPL} != yes - @${ECHO} "" - @${ECHO} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" - @${ECHO} " AFPL Postscript interpreter instead of GNU one" - @${ECHO} "" + @${ECHO_MSG} "" + @${ECHO_MSG} " Define WITH_GHOSTSCRIPT_AFPL=yes to use" + @${ECHO_MSG} " AFPL Postscript interpreter instead of GNU one" + @${ECHO_MSG} "" .endif do-build: diff --git a/www/MT/Makefile b/www/MT/Makefile index 2f13790523f1..2cebeaa611aa 100644 --- a/www/MT/Makefile +++ b/www/MT/Makefile @@ -50,7 +50,7 @@ run make again.\n do-install: @cd ${WRKSRC} && ${FIND} * -name "*.orig" -delete - @${ECHO} "Installing cgi ${PREFIX}/${CGIDIR}" + @${ECHO_MSG} "Installing cgi ${PREFIX}/${CGIDIR}" @${MKDIR} ${PREFIX}/${CGIDIR} @cd ${WRKSRC} && ${CP} -R *.cgi lib extlib tmpl search_templates \ ${PREFIX}/${CGIDIR} @@ -59,7 +59,7 @@ do-install: -e 's#path/to/static-files#mt#g' \ -e 's/# NoHTMLEntities 1/NoHTMLEntities 1/g' \ ${WRKSRC}/mt.cfg > ${PREFIX}/${CGIDIR}/mt.cfg - @${ECHO} "Installing data ${PREFIX}/${DATADIR}" + @${ECHO_MSG} "Installing data ${PREFIX}/${DATADIR}" @${MKDIR} ${PREFIX}/${DATADIR} @cd ${WRKSRC} && ${CP} -R LICENSE LICENSE-COMMERCIAL docs images \ index.html plugins schemas styles.css \ @@ -72,6 +72,6 @@ do-install: post-install: @${CAT} ${PKGMESSAGE} - @${ECHO} "Please read the docs to initialize a blog DB in ${DB_DIR}" + @${ECHO_MSG} "Please read the docs to initialize a blog DB in ${DB_DIR}" .include <bsd.port.post.mk> diff --git a/www/geeklog/Makefile b/www/geeklog/Makefile index 4a75ff141a8b..fcc815966379 100644 --- a/www/geeklog/Makefile +++ b/www/geeklog/Makefile @@ -28,14 +28,14 @@ do-install: ${CHMOD} -R 775 ${APACHEDIR}/geeklog/public_html/images/articles ${CHMOD} -R 775 ${APACHEDIR}/geeklog/public_html/images/userphotos ${CHMOD} -R 775 ${APACHEDIR}/geeklog/public_html/backend - @${ECHO} "" - @${ECHO} "***********************************************************************" - @${ECHO} "* You now need to create the database that you want GeekLog *" - @${ECHO} "* to reside in. *" - @${ECHO} "* Then edit the config.php file to your needs. *" - @${ECHO} "* Once you have done that, the goto *" - @${ECHO} "* http://<your_website>/geeklog/public_html/admin/install/install.php *" - @${ECHO} "* And follow the instructions, then you are done!! *" - @${ECHO} "***********************************************************************" + @${ECHO_MSG} "" + @${ECHO_MSG} "***********************************************************************" + @${ECHO_MSG} "* You now need to create the database that you want GeekLog *" + @${ECHO_MSG} "* to reside in. *" + @${ECHO_MSG} "* Then edit the config.php file to your needs. *" + @${ECHO_MSG} "* Once you have done that, the goto *" + @${ECHO_MSG} "* http://<your_website>/geeklog/public_html/admin/install/install.php *" + @${ECHO_MSG} "* And follow the instructions, then you are done!! *" + @${ECHO_MSG} "***********************************************************************" .include <bsd.port.mk> diff --git a/www/gn/Makefile b/www/gn/Makefile index 8e8889c8e7bd..23a260ff8160 100644 --- a/www/gn/Makefile +++ b/www/gn/Makefile @@ -39,12 +39,12 @@ post-install: @cd ${PREFIX}; \ [ -s etc/gn_mime.types ] && \ if ! cmp -s etc/gn_mime.types ${WRKSRC}/etc/gn_mime.types; then \ - ${ECHO} ${MV} etc/gn_mime.types etc/gn_mime.types.old; \ + ${ECHO_MSG} ${MV} etc/gn_mime.types etc/gn_mime.types.old; \ ${MV} etc/gn_mime.types etc/gn_mime.types.old; \ fi; \ [ -s gnroot/menu ] && \ if ! cmp -s gnroot/menu ${WRKSRC}/gnroot/menu; then \ - ${ECHO} ${MV} gnroot/menu gnroot/menu.old; \ + ${ECHO_MSG} ${MV} gnroot/menu gnroot/menu.old; \ ${MV} gnroot/menu gnroot/menu.old; \ fi; \ tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \ diff --git a/www/grail/Makefile b/www/grail/Makefile index 62dfeddd7720..39781cc106d8 100644 --- a/www/grail/Makefile +++ b/www/grail/Makefile @@ -32,17 +32,17 @@ do-build: ${PYTHON} -u -c 'from compileall import compile_dir; compile_dir("${WRKSRC}")' do-install: - @${ECHO} === Creating directories... + @${ECHO_MSG} === Creating directories... @for dir in `${DIRS_CMD}`; do \ - ${ECHO} ${PREFIX}/$$dir; \ + ${ECHO_MSG} ${PREFIX}/$$dir; \ ${MKDIR} ${PREFIX}/$$dir; \ done - @${ECHO} === Installing grail files ... + @${ECHO_MSG} === Installing grail files ... @for file in `${FILES_CMD}`; do \ - ${ECHO} ${GRAILDIR}/$$file; \ + ${ECHO_MSG} ${GRAILDIR}/$$file; \ ${INSTALL_DATA} ${WRKSRC}/$$file ${GRAILDIR}/$$file; \ done - @${ECHO} === Installing grail script... + @${ECHO_MSG} === Installing grail script... @${SED} 's,%%GRAILDIR%%,${GRAILDIR},g' <${FILESDIR}/grail > \ ${WRKDIR}/grail.tmp @${INSTALL_SCRIPT} ${WRKDIR}/grail.tmp ${PREFIX}/bin/grail diff --git a/www/mod_blowchunks/Makefile b/www/mod_blowchunks/Makefile index d184e37bd680..f5958f79cd4c 100644 --- a/www/mod_blowchunks/Makefile +++ b/www/mod_blowchunks/Makefile @@ -33,18 +33,18 @@ do-extract: do-build: .if !defined(WITHOUT_BLOWCHUNK_LOG) - @${ECHO} "================================================================================" - @${ECHO} "If you do not want to log chunked requests, rebuild with WITHOUT_BLOWCHUNK_LOG" - @${ECHO} "defined." - @${ECHO} "================================================================================" + @${ECHO_MSG} "================================================================================" + @${ECHO_MSG} "If you do not want to log chunked requests, rebuild with WITHOUT_BLOWCHUNK_LOG" + @${ECHO_MSG} "defined." + @${ECHO_MSG} "================================================================================" .endif cd ${WRKSRC} && ${MV} ${PKGNAME}.c ${PORTNAME}.c && \ ${APXS} ${APXSFLAGS} -c ${PORTNAME}.c do-install: cd ${WRKSRC} && ${APXS} -A -i ${PORTNAME}.so - @${ECHO} "================================================================================" - @${ECHO} "Enable mod_blowchunks in Apache's config manually." - @${ECHO} "================================================================================" + @${ECHO_MSG} "================================================================================" + @${ECHO_MSG} "Enable mod_blowchunks in Apache's config manually." + @${ECHO_MSG} "================================================================================" .include <bsd.port.mk> diff --git a/www/mod_python/Makefile b/www/mod_python/Makefile index 0a5a025cc148..5962854a71c6 100644 --- a/www/mod_python/Makefile +++ b/www/mod_python/Makefile @@ -34,12 +34,12 @@ PLIST_SUB+= PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g} STRIP_CMD?= strip -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build option:" - @${ECHO} "" - @${ECHO} " WANT_EAPI=yes build as apache EAPI module (for apache13-modssl)" - @${ECHO} "" +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "You may use the following build option:" + @${ECHO_MSG} "" + @${ECHO_MSG} " WANT_EAPI=yes build as apache EAPI module (for apache13-modssl)" + @${ECHO_MSG} "" pre-patch: .if defined(WANT_EAPI) diff --git a/www/rt2/Makefile b/www/rt2/Makefile index afe003bb9081..91f58655ec8c 100644 --- a/www/rt2/Makefile +++ b/www/rt2/Makefile @@ -111,18 +111,18 @@ MAN3= RT::Links.3 \ RT::ACL.3 \ RT::Attachments.3 -pre-fetch: - @${ECHO} "" - @${ECHO} "You may use the following build options:" - @${ECHO} "" - @${ECHO} " DB_DBA_PASSWORD=password Your password of MySQL root ();" - @${ECHO} " DB_HOST=hostname Where MySQL resident (localhost);" - @${ECHO} " DB_RT_PASS=password Your password of MySQL RT user (rt_pass);" - @${ECHO} " DB_TYPE=type Pg for postgresql, mysql for MySQL (mysql);" - @${ECHO} " INSTALL_NEW Install a fresh port, otherwise just upgrade;" - @${ECHO} "" - @${ECHO} "IMPORTANT!!! If you want to install a fresh new port, define INSTALL_NEW to do so, otherwise this port just do a upgrade." - @${ECHO} "" +pre-everything:: + @${ECHO_MSG} "" + @${ECHO_MSG} "You may use the following build options:" + @${ECHO_MSG} "" + @${ECHO_MSG} " DB_DBA_PASSWORD=password Your password of MySQL root ();" + @${ECHO_MSG} " DB_HOST=hostname Where MySQL resident (localhost);" + @${ECHO_MSG} " DB_RT_PASS=password Your password of MySQL RT user (rt_pass);" + @${ECHO_MSG} " DB_TYPE=type Pg for postgresql, mysql for MySQL (mysql);" + @${ECHO_MSG} " INSTALL_NEW Install a fresh port, otherwise just upgrade;" + @${ECHO_MSG} "" + @${ECHO_MSG} "IMPORTANT!!! If you want to install a fresh new port, define INSTALL_NEW to do so, otherwise this port just do a upgrade." + @${ECHO_MSG} "" post-patch: .for _FILE in tools/testdeps diff --git a/www/udmsearch/Makefile b/www/udmsearch/Makefile index 4e703a277ea3..22d4598504d8 100644 --- a/www/udmsearch/Makefile +++ b/www/udmsearch/Makefile @@ -40,15 +40,15 @@ CONFIGURE_ARGS+= --with-msql=${LOCALBASE} USE_MYSQL= YES CONFIGURE_ARGS+= --with-mysql=${LOCALBASE} +pre-everything:: .if !defined(WITH_MYSQL) -pre-fetch: - @${ECHO} - @${ECHO} "Defaulting to udmsearch with mysql support." - @${ECHO} - @${ECHO} "You may alternately build udmsearch with either msql or" - @${ECHO} "postgresql support by invoking make with WITH_MSQL=yes or" - @${ECHO} "WITH_PGSQL=yes respectively." - @${ECHO} + @${ECHO_MSG} + @${ECHO_MSG} "Defaulting to udmsearch with mysql support." + @${ECHO_MSG} + @${ECHO_MSG} "You may alternately build udmsearch with either msql or" + @${ECHO_MSG} "postgresql support by invoking make with WITH_MSQL=yes or" + @${ECHO_MSG} "WITH_PGSQL=yes respectively." + @${ECHO_MSG} .endif .endif @@ -61,7 +61,7 @@ post-install: @${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/udmsearch @${STRIP_CMD} ${PREFIX}/sbin/indexer @${STRIP_CMD} ${PREFIX}/share/udmsearch/search.cgi - @${ECHO} + @${ECHO_MSG} @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/x11-toolkits/linux-f10-gtk/Makefile b/x11-toolkits/linux-f10-gtk/Makefile index e7c1d845e78b..a602d1b7fb70 100644 --- a/x11-toolkits/linux-f10-gtk/Makefile +++ b/x11-toolkits/linux-f10-gtk/Makefile @@ -51,7 +51,7 @@ RPMDIR= ${DISTDIR}/${DIST_SUBDIR} do-install: @for R in ${RPM_SET}; do \ - ${ECHO} $$R; \ + ${ECHO_MSG} $$R; \ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ done diff --git a/x11-toolkits/linux-f8-gtk/Makefile b/x11-toolkits/linux-f8-gtk/Makefile index e7c1d845e78b..a602d1b7fb70 100644 --- a/x11-toolkits/linux-f8-gtk/Makefile +++ b/x11-toolkits/linux-f8-gtk/Makefile @@ -51,7 +51,7 @@ RPMDIR= ${DISTDIR}/${DIST_SUBDIR} do-install: @for R in ${RPM_SET}; do \ - ${ECHO} $$R; \ + ${ECHO_MSG} $$R; \ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ done diff --git a/x11-toolkits/linux-gtk/Makefile b/x11-toolkits/linux-gtk/Makefile index e7c1d845e78b..a602d1b7fb70 100644 --- a/x11-toolkits/linux-gtk/Makefile +++ b/x11-toolkits/linux-gtk/Makefile @@ -51,7 +51,7 @@ RPMDIR= ${DISTDIR}/${DIST_SUBDIR} do-install: @for R in ${RPM_SET}; do \ - ${ECHO} $$R; \ + ${ECHO_MSG} $$R; \ rpm -U ${RPMFLAGS} ${RPMDIR}/$$R || true ; \ done diff --git a/x11-wm/amiwm/Makefile b/x11-wm/amiwm/Makefile index d5f9b6a43549..b0895bf354b9 100644 --- a/x11-wm/amiwm/Makefile +++ b/x11-wm/amiwm/Makefile @@ -22,7 +22,7 @@ MAN1= amiwm.1 post-install: .if !defined(NOPORTDOCS) - @${ECHO} "===> Copying documents to ${PREFIX}/share/doc/amiwm" + @${ECHO_MSG} "===> Copying documents to ${PREFIX}/share/doc/amiwm" @${MKDIR} ${PREFIX}/share/doc/amiwm @${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/amiwm @${INSTALL_DATA} ${WRKSRC}/README.modules ${PREFIX}/share/doc/amiwm diff --git a/x11-wm/windowmaker/Makefile b/x11-wm/windowmaker/Makefile index 0e6052f70b48..401c02c05553 100644 --- a/x11-wm/windowmaker/Makefile +++ b/x11-wm/windowmaker/Makefile @@ -71,16 +71,18 @@ CONFIGURE_ARGS+= --enable-gnome .if defined(WITH_KDE) CONFIGURE_ARGS+= --enable-kde -.else -pre-extract: - @${ECHO} "You can add hooks for KDE by defining WITH_KDE" .endif -.if !defined(WITHOUT_HERMES) pre-everything:: - @${ECHO} "You can disable the Hermes library by defining WITHOUT_HERMES" - @${ECHO} +.if !defined(WITHOUT_HERMES) + @${ECHO_MSG} + @${ECHO_MSG} "You can disable the Hermes library by defining WITHOUT_HERMES" + @${ECHO_MSG} .endif +.if !defined(WITH_KDE) + @${ECHO_MSG} + @${ECHO_MSG} "You can add hooks for KDE by defining WITH_KDE" + @${ECHO_MSG} post-patch: @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/WPrefs.app/Paths.c |