1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-22 08:58:47 +00:00

Use ${ECHO_CMD} instead of ${ECHO} where you mean the echo command;

the ECHO macro is set to "echo" by default, but it is set to "true" if
make(1) is invoked with the -s option while ECHO_CMD is always set to
the echo command.
This commit is contained in:
Akinori MUSHA 2002-01-29 12:14:18 +00:00
parent 4adc5a8a71
commit a80f0bd0dd
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=53961
38 changed files with 75 additions and 75 deletions

View File

@ -21,7 +21,7 @@ MAN1= asclock.1
pre-configure:
(cd ${WRKSRC}; \
${ECHO} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null)
${ECHO_CMD} ${ASCLOCK_LANG} | ${WRKSRC}/configure > /dev/null)
@${ECHO_MSG} "***************** NOTE *****************"
@${ECHO_MSG} "* *"
@${ECHO_MSG} "* You can choose languages for asclock. *"

View File

@ -70,7 +70,7 @@ post-extract:
.endfor
post-patch:
@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
pre-build:

View File

@ -36,8 +36,8 @@ post-install:
# applications look for cronyx-*-koi8-r or koi8-r explicitly. -mi
post-build:
# Creating aliases for koi8-r encoding and Cronyx foundry:
@${ECHO} >> ${WRKSRC}/fonts.alias
@${ECHO} "! Automaticly generated aliases for koi8-r encoding:" \
@${ECHO_CMD} >> ${WRKSRC}/fonts.alias
@${ECHO_CMD} "! Automaticly generated aliases for koi8-r encoding:" \
>> ${WRKSRC}/fonts.alias
${AWK} '/gemini/ { \
name = $$2; \

View File

@ -43,8 +43,8 @@ do-build:
cd ${WRKSRC}; \
for dir in ${NORMAL_FONTS} ${BIG_FONTS}; do \
for bdf in $$dir/*.bdf ; do \
${ECHO} $$bdf; \
pcf_gz=`${ECHO} $$bdf | ${SED} 's/.bdf$$/.pcf.gz/'`; \
${ECHO_CMD} $$bdf; \
pcf_gz=`${ECHO_CMD} $$bdf | ${SED} 's/.bdf$$/.pcf.gz/'`; \
${CAT} $$bdf | bdftopcf | ${GZIP_CMD} \
> $$pcf_gz; \
done \

View File

@ -153,11 +153,11 @@ make-fonts.alias:
[ -t 0 ] && tty=/dev/tty || tty=/dev/null; \
${TAIL} +2 ${WRKSRC}/fonts.scale | ${CUT} -f 2- -d" " | \
while read font; do \
${ECHO} \"$${font}\" \"$${font}\"; \
${ECHO_CMD} \"$${font}\" \"$${font}\"; \
for nsize in ${FONTSIZES}; do \
tsize=$${nsize}; \
[ $${tsize} -lt ${FONTLIMIT} ] && tsize=${FONTLIMIT}; \
${ECHO} \"$${font}\" \"$${font}\" | \
${ECHO_CMD} \"$${font}\" \"$${font}\" | \
${SED} -e "s,--0-0-0-0-,--$${nsize}-$${nsize}0-0-0-," \
-e "s,--0-0-0-0-,--$${tsize}-$${tsize}0-75-75-," \
-e "s,^\"-${FONTNAME},\"-netscape,"; \

View File

@ -162,7 +162,7 @@ pre-configure:
${SETENV} ${SCRIPT_ENV} DISTDIR=${DISTDIR} WRKDIR=${WRKDIR} \
FILESDIR=${FILESDIR} ${MAKE}) ; \
${CAT} ${HOSTDEFLOCAL} ${HOSTDEFSRV} > ${HOSTDEFDST} ; \
${ECHO} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} )
${ECHO_CMD} "#include <${LOCALFILE}>" >> ${HOSTDEFORG} )
.if ${SERVER} == common
do-install:

View File

@ -26,7 +26,7 @@ DIRS= "XenoStep Classic" "XenoStep Classic Small" "XenoStep HeliX" \
post-extract:
for dir in ${DIRS}; do \
destdir=`${ECHO} $${dir} | ${SED} 's| |_|g'`; \
destdir=`${ECHO_CMD} $${dir} | ${SED} 's| |_|g'`; \
${CP} -R "${WRKSRC}/$${dir}" "${WRKSRC}/$${destdir}"; \
done

View File

@ -27,7 +27,7 @@ post-extract:
.if exists(${X11BASE}/bin/XFree86)
post-build:
${CP} ${PKGDIR}/pkg-plist ${PLIST}
${ECHO} "lib/libXaw3d.so.7" >> ${PLIST}
${ECHO_CMD} "lib/libXaw3d.so.7" >> ${PLIST}
.endif
# Workaround a bug in egcs on FreeBSD/Alpha.

View File

@ -82,7 +82,7 @@ post-extract:
.endfor
post-patch:
@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
post-build:

View File

@ -81,7 +81,7 @@ post-extract:
.endfor
post-patch:
@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
post-build:

View File

@ -86,7 +86,7 @@ post-extract:
.endfor
post-patch:
@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
post-build:

View File

@ -88,7 +88,7 @@ post-extract:
.endfor
post-patch:
@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
pre-build:

View File

@ -82,7 +82,7 @@ post-extract:
.endfor
post-patch:
@${ECHO} "SEARCHDIRS += ${PORTINCLUDES}" >> \
@${ECHO_CMD} "SEARCHDIRS += ${PORTINCLUDES}" >> \
${WRKSRC}/${EXTRALIBFILES_MAKE_WRKSRC}/jx_constants
post-build:

View File

@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
CONFIGURE_ARGS+= -debug
.endif
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC}
CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC}
.if defined(MAKE_JOBS)
MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
.endif

View File

@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
CONFIGURE_ARGS+= -debug
.endif
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC}
CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC}
.if defined(MAKE_JOBS)
MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
.endif

View File

@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
CONFIGURE_ARGS+= -debug
.endif
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC}
CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC}
.if defined(MAKE_JOBS)
MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
.endif

View File

@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
CONFIGURE_ARGS+= -debug
.endif
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC}
CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC}
.if defined(MAKE_JOBS)
MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
.endif

View File

@ -39,7 +39,7 @@ CONFIGURE_ARGS= -system-zlib -system-libpng -system-jpeg -sm -gif \
CONFIGURE_ARGS+= -debug
.endif
CONFIGURE_ENV= ${ECHO} yes | QTDIR=${WRKSRC}
CONFIGURE_ENV= ${ECHO_CMD} yes | QTDIR=${WRKSRC}
.if defined(MAKE_JOBS)
MAKE_ARGS+= MAKE="${GMAKE} -j${MAKE_JOBS}"
.endif

View File

@ -26,7 +26,7 @@ DIRS= "XenoStep Classic" "XenoStep Classic Small" "XenoStep HeliX" \
post-extract:
for dir in ${DIRS}; do \
destdir=`${ECHO} $${dir} | ${SED} 's| |_|g'`; \
destdir=`${ECHO_CMD} $${dir} | ${SED} 's| |_|g'`; \
${CP} -R "${WRKSRC}/$${dir}" "${WRKSRC}/$${destdir}"; \
done

View File

@ -21,12 +21,12 @@ USE_GMAKE= yes
USE_X_PREFIX= yes
pre-install:
${ECHO} bin/aewm > ${PLIST}
${ECHO_CMD} bin/aewm > ${PLIST}
.if !defined(NOPORTDOCS)
for i in ${DOCS}; \
do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
done
${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
.endif
do-install:

View File

@ -33,7 +33,7 @@ do-build:
do-install:
.for i in ${SUB_STUBS}
@cd ${WRKDIR}/${i} ; \
${INSTALL_PROGRAM} `${ECHO} '${i}' | ${SED} -e 's,-\(.*\),,'` \
${INSTALL_PROGRAM} `${ECHO_CMD} '${i}' | ${SED} -e 's,-\(.*\),,'` \
${PREFIX}/bin
.endfor

View File

@ -27,12 +27,12 @@ do-build:
-L${X11BASE}/lib -o evilwm *.c -lX11
pre-install:
${ECHO} bin/evilwm > ${PLIST}
${ECHO_CMD} bin/evilwm > ${PLIST}
.if !defined(NOPORTDOCS)
.for i in ${DOCS}
${ECHO} ${DOCDIR}/${i} >> ${PLIST}
${ECHO_CMD} ${DOCDIR}/${i} >> ${PLIST}
.endfor
${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
.endif
do-install:

View File

@ -36,23 +36,23 @@ post-patch:
s|^MOC|#MOC|g'
pre-install:
${ECHO} bin/qlwm > ${PLIST}
${ECHO_CMD} bin/qlwm > ${PLIST}
.for i in biff dclock qlwm
${ECHO} ${LIBDIR}/$i >> ${PLIST}
${ECHO_CMD} ${LIBDIR}/$i >> ${PLIST}
.endfor
for i in `cd ${WRKSRC}/files; ${ECHO} *`; do \
${ECHO} ${LIBDIR}/files/$$i >> ${PLIST}; \
for i in `cd ${WRKSRC}/files; ${ECHO_CMD} *`; do \
${ECHO_CMD} ${LIBDIR}/files/$$i >> ${PLIST}; \
done
.if !defined(NOPORTDOCS)
.for i in ${DOCS}
${ECHO} ${DOCDIR}/$i >> ${PLIST}
${ECHO_CMD} ${DOCDIR}/$i >> ${PLIST}
.endfor
.endif
.for i in ${LIBDIR}/files ${LIBDIR}
${ECHO} @dirrm $i >> ${PLIST}
${ECHO_CMD} @dirrm $i >> ${PLIST}
.endfor
.if !defined(NOPORTDOCS)
${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
.endif
do-install:

View File

@ -29,21 +29,21 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}-src/src
pre-install:
${RM} -f ${PLIST}
for i in ${BINS} ${SCRIPTS}; \
do ${ECHO} bin/$${i} >> ${PLIST}; \
do ${ECHO_CMD} bin/$${i} >> ${PLIST}; \
done
.if !defined(NOPORTDOCS)
for i in ${DOCS}; \
do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
done
for i in 1 2 3; \
do ${ECHO} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \
do ${ECHO_CMD} ${DOCDIR}/examples/.swm/button$${i} >> ${PLIST}; \
done
for i in ${EXAMPLES}; \
do ${ECHO} ${DOCDIR}/examples/$${i} >> ${PLIST}; \
do ${ECHO_CMD} ${DOCDIR}/examples/$${i} >> ${PLIST}; \
done
${ECHO} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST}
${ECHO} @dirrm ${DOCDIR}/examples >> ${PLIST}
${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR}/examples/.swm >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR}/examples >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
.endif
do-install:

View File

@ -24,9 +24,9 @@ post-patch:
${PERL} -pi -e 's:/usr/lib/X11:${PREFIX}/lib/X11:g' ${WRKSRC}/uwm.man
pre-install:
${ECHO} bin/uwm > ${PLIST}
${ECHO} lib/X11/uwm/system.uwmrc >> ${PLIST}
${ECHO} @dirrm lib/X11/uwm >> ${PLIST}
${ECHO_CMD} bin/uwm > ${PLIST}
${ECHO_CMD} lib/X11/uwm/system.uwmrc >> ${PLIST}
${ECHO_CMD} @dirrm lib/X11/uwm >> ${PLIST}
post-install:
${MKDIR} ${PREFIX}/lib/X11/uwm

View File

@ -76,6 +76,6 @@ post-install:
update-LINGUAS: extract
cd ${WRKSRC}/po && \
${ECHO} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS
${ECHO_CMD} *.po | ${SED} 's|\.po||g' > ${FILESDIR}/LINGUAS
.include <bsd.port.post.mk>

View File

@ -32,11 +32,11 @@ post-extract:
do-configure:
(cd ${WRKSRC} ; \
${ECHO} "#define BuildMiscDocs YES" > host.def ; \
${ECHO} "#define BuildSpecsDocs YES" >> host.def ; \
${ECHO} "#define BuildLinuxDocPS NO" >> host.def ; \
${ECHO} "#define InstallHardcopyDocs YES" >> host.def ; \
${ECHO} "#define FreeBSDBuildXdoc YES" >> host.def ; \
${ECHO_CMD} "#define BuildMiscDocs YES" > host.def ; \
${ECHO_CMD} "#define BuildSpecsDocs YES" >> host.def ; \
${ECHO_CMD} "#define BuildLinuxDocPS NO" >> host.def ; \
${ECHO_CMD} "#define InstallHardcopyDocs YES" >> host.def ; \
${ECHO_CMD} "#define FreeBSDBuildXdoc YES" >> host.def ; \
imake -DUseInstalled ${PROJECTROOT} -I. -I${PREFIX}/lib/X11/config \
-DTOPDIR=.. -DCURDIR=.; \
${MAKE} Makefiles ; \

View File

@ -54,7 +54,7 @@ PLIST= ${PKGDIR}/pkg-plist.alpha
.endif
pre-configure:
@if ${ECHO} "$(CFLAGS)" |${GREP} -q O[3456789]; then \
@if ${ECHO_CMD} "$(CFLAGS)" |${GREP} -q O[3456789]; then \
${ECHO} "XFree86-4 with thread support does not build with optimization"; \
${ECHO} "flags different from O or -O2"; \
${FALSE}; fi
@ -124,7 +124,7 @@ post-patch:
@${MV} ${WRKDIR}/mgasource/mga-${MGA_DRIVER_DIR}/mga \
${WRKSRC}/programs/Xserver/hw/xfree86/drivers
@${CP} ${WRKSRC}/config/cf/xf86site.def ${WRKSRC}/config/cf/host.def
@${ECHO} "#define HaveMatroxHal YES" >> ${WRKSRC}/config/cf/host.def
@${ECHO_CMD} "#define HaveMatroxHal YES" >> ${WRKSRC}/config/cf/host.def
@${PERL} -pi.orig -ne 's!(#define PCI_CHIP_MGAG400\s+0x0525)!\1\n#define PCI_CHIP_MGAG550 0x2527\n!; \
s!({PCI_CHIP_MGAG400,\s+"MGA G400 AGP",0},)!\1\n{PCI_CHIP_MGAG550, "MGA G550 AGP", 0},\n!' \
${WRKSRC}/programs/Xserver/hw/xfree86/common/xf86PciInfo.h

View File

@ -27,13 +27,13 @@ do-build:
colour.c dispatcher.c main.c
pre-install:
${ECHO} bin/buttonbox > ${PLIST}
${ECHO} lib/X11/app-defaults/ButtonBox.ad >> ${PLIST}
${ECHO_CMD} bin/buttonbox > ${PLIST}
${ECHO_CMD} lib/X11/app-defaults/ButtonBox.ad >> ${PLIST}
.if !defined(NOPORTDOCS)
for i in ${DOCS}; \
do ${ECHO} ${DOCDIR}/$${i} >> ${PLIST}; \
do ${ECHO_CMD} ${DOCDIR}/$${i} >> ${PLIST}; \
done
${ECHO} @dirrm ${DOCDIR} >> ${PLIST}
${ECHO_CMD} @dirrm ${DOCDIR} >> ${PLIST}
.endif
do-install:

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -55,8 +55,8 @@ pre-everything::
.endif
post-extract:
@${ECHO} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO} "exit 0" >> ${WRKSRC}/mkpamserv
@${ECHO_CMD} "#!/bin/sh" > ${WRKSRC}/mkpamserv
@${ECHO_CMD} "exit 0" >> ${WRKSRC}/mkpamserv
post-patch:
.if !defined(WITH_MOTIF)

View File

@ -22,7 +22,7 @@ USE_XPM= yes
MAN1= xcolorsel.1
post-patch:
${ECHO} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
${PERL} -pi -e "s|#include <malloc.h>||g; s|/Xaw/|/Xaw3d/|g;" \
${WRKSRC}/*.[ch]
${PERL} -pi -e "s|app2head|./app2head|g; \