diff options
93 files changed, 466 insertions, 469 deletions
diff --git a/japanese/cdrom2/Makefile b/japanese/cdrom2/Makefile index 84711c837e42..1d5b1494db41 100644 --- a/japanese/cdrom2/Makefile +++ b/japanese/cdrom2/Makefile @@ -20,7 +20,7 @@ DOCS= errata.doc gaiji.txt index.doc install.doc kekka.txt \ ruigo.doc x_option.doc do-configure: - @echo "Copying custom Makefile." + @${ECHO_MSG} "Copying custom Makefile." @${CP} ${FILESDIR}/Makefile ${WRKSRC} .if !defined(NOPORTDOCS) diff --git a/japanese/elvis/Makefile b/japanese/elvis/Makefile index 0b64c11d384e..0bf3c1e03b98 100644 --- a/japanese/elvis/Makefile +++ b/japanese/elvis/Makefile @@ -33,21 +33,21 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/README.j18 ${PREFIX}/share/doc/ja-elvis @${SH} ${PKGDIR}/REQ ${PKGNAME} INSTALL @if [ ! -f ${STARTUP_SCRIPT} ]; then \ - echo "Installing ${STARTUP_SCRIPT} startup file."; \ - echo '#!/bin/sh' > ${STARTUP_SCRIPT}; \ - echo 'virecovery=`echo /var/tmp/elv_*`' \ + ${ECHO} "Installing ${STARTUP_SCRIPT} startup file."; \ + ${ECHO} '#!/bin/sh' > ${STARTUP_SCRIPT}; \ + ${ECHO} 'virecovery=`${ECHO} /var/tmp/elv_*`' \ >> ${STARTUP_SCRIPT}; \ - echo 'if [ "$$virecovery" != '"'/var/tmp/elv_*' ]; then" \ + ${ECHO} 'if [ "$$virecovery" != '"'/var/tmp/elv_*' ]; then" \ >> ${STARTUP_SCRIPT}; \ - echo " echo 'Recovering ja-elvis editor sessions'" \ + ${ECHO} " ${ECHO} 'Recovering ja-elvis editor sessions'" \ >> ${STARTUP_SCRIPT}; \ - echo ' for i in $$virecovery; do' \ + ${ECHO} ' for i in $$virecovery; do' \ >> ${STARTUP_SCRIPT}; \ - echo " ${PREFIX}/bin/elvprsv "'$$i' \ + ${ECHO} " ${PREFIX}/bin/elvprsv "'$$i' \ >> ${STARTUP_SCRIPT}; \ - echo ' done' \ + ${ECHO} ' done' \ >> ${STARTUP_SCRIPT}; \ - echo 'fi' >> ${STARTUP_SCRIPT}; \ + ${ECHO} 'fi' >> ${STARTUP_SCRIPT}; \ ${CHMOD} 755 ${STARTUP_SCRIPT}; \ ${CHOWN} bin.bin ${STARTUP_SCRIPT}; \ fi diff --git a/japanese/magicpoint/Makefile b/japanese/magicpoint/Makefile index d2a1198c6f81..675ff0f03040 100644 --- a/japanese/magicpoint/Makefile +++ b/japanese/magicpoint/Makefile @@ -20,5 +20,5 @@ CATEGORIES= japanese misc MAINTAINER= itojun@itojun.org # dirty, but this is required for version independent-ness -CONFIGURE_ARGS= --with-vfontcap=`echo ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1` +CONFIGURE_ARGS= --with-vfontcap=`${ECHO} ${LOCALBASE}/share/VFlib/*/vfontcap | tail -1` CONFIGURE_ARGS+= --enable-freetype-charset16 diff --git a/japanese/p5-manual/Makefile b/japanese/p5-manual/Makefile index 4735e36dd5c0..ae0c92165303 100644 --- a/japanese/p5-manual/Makefile +++ b/japanese/p5-manual/Makefile @@ -48,9 +48,9 @@ do-install: .include <bsd.port.mk> plist: - @echo -n >${PLIST} + @${ECHO} -n >${PLIST} .for item in 1 3 .for file in ${CAT${item}} - @echo man/ja/cat${item}/${file}.gz >>${PLIST} + @${ECHO} man/ja/cat${item}/${file}.gz >>${PLIST} .endfor .endfor diff --git a/japanese/skk-jisyo/Makefile b/japanese/skk-jisyo/Makefile index 04993630d854..ffc83d511942 100644 --- a/japanese/skk-jisyo/Makefile +++ b/japanese/skk-jisyo/Makefile @@ -31,8 +31,8 @@ PLIST_SUB= JISYONAME=${SKKJISYO} pre-fetch: .if defined(SKKJISYO_SIZE_INVALID) - @echo "Error: invalid SKKJISYO_SIZE: ${SKKJISYO_SIZE}" - @echo "SKKJISYO_SIZE should be L, M, or S." + @${ECHO_MSG} "Error: invalid SKKJISYO_SIZE: ${SKKJISYO_SIZE}" + @${ECHO_MSG} "SKKJISYO_SIZE should be L, M, or S." @${FALSE} .endif diff --git a/japanese/skkserv/Makefile b/japanese/skkserv/Makefile index 3868c3889188..52c637219441 100644 --- a/japanese/skkserv/Makefile +++ b/japanese/skkserv/Makefile @@ -32,14 +32,14 @@ post-install: ${ECHO} "start)" >> ${STARTUP_SCRIPT}; \ ${ECHO} " if [ -f ${PREFIX}/sbin/skkserv ]; then" >> \ ${STARTUP_SCRIPT}; \ - ${ECHO} " echo -n ' skkserv'; ${PREFIX}/sbin/skkserv" >> \ + ${ECHO} " ${ECHO} -n ' skkserv'; ${PREFIX}/sbin/skkserv" >> \ ${STARTUP_SCRIPT}; \ ${ECHO} " fi" >> ${STARTUP_SCRIPT}; \ ${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \ ${ECHO} "stop)" >> ${STARTUP_SCRIPT}; \ ${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \ ${ECHO} "*)" >> ${STARTUP_SCRIPT}; \ - ${ECHO} ' echo "usage: $$0 {start|stop}" 1>&2' >> ${STARTUP_SCRIPT}; \ + ${ECHO} ' ${ECHO} "usage: $$0 {start|stop}" 1>&2' >> ${STARTUP_SCRIPT}; \ ${ECHO} " ;;" >> ${STARTUP_SCRIPT}; \ ${ECHO} 'esac' >> ${STARTUP_SCRIPT}; \ ${CHMOD} ${BINMODE} ${STARTUP_SCRIPT}; \ diff --git a/japanese/tk42/Makefile b/japanese/tk42/Makefile index b2ed72d34345..1589ffa5d879 100644 --- a/japanese/tk42/Makefile +++ b/japanese/tk42/Makefile @@ -55,14 +55,14 @@ post-install: .if ${PORTOBJFORMAT} == "aout" ${LN} -sf libtk42jp.so.1.0 ${PREFIX}/lib/libtk42jp.so .endif - @echo "**********" - @echo "IMPORTANT:" - @echo "**********" - @echo "We've installed:" - @echo "tkConfig.sh in $(PREFIX)/lib/tk$(VERSION)/tkConfig.sh" - @echo "tk.h in $(PREFIX)/include/tk$(VERSION)/tk.h" - @echo "These are NOT the default place, but good place to avoid" - @echo "conflicting with another version of Tcl/Tks." + @${ECHO_MSG} "**********" + @${ECHO_MSG} "IMPORTANT:" + @${ECHO_MSG} "**********" + @${ECHO_MSG} "We've installed:" + @${ECHO_MSG} "tkConfig.sh in $(PREFIX)/lib/tk$(VERSION)/tkConfig.sh" + @${ECHO_MSG} "tk.h in $(PREFIX)/include/tk$(VERSION)/tk.h" + @${ECHO_MSG} "These are NOT the default place, but good place to avoid" + @${ECHO_MSG} "conflicting with another version of Tcl/Tks." test: cd ${WRKSRC}; ${SETENV} PORTOBJFORMAT=${PORTOBJFORMAT} ${MAKE} test diff --git a/java/jdk-doc/Makefile b/java/jdk-doc/Makefile index 18e2efba3b37..a1c346ac60d8 100644 --- a/java/jdk-doc/Makefile +++ b/java/jdk-doc/Makefile @@ -23,16 +23,16 @@ PLIST_SUB+= VERSION=${VERSION} do-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - @echo '' - @echo 'You have to fetch the documentation from' - @echo ' http://java.sun.com/products/jdk/1.1/docs.html' - @echo '' - @echo 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' - @echo '' - @echo 'All this hassle is because of the license and export restrictions' - @echo 'as described in' - @echo ' http://java.sun.com/feedback/faq/downloading.html' - @echo '' + @${ECHO_MSG} '' + @${ECHO_MSG} 'You have to fetch the documentation from' + @${ECHO_MSG} ' http://java.sun.com/products/jdk/1.1/docs.html' + @${ECHO_MSG} '' + @${ECHO_MSG} 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' + @${ECHO_MSG} '' + @${ECHO_MSG} 'All this hassle is because of the license and export restrictions' + @${ECHO_MSG} 'as described in' + @${ECHO_MSG} ' http://java.sun.com/feedback/faq/downloading.html' + @${ECHO_MSG} '' @${FALSE} .endif diff --git a/java/jdk11-doc/Makefile b/java/jdk11-doc/Makefile index 18e2efba3b37..a1c346ac60d8 100644 --- a/java/jdk11-doc/Makefile +++ b/java/jdk11-doc/Makefile @@ -23,16 +23,16 @@ PLIST_SUB+= VERSION=${VERSION} do-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - @echo '' - @echo 'You have to fetch the documentation from' - @echo ' http://java.sun.com/products/jdk/1.1/docs.html' - @echo '' - @echo 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' - @echo '' - @echo 'All this hassle is because of the license and export restrictions' - @echo 'as described in' - @echo ' http://java.sun.com/feedback/faq/downloading.html' - @echo '' + @${ECHO_MSG} '' + @${ECHO_MSG} 'You have to fetch the documentation from' + @${ECHO_MSG} ' http://java.sun.com/products/jdk/1.1/docs.html' + @${ECHO_MSG} '' + @${ECHO_MSG} 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' + @${ECHO_MSG} '' + @${ECHO_MSG} 'All this hassle is because of the license and export restrictions' + @${ECHO_MSG} 'as described in' + @${ECHO_MSG} ' http://java.sun.com/feedback/faq/downloading.html' + @${ECHO_MSG} '' @${FALSE} .endif diff --git a/java/jdk12-doc/Makefile b/java/jdk12-doc/Makefile index 18e2efba3b37..a1c346ac60d8 100644 --- a/java/jdk12-doc/Makefile +++ b/java/jdk12-doc/Makefile @@ -23,16 +23,16 @@ PLIST_SUB+= VERSION=${VERSION} do-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - @echo '' - @echo 'You have to fetch the documentation from' - @echo ' http://java.sun.com/products/jdk/1.1/docs.html' - @echo '' - @echo 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' - @echo '' - @echo 'All this hassle is because of the license and export restrictions' - @echo 'as described in' - @echo ' http://java.sun.com/feedback/faq/downloading.html' - @echo '' + @${ECHO_MSG} '' + @${ECHO_MSG} 'You have to fetch the documentation from' + @${ECHO_MSG} ' http://java.sun.com/products/jdk/1.1/docs.html' + @${ECHO_MSG} '' + @${ECHO_MSG} 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' + @${ECHO_MSG} '' + @${ECHO_MSG} 'All this hassle is because of the license and export restrictions' + @${ECHO_MSG} 'as described in' + @${ECHO_MSG} ' http://java.sun.com/feedback/faq/downloading.html' + @${ECHO_MSG} '' @${FALSE} .endif diff --git a/java/jdk13-doc/Makefile b/java/jdk13-doc/Makefile index 18e2efba3b37..a1c346ac60d8 100644 --- a/java/jdk13-doc/Makefile +++ b/java/jdk13-doc/Makefile @@ -23,16 +23,16 @@ PLIST_SUB+= VERSION=${VERSION} do-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - @echo '' - @echo 'You have to fetch the documentation from' - @echo ' http://java.sun.com/products/jdk/1.1/docs.html' - @echo '' - @echo 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' - @echo '' - @echo 'All this hassle is because of the license and export restrictions' - @echo 'as described in' - @echo ' http://java.sun.com/feedback/faq/downloading.html' - @echo '' + @${ECHO_MSG} '' + @${ECHO_MSG} 'You have to fetch the documentation from' + @${ECHO_MSG} ' http://java.sun.com/products/jdk/1.1/docs.html' + @${ECHO_MSG} '' + @${ECHO_MSG} 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' + @${ECHO_MSG} '' + @${ECHO_MSG} 'All this hassle is because of the license and export restrictions' + @${ECHO_MSG} 'as described in' + @${ECHO_MSG} ' http://java.sun.com/feedback/faq/downloading.html' + @${ECHO_MSG} '' @${FALSE} .endif diff --git a/java/jdk14-doc/Makefile b/java/jdk14-doc/Makefile index 18e2efba3b37..a1c346ac60d8 100644 --- a/java/jdk14-doc/Makefile +++ b/java/jdk14-doc/Makefile @@ -23,16 +23,16 @@ PLIST_SUB+= VERSION=${VERSION} do-fetch: .if !exists(${DISTDIR}/${DISTNAME}${EXTRACT_SUFX}) - @echo '' - @echo 'You have to fetch the documentation from' - @echo ' http://java.sun.com/products/jdk/1.1/docs.html' - @echo '' - @echo 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' - @echo '' - @echo 'All this hassle is because of the license and export restrictions' - @echo 'as described in' - @echo ' http://java.sun.com/feedback/faq/downloading.html' - @echo '' + @${ECHO_MSG} '' + @${ECHO_MSG} 'You have to fetch the documentation from' + @${ECHO_MSG} ' http://java.sun.com/products/jdk/1.1/docs.html' + @${ECHO_MSG} '' + @${ECHO_MSG} 'Put ${DISTNAME}${EXTRACT_SUFX} in in ${DISTDIR}/ and run make again.' + @${ECHO_MSG} '' + @${ECHO_MSG} 'All this hassle is because of the license and export restrictions' + @${ECHO_MSG} 'as described in' + @${ECHO_MSG} ' http://java.sun.com/feedback/faq/downloading.html' + @${ECHO_MSG} '' @${FALSE} .endif diff --git a/korean/kaistfonts/Makefile b/korean/kaistfonts/Makefile index 081c93ec5023..fcac4f6c07ea 100644 --- a/korean/kaistfonts/Makefile +++ b/korean/kaistfonts/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Mar 27 17:26:42 KST 1998 # Whom: CHOI Junho <junker@jazz.snu.ac.kr> # -# $Id: Makefile,v 1.3 1998/08/07 22:43:11 asami Exp $ +# $Id: Makefile,v 1.4 1998/11/17 02:31:47 asami Exp $ # DISTNAME= ko-kaistfonts-ksc-1.0 @@ -24,7 +24,7 @@ do-extract: ${MKDIR} ${WRKDIR} && \ cd ${WRKDIR} && \ for file in ${DISTFILES}; do \ - ${GUNZIP_CMD} -c < ${_DISTDIR}/$$file > `echo $$file | ${SED} -e 's/\.Z//' -e 's/\.gz//'`; \ + ${GUNZIP_CMD} -c < ${_DISTDIR}/$$file > `${ECHO} $$file | ${SED} -e 's/\.Z//' -e 's/\.gz//'`; \ done post-install: diff --git a/lang/f77/Makefile b/lang/f77/Makefile index 5b23f0cd6da4..5cd4cdcabbc3 100644 --- a/lang/f77/Makefile +++ b/lang/f77/Makefile @@ -37,7 +37,7 @@ MAN1= ${F77NAME}.1 PLIST= ${WRKDIR}/PLIST do-install: - @echo 'bin/${F77NAME}' > ${PLIST} + @${ECHO} 'bin/${F77NAME}' > ${PLIST} ${INSTALL_PROGRAM} ${WRKSRC}/f77 ${PREFIX}/bin/${F77NAME} @${SED} -e 's/F77/${F77NAME}/g' -e 's/f77/${F77NAME}/g' \ ${WRKSRC}/f77.1 > ${WRKSRC}/${F77NAME}.1 diff --git a/lang/m3gdb/Makefile b/lang/m3gdb/Makefile index 877c3c25654b..f6e66e2d2bd8 100644 --- a/lang/m3gdb/Makefile +++ b/lang/m3gdb/Makefile @@ -17,7 +17,7 @@ MANCOMPRESSED= yes pre-fetch: @if [ ! -d /usr/src/contrib/gdb ]; then \ - echo "To build this port you must have the FreeBSD" \ + ${ECHO_MSG} "To build this port you must have the FreeBSD" \ "sources in \"/usr/src\"."; \ exit 1; \ fi diff --git a/lang/modula-3-lib/Makefile b/lang/modula-3-lib/Makefile index f240de3fdd7b..4117d226ffc6 100644 --- a/lang/modula-3-lib/Makefile +++ b/lang/modula-3-lib/Makefile @@ -72,7 +72,7 @@ major= 6 PLIST= ${WRKDIR}/PLIST.noX11 .else pre-fetch: - @echo "To build this port without X11, define \"NO_X11\"." + @${ECHO_MSG} "To build this port without X11, define \"NO_X11\"." USE_XLIB= yes PLIST= ${WRKDIR}/PLIST @@ -80,12 +80,12 @@ PLIST= ${WRKDIR}/PLIST post-extract: .if !empty(have_boot) - @echo "Copying bootstrap modula-3 compiler from ${have_boot}" + @${ECHO_MSG} "Copying bootstrap modula-3 compiler from ${have_boot}" @${SH} ${SCRIPTDIR}/copy_files ${FILESDIR}/T.boot installed \ ${have_boot} ${WRKSRC} .endif .if !empty(have_gcc) - @echo "Copying gcc sources from ${have_gcc}" + @${ECHO_MSG} "Copying gcc sources from ${have_gcc}" @${SH} ${SCRIPTDIR}/copy_files ${FILESDIR}/T.gcc m3cc \ ${have_gcc} ${WRKSRC} .endif @@ -97,14 +97,14 @@ do-build: @test -d ${temp_prefix}/man/man1 || ${MKDIR} ${temp_prefix}/man/man1 @test -d ${temp_prefix}/lib/m3/pkg/m3build/templates || \ ${MKDIR} ${temp_prefix}/lib/m3/pkg/m3build/templates - @echo "++++++++++ quake ++++++++++" + @${ECHO_MSG} "++++++++++ quake ++++++++++" @test -d ${WRKSRC}/m3/quake/FreeBSD2 || \ ${MKDIR} ${WRKSRC}/m3/quake/FreeBSD2 @cd ${WRKSRC}/m3/quake/FreeBSD2; \ make -f ../src/makefile TARGET=FreeBSD2 COPT=-O CDEBUG= ; \ ${CP} -p quake ${temp_prefix}/bin; \ ${CP} -p ../src/quake.1 ${temp_prefix}/man/man1 - @echo "++++++++++ m3build ++++++++++" + @${ECHO_MSG} "++++++++++ m3build ++++++++++" @cd ${WRKSRC}/m3/m3build; \ PATH=${temp_prefix}/bin:$$PATH ./build FreeBSD2; \ ${CP} -p FreeBSD2/m3build FreeBSD2/m3ship FreeBSD2/m3where \ @@ -115,13 +115,13 @@ do-build: ${temp_prefix}/lib/m3/pkg/m3build/templates; \ ${CP} -p FreeBSD2/m3build.1 FreeBSD2/m3ship.1 FreeBSD2/m3where.1 \ ${temp_prefix}/man/man1 - @echo "++++++++++ m3cc ++++++++++" + @${ECHO_MSG} "++++++++++ m3cc ++++++++++" @test -d ${WRKSRC}/m3cc/FreeBSD2 || ${MKDIR} ${WRKSRC}/m3cc/FreeBSD2 @cd ${WRKSRC}/m3cc/FreeBSD2; \ ../gcc/configure i486-unknown-freebsd; \ make m3cgc1 CC="${CC}" CFLAGS="${CFLAGS}"; \ ${CP} -p m3cgc1 ${temp_prefix}/${libdir} - @echo "++++++++++ everything else ++++++++++" + @${ECHO_MSG} "++++++++++ everything else ++++++++++" @cd ${WRKSRC}/m3; \ LD_LIBRARY_PATH=${temp_prefix}/${libdir}:$$LD_LIBRARY_PATH; \ PATH=${temp_prefix}/bin:$$PATH; \ @@ -129,11 +129,11 @@ do-build: m3build pre-install: - @echo "Checking for conflicting shared libraries" + @${ECHO_MSG} "Checking for conflicting shared libraries" @PREFIX=${PREFIX} ${SH} ${PKGDIR}/INSTALL ${PKGNAME} PRE-INSTALL do-install: - @echo "Installing shared libraries" + @${ECHO_MSG} "Installing shared libraries" @cd ${temp_prefix}; \ umask 022; \ ${GREP} '^lib/m3/' ${PLIST}.real | \ @@ -142,7 +142,7 @@ do-install: ${GREP} '^lib/m3/' ${PLIST}.real | xargs ${CHMOD} go=u-w; \ find -X lib/m3 -type d | xargs ${CHOWN} ${BINOWN}.${BINGRP}; \ find -X lib/m3 -type d | xargs ${CHMOD} 755 - @echo "Installing copyright notice" + @${ECHO_MSG} "Installing copyright notice" @if [ ! -d ${PREFIX}/share/modula-3-lib ]; then \ ${MKDIR} ${PREFIX}/share/modula-3-lib; \ ${CHMOD} 755 ${PREFIX}/share/modula-3-lib; \ @@ -150,15 +150,15 @@ do-install: @${INSTALL_DATA} ${WRKSRC}/m3/src/COPYRIGHT \ ${PREFIX}/share/modula-3-lib @if [ ! -f ${startup_script} ]; then \ - echo "Installing ${startup_script} file"; \ + ${ECHO_MSG} "Installing ${startup_script} file"; \ test -d ${startup_dir} || ${MKDIR} ${startup_dir}; \ - echo "#!/bin/sh" > ${startup_script}; \ - echo "echo -n ' Modula-3'" >> ${startup_script}; \ - echo "${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2" \ + ${ECHO} "#!/bin/sh" > ${startup_script}; \ + ${ECHO} "${ECHO} -n ' Modula-3'" >> ${startup_script}; \ + ${ECHO} "${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2" \ >> ${startup_script}; \ ${CHMOD} 755 ${startup_script}; \ fi - @echo "Running ldconfig" + @${ECHO_MSG} "Running ldconfig" @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2 .include <bsd.port.mk> diff --git a/lang/modula-3-socks/Makefile b/lang/modula-3-socks/Makefile index f1e2dee99a64..056ed664b2f8 100644 --- a/lang/modula-3-socks/Makefile +++ b/lang/modula-3-socks/Makefile @@ -44,9 +44,9 @@ pre-install: post-install: @if [ ! -f ${PREFIX}/etc/m3socks.conf ]; then \ - echo -n "Please create a configuration file in "; \ - echo "${PREFIX}/etc/m3socks.conf"; \ - echo "Read m3socks.conf(5) for details"; \ + ${ECHO_MSG} -n "Please create a configuration file in "; \ + ${ECHO_MSG} "${PREFIX}/etc/m3socks.conf"; \ + ${ECHO_MSG} "Read m3socks.conf(5) for details"; \ fi .include <bsd.port.mk> diff --git a/lang/modula-3/Makefile b/lang/modula-3/Makefile index 54f2168123b3..7da87d67fc79 100644 --- a/lang/modula-3/Makefile +++ b/lang/modula-3/Makefile @@ -37,19 +37,19 @@ temp_prefix= ${WRKSRC}/installed PLIST= ${WRKDIR}/PLIST.noX11 .else pre-fetch: - @echo "To build this port without X11, define \"NO_X11\"." + @${ECHO_MSG} "To build this port without X11, define \"NO_X11\"." PLIST= ${WRKDIR}/PLIST MAN1+= formsedit.1 replayheap.1 showheap.1 shownew.1 showthread.1 .endif do-install: - @echo "Deleting extraneous cruft" + @${ECHO_MSG} "Deleting extraneous cruft" @cd ${temp_prefix}/lib/m3/pkg; \ rm -rf m3 m3front m3middle m3linker @cd ${temp_prefix}/lib/m3/FreeBSD2; \ rm -f libm3front.so.*.* libm3link.so.*.* libm3middle.so.*.* - @echo "Installing files in \"${PREFIX}\"" + @${ECHO_MSG} "Installing files in \"${PREFIX}\"" @cd ${temp_prefix}; \ umask 022; \ sed -e "/^@/d" -e "/m3build-/d" -e "s/\.gz$$//" \ @@ -59,9 +59,9 @@ do-install: umask 022; \ ${ECHO} ${MAN1} | perl -pe 's/ /\n/g' | \ cpio -dump -R ${MANOWN}.${MANGRP} ${PREFIX}/man/man1 - @echo "Fixing absolute pathnames in installed files" + @${ECHO_MSG} "Fixing absolute pathnames in installed files" @${SH} ${SCRIPTDIR}/fix_pathnames ${temp_prefix} ${PREFIX} - @echo "Rebuilding and shipping m3build with correct pathnames" + @${ECHO_MSG} "Rebuilding and shipping m3build with correct pathnames" @cd ${WRKSRC}/m3/m3build; \ LD_LIBRARY_PATH=${PREFIX}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \ PATH=${PREFIX}/bin:$$PATH; \ @@ -75,7 +75,7 @@ do-install: ${PREFIX}/lib/m3/pkg/m3build/templates/FreeBSD2 \ ${WRKSRC}/m3/m3build/src/m3makefile; \ ./m3ship - @echo "Rebuilding and shipping m3configvars with correct pathnames" + @${ECHO_MSG} "Rebuilding and shipping m3configvars with correct pathnames" @cd ${WRKSRC}/m3/m3configvars; \ LD_LIBRARY_PATH=${PREFIX}/lib/m3/FreeBSD2:$$LD_LIBRARY_PATH; \ export LD_LIBRARY_PATH; \ @@ -85,20 +85,20 @@ do-install: rm -rf FreeBSD2; \ m3build; \ m3ship - @echo "Installing copyright notice" + @${ECHO_MSG} "Installing copyright notice" @if [ ! -d ${PREFIX}/share/modula-3 ]; then \ ${MKDIR} ${PREFIX}/share/modula-3; \ ${CHMOD} 755 ${PREFIX}/share/modula-3; \ fi @${INSTALL_DATA} ${WRKSRC}/m3/src/COPYRIGHT ${PREFIX}/share/modula-3 - @echo "Stripping executables" + @${ECHO_MSG} "Stripping executables" @cd ${temp_prefix}; \ find bin -type f ! -name recordheap |\ (cd ${PREFIX}; xargs ${SH} ${SCRIPTDIR}/maybe-strip) @cd ${PREFIX}/lib/m3/FreeBSD2; strip m3 m3cgc1 m3mkdir @cd ${PREFIX}/bin; \ ln -f m3build m3build-${major} - @echo "Fixing file permissions" + @${ECHO_MSG} "Fixing file permissions" @cd ${PREFIX}; \ sed -e "/^@/d" -e "s/\.gz$$//" ${PLIST}.real |\ xargs ${CHOWN} ${BINOWN}.${BINGRP}; \ @@ -106,7 +106,7 @@ do-install: xargs ${CHMOD} go=u-w; \ find -X lib/m3 -type d | xargs ${CHOWN} ${BINOWN}.${BINGRP}; \ find -X lib/m3 -type d | xargs ${CHMOD} 755 - @echo "Running ldconfig" + @${ECHO_MSG} "Running ldconfig" @${SETENV} OBJFORMAT=${PORTOBJFORMAT} ${LDCONFIG} -m ${PREFIX}/lib/m3/FreeBSD2 .include <bsd.port.mk> diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile index f4cc676a9705..b38014b9105d 100644 --- a/lang/smalltalk/Makefile +++ b/lang/smalltalk/Makefile @@ -26,29 +26,29 @@ NO_PACKAGE= "Installation requires interaction" CFLAGS+= -I${X11BASE}/include do-install: - @echo "Installing method definitions..." + @${ECHO_MSG} "Installing method definitions..." @ if [ ! -d ${PREFIX}/lib/smalltalk ]; then ${MKDIR} ${PREFIX}/lib/smalltalk; fi @(cd ${WRKSRC}; ${CP} *.st ${PREFIX}/lib/smalltalk) @(cd ${PREFIX}/lib/smalltalk ; ${CHMOD} +r *.st) - @echo - @echo "To complete the installation of GNU Smalltalk, do" - @echo " cd ${WRKSRC};" - @echo "./gst -iV" - @echo "to test the interpreter and create the image." - @echo - @echo "When you are satisfied everything works, do Control-D to quit" - @echo "followed by" - @echo "cp gst ${PREFIX}/bin" - @echo "cp gst.im ${PREFIX}/lib/smalltalk" - @echo "to install the interpreter and image." - @echo - @echo "If Emacs is installed, you may also wish to copy the" - @echo "*st.el files to the Emacs Lisp directory. This will enable you" - @echo "to configure Emacs for Interactor mode." - @echo - @echo ">>Please read the file" - @echo "${WRKSRC}/info/gst.txi" - @echo "for more information.<<" - @echo + @${ECHO_MSG} + @${ECHO_MSG} "To complete the installation of GNU Smalltalk, do" + @${ECHO_MSG} " cd ${WRKSRC};" + @${ECHO_MSG} "./gst -iV" + @${ECHO_MSG} "to test the interpreter and create the image." + @${ECHO_MSG} + @${ECHO_MSG} "When you are satisfied everything works, do Control-D to quit" + @${ECHO_MSG} "followed by" + @${ECHO_MSG} "cp gst ${PREFIX}/bin" + @${ECHO_MSG} "cp gst.im ${PREFIX}/lib/smalltalk" + @${ECHO_MSG} "to install the interpreter and image." + @${ECHO_MSG} + @${ECHO_MSG} "If Emacs is installed, you may also wish to copy the" + @${ECHO_MSG} "*st.el files to the Emacs Lisp directory. This will enable you" + @${ECHO_MSG} "to configure Emacs for Interactor mode." + @${ECHO_MSG} + @${ECHO_MSG} ">>Please read the file" + @${ECHO_MSG} "${WRKSRC}/info/gst.txi" + @${ECHO_MSG} "for more information.<<" + @${ECHO_MSG} .include <bsd.port.mk> diff --git a/mail/ezmlm/Makefile b/mail/ezmlm/Makefile index a92fef1ac938..d9d83159a447 100644 --- a/mail/ezmlm/Makefile +++ b/mail/ezmlm/Makefile @@ -50,7 +50,7 @@ post-patch: pre-install: @${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX - @diff ${WRKDIR}/.[PI]PREFIX || (echo ${DIFF_MSG} && exit 1) + @diff ${WRKDIR}/.[PI]PREFIX || (${ECHO} ${DIFF_MSG} && exit 1) do-install: .for file in ${MY_PROGRAMS} diff --git a/mail/ml/Makefile b/mail/ml/Makefile index 8405f9e9a356..375ba6a8189e 100644 --- a/mail/ml/Makefile +++ b/mail/ml/Makefile @@ -18,7 +18,7 @@ REQUIRES_MOTIF= yes NO_INSTALL_MANPAGES= yes pre-configure: - @echo "===> Building c-client" + @${ECHO_MSG} "===> Building c-client" @( cd ${WRKSRC}/../imap-4; make bsi ) @( cd ${WRKSRC}; ${RM} -f makeproto ) diff --git a/mail/qmailanalog/Makefile b/mail/qmailanalog/Makefile index 39c51d2c00a2..cdd4e2039178 100644 --- a/mail/qmailanalog/Makefile +++ b/mail/qmailanalog/Makefile @@ -43,14 +43,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} ${PREFIX} > ${WRKDIR}/.PPREFIX + @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.PPREFIX pre-install: - @echo ${PREFIX} > ${WRKDIR}/.IPREFIX - @echo ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX + @${ECHO} ${PREFIX} > ${WRKDIR}/.IPREFIX + @${ECHO} ${QMAIL_DIR} >> ${WRKDIR}/.IPREFIX @diff ${WRKDIR}/.[PI]PREFIX > /dev/null \ - || (echo ${DIFF_MSG} && exit 1) + || (${ECHO} ${DIFF_MSG} && exit 1) @${MKDIR} ${QMPREFIX} .include <bsd.port.mk> diff --git a/mail/smail/Makefile b/mail/smail/Makefile index e901bd0ab24a..8701e4a4957c 100644 --- a/mail/smail/Makefile +++ b/mail/smail/Makefile @@ -29,13 +29,13 @@ MAN8= pathalias.8 mkdbm.8 mkline.8 mksort.8 mkaliases.8 smail.8 \ mkuuwho.8 mailq.8 sendmail.8 runq.8 rmail.8 rsmtp.8 smtpd.8 post-install: - @echo "If you want to replace sendmail with links to smail, type" - @echo "the following command as \"root\":" - @echo "" - @echo " make replace" + @${ECHO_MSG} "If you want to replace sendmail with links to smail, type" + @${ECHO_MSG} "the following command as \"root\":" + @${ECHO_MSG} "" + @${ECHO_MSG} " make replace" replace: - @echo "===> Replacing sendmail" + @${ECHO_MSG} "===> Replacing sendmail" if [ -e /usr/sbin/sendmail ]; then \ ${MV} -f /usr/sbin/sendmail /usr/sbin/sendmail.BAK; \ if [ -f /usr/sbin/sendmail.BAK ]; then \ diff --git a/math/Scilab/Makefile b/math/Scilab/Makefile index 586f93ba2f0d..b5a8d24b3462 100644 --- a/math/Scilab/Makefile +++ b/math/Scilab/Makefile @@ -26,12 +26,6 @@ USE_X_PREFIX= yes SCIDIR= ${X11BASE}/lib/X11/scilab post-install: - @echo "******************************************************************************" - @echo 0 - COPYRIGHT NOTICE - @echo - @echo To use Scilab, you need to fill and return the end of the file notice.tex - @echo "or notice.ps (postscript file). You may email to Scilab@inria.fr." - @echo - @echo "******************************************************************************" + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/math/Scilab/pkg-message b/math/Scilab/pkg-message new file mode 100644 index 000000000000..68561beb9a52 --- /dev/null +++ b/math/Scilab/pkg-message @@ -0,0 +1,8 @@ +****************************************************************************** +0 - COPYRIGHT NOTICE + +To use Scilab, you need to fill and return the end of the file notice.tex +or notice.ps (postscript file). You may email to Scilab@inria.fr. + +****************************************************************************** + diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 586f93ba2f0d..b5a8d24b3462 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -26,12 +26,6 @@ USE_X_PREFIX= yes SCIDIR= ${X11BASE}/lib/X11/scilab post-install: - @echo "******************************************************************************" - @echo 0 - COPYRIGHT NOTICE - @echo - @echo To use Scilab, you need to fill and return the end of the file notice.tex - @echo "or notice.ps (postscript file). You may email to Scilab@inria.fr." - @echo - @echo "******************************************************************************" + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/math/scilab/pkg-message b/math/scilab/pkg-message new file mode 100644 index 000000000000..68561beb9a52 --- /dev/null +++ b/math/scilab/pkg-message @@ -0,0 +1,8 @@ +****************************************************************************** +0 - COPYRIGHT NOTICE + +To use Scilab, you need to fill and return the end of the file notice.tex +or notice.ps (postscript file). You may email to Scilab@inria.fr. + +****************************************************************************** + diff --git a/misc/astrolog/Makefile b/misc/astrolog/Makefile index 2e25a5994b50..d2b812a0b7a6 100644 --- a/misc/astrolog/Makefile +++ b/misc/astrolog/Makefile @@ -47,8 +47,8 @@ do-install: ${INSTALL_DATA} Update.540 ${PREFIX}/share/doc/astrolog cd ${WRKSRC} && \ ${INSTALL_DATA} README.540 ${PREFIX}/share/doc/astrolog - @echo - @echo "See the file ${PREFIX}/share/doc/astrolog/Helpfile.540 for help" - @echo "and tune ${PREFIX}/lib/astrolog/astrolog.dat" + @${ECHO_MSG} + @${ECHO_MSG} "See the file ${PREFIX}/share/doc/astrolog/Helpfile.540 for help" + @${ECHO_MSG} "and tune ${PREFIX}/lib/astrolog/astrolog.dat" .include <bsd.port.mk> diff --git a/misc/estic/Makefile b/misc/estic/Makefile index 3df3b35632a9..1a56911668c8 100644 --- a/misc/estic/Makefile +++ b/misc/estic/Makefile @@ -62,19 +62,19 @@ do-install: ${CHMOD} 700 ${PBX_VAR} # estic will create ./1996.11 etc post-install: - @echo "" - @echo " Suggestion, try: make demo" + @${ECHO_MSG} "" + @${ECHO_MSG} " Suggestion, try: make demo" demo: - @echo "If you want to try this under X-Windows, do this:" - @echo " ${SETENV} SPUNK_LANGUAGE 001" - @echo " ${SETENV} SPUNK_XFONT 8x13" - @echo " cd ${PBX_ETC}" - @echo " vi estic.ini" - @echo " ${CHMOD} 666 /dev/cuaaX, or su" - @echo " ${ESTIC}/xestic -display :0" - @echo " (If you have no Istec 100[38] connected, append -n )" - @echo " A BUGS & PROBLEMS section exists in ${FILESDIR}/README == man estic_freebsd" + @${ECHO_MSG} "If you want to try this under X-Windows, do this:" + @${ECHO_MSG} " ${SETENV} SPUNK_LANGUAGE 001" + @${ECHO_MSG} " ${SETENV} SPUNK_XFONT 8x13" + @${ECHO_MSG} " cd ${PBX_ETC}" + @${ECHO_MSG} " vi estic.ini" + @${ECHO_MSG} " ${CHMOD} 666 /dev/cuaaX, or su" + @${ECHO_MSG} " ${ESTIC}/xestic -display :0" + @${ECHO_MSG} " (If you have no Istec 100[38] connected, append -n )" + @${ECHO_MSG} " A BUGS & PROBLEMS section exists in ${FILESDIR}/README == man estic_freebsd" # Ref. NO_CDROM= & NO_PACKAGE= # It is not necessary to prevent inclusion of source or binary on FreeBSD diff --git a/misc/tet/Makefile b/misc/tet/Makefile index 7f120f8e2edf..8e55e69eb749 100644 --- a/misc/tet/Makefile +++ b/misc/tet/Makefile @@ -27,11 +27,11 @@ do-build: pre-extract: .if !defined(TET_ROOT) - @echo - @echo "The environment variable \"TET_ROOT\" is not set." - @echo "You must set it to the directory where you would like " - @echo "this port to reside before attempting extraction." - @echo + @${ECHO_MSG} + @${ECHO_MSG} "The environment variable \"TET_ROOT\" is not set." + @${ECHO_MSG} "You must set it to the directory where you would like " + @${ECHO_MSG} "this port to reside before attempting extraction." + @${ECHO_MSG} @${FALSE} .else @${TRUE} diff --git a/net/SSLtelnet/Makefile b/net/SSLtelnet/Makefile index 647e8b87384f..1b724638673e 100644 --- a/net/SSLtelnet/Makefile +++ b/net/SSLtelnet/Makefile @@ -3,7 +3,7 @@ # Date created: Mar 29, 1998 # Whom: issei@jp.FreeBSD.ORG # -# $Id: Makefile,v 1.8 1999/08/05 08:00:18 dirk Exp $ +# $Id: Makefile,v 1.9 1999/08/23 04:23:52 mharo Exp $ DISTNAME= SSLtelnet-0.13 CATEGORIES= net security @@ -13,10 +13,10 @@ MAINTAINER= issei@jp.FreeBSD.ORG .if defined(USA_RESIDENT) && ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO pre-fetch: - @echo - @echo You must set variable USA_RESIDENT to YES, if you are USA resident - @echo or to NO, if you aren\'t USA resident to build this package. - @echo You must also have installed RSAREF if you are USA resident. + @${ECHO_MSG} + @${ECHO_MSG} You must set variable USA_RESIDENT to YES, if you are USA resident + @${ECHO_MSG} or to NO, if you aren\'t USA resident to build this package. + @${ECHO_MSG} You must also have installed RSAREF if you are USA resident. @${FALSE} .elif defined(USA_RESIDENT) .if ${USA_RESIDENT} == YES diff --git a/net/bb/Makefile b/net/bb/Makefile index 0df82cdc6aa2..32bcae94fff2 100644 --- a/net/bb/Makefile +++ b/net/bb/Makefile @@ -3,7 +3,7 @@ # Date created: So 17 Nov 1996 16:59:23 MET # Whom: Andreas Klemm <andreas@klemm.gtn.com> # -# $Id: Makefile,v 1.31 1999/06/26 12:01:23 andreas Exp $ +# $Id: Makefile,v 1.32 1999/06/27 14:22:46 andreas Exp $ # DISTNAME= bb-1.2a @@ -20,12 +20,12 @@ MAINTAINER= andreas@FreeBSD.ORG WRKSRC= ${WRKDIR}/bb pre-configure: - @echo "===================================================" - @echo "You need to install a WWW Server to use this port" - @echo "For example: - apache13 or " - @echo " - apache13-modssl - @echo "port." - @echo "===================================================" + @${ECHO_MSG} "===================================================" + @${ECHO_MSG} "You need to install a WWW Server to use this port" + @${ECHO_MSG} "For example: - apache13 or " + @${ECHO_MSG} " - apache13-modssl + @${ECHO_MSG} "port." + @${ECHO_MSG} "===================================================" post-configure: ( cd ${WRKSRC}/doc; ${SH} bbconfig freebsd ) @@ -47,22 +47,6 @@ do-install: @${RM} ${PREFIX}/bb/README @${RM} ${PREFIX}/bb/README.CHANGES @${RM} ${PREFIX}/bb/README.INSTALL - @echo "" - @echo "================================================================" - @echo "==== Configuration Notes: ===" - @echo "================================================================" - @echo "" - @echo "a) your hosts 'full qualified domain name' and IP-address" - @echo "b) 'watched' hosts 'full qualified domain name' and IP-address" - @echo "go here -> ${PREFIX}/bb/etc/bb-hosts" - @echo "c) configure -> ${PREFIX}/bb/etc/bbdef.sh" - @echo "d) configure -> ${PREFIX}/bb/etc/bbinc.sh" - @echo "e) You need to have a running WWW server (apache)" - @echo "f) You need kermit or qpage for pager functionality" - @echo "After that, you can startup the big brother service by typing" - @echo " ${PREFIX}/bb/runbb.sh &" - @echo "and watching your systems status by viewing this URL with" - @echo "Netscape or another WWW browser" - @echo " http://localhost/bb" + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/net/bb/pkg-message b/net/bb/pkg-message new file mode 100644 index 000000000000..52240c9b7eac --- /dev/null +++ b/net/bb/pkg-message @@ -0,0 +1,18 @@ + +================================================================ +==== Configuration Notes: === +================================================================ + +a) your hosts 'full qualified domain name' and IP-address +b) 'watched' hosts 'full qualified domain name' and IP-address +go here -> /usr/local/bb/etc/bb-hosts +c) configure -> /usr/local/bb/etc/bbdef.sh +d) configure -> /usr/local/bb/etc/bbinc.sh +e) You need to have a running WWW server (apache) +f) You need kermit or qpage for pager functionality +After that, you can startup the big brother service by typing + /usr/local/bb/runbb.sh & +and watching your systems status by viewing this URL with +Netscape or another WWW browser + http://localhost/bb + diff --git a/net/cvsup-mirror/Makefile b/net/cvsup-mirror/Makefile index eb1d7d2bde29..f83359634b84 100644 --- a/net/cvsup-mirror/Makefile +++ b/net/cvsup-mirror/Makefile @@ -3,7 +3,7 @@ # Date created: 01 February 1997 # Whom: jdp # -# $Id: Makefile,v 1.4 1998/06/27 05:19:58 asami Exp $ +# $Id: Makefile,v 1.5 1999/08/22 23:33:09 mharo Exp $ # DISTNAME= cvsup-mirror-1.0 @@ -28,7 +28,7 @@ do-extract: @test -d ${WRKSRC} || ${MKDIR} ${WRKSRC} do-install: - @echo "Installing files" + @${ECHO_MSG} "Installing files" @test -d ${base} || ${MKDIR} ${base} @test -d ${rc} || ${MKDIR} ${rc} @${INSTALL_DATA} ${WRKSRC}/config.sh ${base} diff --git a/net/cvsup/Makefile b/net/cvsup/Makefile index 4c798c7a92f2..8bc45d2e0002 100644 --- a/net/cvsup/Makefile +++ b/net/cvsup/Makefile @@ -3,7 +3,7 @@ # Date created: 7 August 1996 # Whom: asami # -# $Id: Makefile,v 1.31 1999/01/28 05:39:14 jdp Exp $ +# $Id: Makefile,v 1.32 1999/02/10 02:47:55 jdp Exp $ # DISTNAME= cvsup-16.0 @@ -24,8 +24,8 @@ MAN8= cvsupd.8 M3FLAGS+= -DNOGUI .else pre-fetch: - @echo -n "To build this port without X11 (and without the GUI)," - @echo " define \"NO_X11\"." + @${ECHO_MSG} -n "To build this port without X11 (and without the GUI)," + @${ECHO_MSG} " define \"NO_X11\"." .endif diff --git a/net/delegate/Makefile b/net/delegate/Makefile index 17107fab1a87..739435b48602 100644 --- a/net/delegate/Makefile +++ b/net/delegate/Makefile @@ -3,7 +3,7 @@ # Date created: 26 Jan 1997 # Whom: Masafumi NAKANE <max@FreeBSD.ORG> # -# $Id: Makefile,v 1.15 1999/04/18 06:31:27 max Exp $ +# $Id: Makefile,v 1.16 1999/08/02 21:02:25 max Exp $ # DISTNAME= delegate5.9.3 @@ -17,7 +17,7 @@ MAKE_ENV= PATH=$${PATH}:. .if defined(BATCH) pre-build: - @echo "MANAGER=root@localhost" >> ${WRKSRC}/DELEGATE_CONF + @${ECHO} "MANAGER=root@localhost" >> ${WRKSRC}/DELEGATE_CONF .endif do-install: diff --git a/net/gnu-finger/Makefile b/net/gnu-finger/Makefile index b1991db43a0d..88e5b9040690 100644 --- a/net/gnu-finger/Makefile +++ b/net/gnu-finger/Makefile @@ -3,7 +3,7 @@ # Date created: 20 June 1996 # Whom: Yoshiro MIHIRA <sanpei@yy.cs.keio.ac.jp> # -# $Id: Makefile,v 1.6 1997/01/06 07:24:39 max Exp $ +# $Id: Makefile,v 1.7 1999/01/27 07:41:25 fenner Exp $ # DISTNAME= finger-1.37 @@ -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.hotname" > ${PREFIX}/etc/fingerdir/serverhost.sample - @echo "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample + @${ECHO} "GNU.finger.server.hotname" > ${PREFIX}/etc/fingerdir/serverhost.sample + @${ECHO} "mail.spool.server.hostname" > ${PREFIX}/etc/fingerdir/mailhost.sample .include <bsd.port.mk> diff --git a/net/netatalk-asun/Makefile b/net/netatalk-asun/Makefile index 782d23bcadc9..3bd124cdc9a7 100644 --- a/net/netatalk-asun/Makefile +++ b/net/netatalk-asun/Makefile @@ -3,7 +3,7 @@ # Date created: 07 Sep 1998 # Whom: stb@freebsd.org # -# $Id: Makefile,v 1.7 1999/05/17 08:17:57 stb Exp $ +# $Id: Makefile,v 1.8 1999/06/21 12:43:07 sheldonh Exp $ # DISTNAME= netatalk-1.4b2+asun2.1.3 @@ -37,15 +37,15 @@ pre-build: ## sendfile(2) support seems to be broken in this version, but go ahead an try ## to fix it! .if defined(USE_SENDFILE) && ${OSVERSION} < 310000 - @echo "*** sendfile(2) support is available only with FreeBSD 3.1-RELEASE" - @echo " or newer. This port probably won't compile." + @${ECHO_MSG} "*** sendfile(2) support is available only with FreeBSD 3.1-RELEASE" + @${ECHO_MSG} " or newer. This port probably won't compile." .endif .if ${OSVERSION} >= 310000 .if defined(USE_SENDFILE) - @echo "*** sendfile(2) support is experimental and will likely cause" - @echo " undesired behaviour!" + @${ECHO_MSG} "*** sendfile(2) support is experimental and will likely cause" + @${ECHO_MSG} " undesired behaviour!" .else -# @echo "*** Use -DUSE_SENDFILE to enable the experimental sendfile(2) support." +# @${ECHO_MSG} "*** Use -DUSE_SENDFILE to enable the experimental sendfile(2) support." .endif .endif diff --git a/net/rwhois/Makefile b/net/rwhois/Makefile index ed5c57e1b0c8..1fc3bfb4f2c1 100644 --- a/net/rwhois/Makefile +++ b/net/rwhois/Makefile @@ -3,7 +3,7 @@ # Date created: May 9th 1997 # Whom: James FitzGibbon <jfitz@FreeBSD.org> # -# $Id: Makefile,v 1.6 1999/06/26 22:58:41 mharo Exp $ +# $Id: Makefile,v 1.7 1999/08/22 18:59:30 mharo Exp $ # DISTNAME= rwhois-1.0B9.2 @@ -28,14 +28,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/rwhois ${MV} ${PREFIX}/share/doc/rwhois/rmkdbindex.8 ${PREFIX}/man/man8 ${MV} ${PREFIX}/share/doc/rwhois/rwhoisd.8 ${PREFIX}/man/man8 - @ echo "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..." - @ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "echo \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && echo -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..." + @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && ${ECHO} -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh ${CHMOD} 751 ${PREFIX}/etc/rc.d/rwhoisd.sh .include <bsd.port.mk> diff --git a/net/rwhoisd/Makefile b/net/rwhoisd/Makefile index ed5c57e1b0c8..1fc3bfb4f2c1 100644 --- a/net/rwhoisd/Makefile +++ b/net/rwhoisd/Makefile @@ -3,7 +3,7 @@ # Date created: May 9th 1997 # Whom: James FitzGibbon <jfitz@FreeBSD.org> # -# $Id: Makefile,v 1.6 1999/06/26 22:58:41 mharo Exp $ +# $Id: Makefile,v 1.7 1999/08/22 18:59:30 mharo Exp $ # DISTNAME= rwhois-1.0B9.2 @@ -28,14 +28,14 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/doc/* ${PREFIX}/share/doc/rwhois ${MV} ${PREFIX}/share/doc/rwhois/rmkdbindex.8 ${PREFIX}/man/man8 ${MV} ${PREFIX}/share/doc/rwhois/rwhoisd.8 ${PREFIX}/man/man8 - @ echo "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..." - @ echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "echo \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh - @ echo "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && echo -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO_MSG} "Installing ${PREFIX}/etc/rc.d/rwhoisd.sh startup file..." + @ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "#" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "# remove or comment the following line and uncomment the one below it once you have" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "# configured your server's data" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "${ECHO} \"rwhoisd not started; sample data still in place. See ${PREFIX}/share/doc/rwhois for details.\"" >> ${PREFIX}/etc/rc.d/rwhoisd.sh + @ ${ECHO} "#[ -x ${PREFIX}/lib/rwhois/sbin/rwhoisd ] && ${PREFIX}/lib/rwhois/sbin/rwhoisd -c ${PREFIX}/lib/rwhois/rwhois.conf & && ${ECHO} -n ' rwhoisd'" >> ${PREFIX}/etc/rc.d/rwhoisd.sh ${CHMOD} 751 ${PREFIX}/etc/rc.d/rwhoisd.sh .include <bsd.port.mk> diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile index 5edf6af460b6..9aa40afca243 100644 --- a/net/tac_plus4/Makefile +++ b/net/tac_plus4/Makefile @@ -3,7 +3,7 @@ # Date created: 4 Mar 1997 # Whom: Igor Vinokurov <igor@zynaps.ru> # -# $Id: Makefile,v 1.4 1999/02/03 11:11:56 asami Exp $ +# $Id: Makefile,v 1.5 1999/08/22 18:59:32 mharo Exp $ # DISTNAME= tac_plus.2.1 @@ -34,8 +34,8 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/tac_plus.conf.example ${PREFIX}/etc/ @if [ ! -f ${PREFIX}/etc/rc.d/tac_plus.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/tac_plus.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/tac_plus.sh; \ - echo "[ -x ${PREFIX}/sbin/tac_plus -a -f ${PREFIX}/etc/tac_plus.conf ] && ${PREFIX}/sbin/tac_plus -C ${PREFIX}/etc/tac_plus.conf && echo -n ' tac_plus'" >> ${PREFIX}/etc/rc.d/tac_plus.sh; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/tac_plus.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/tac_plus -a -f ${PREFIX}/etc/tac_plus.conf ] && ${PREFIX}/sbin/tac_plus -C ${PREFIX}/etc/tac_plus.conf && ${ECHO} -n ' tac_plus'" >> ${PREFIX}/etc/rc.d/tac_plus.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/tac_plus.sh; \ fi .if !defined(NOPORTDOCS) diff --git a/net/tdetect/Makefile b/net/tdetect/Makefile index 56d530125368..c101fb711a31 100644 --- a/net/tdetect/Makefile +++ b/net/tdetect/Makefile @@ -4,7 +4,7 @@ # Date created: Sun Jan 31, 1997 # Whom: shipley@dis.org # -# $Id: Makefile,v 1.2 1999/07/04 19:18:49 obrien Exp $ +# $Id: Makefile,v 1.3 1999/08/22 18:59:33 mharo Exp $ # DISTNAME= tdetect-0.2 @@ -27,7 +27,7 @@ post-install: ${ECHO} "Installing ${PREFIX}/etc/rc.d/tdetect.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/tdetect.sh; \ ${ECHO} "ETHERNETDEV=ed0" >> ${PREFIX}/etc/rc.d/tdetect.sh; \ - ${ECHO} '[ -x ${PREFIX}/sbin/tdetect ] && ${PREFIX}/sbin/tdetect \$ETHERNETDEV && echo -n " tdetect"' >> ${PREFIX}/etc/rc.d/tdetect.sh; \ + ${ECHO} '[ -x ${PREFIX}/sbin/tdetect ] && ${PREFIX}/sbin/tdetect \$ETHERNETDEV && ${ECHO} -n " tdetect"' >> ${PREFIX}/etc/rc.d/tdetect.sh; \ ${CHMOD} 750 ${PREFIX}/etc/rc.d/tdetect.sh; \ ${ECHO} ''; \ ${ECHO} 'IMPORTANT edit ${PREFIX}/etc/rc.d/tdetect.sh and set "ETHERNETDEV" to'; \ diff --git a/news/diablo/Makefile b/news/diablo/Makefile index c3dcc6ebdae2..21bd54e96a1b 100644 --- a/news/diablo/Makefile +++ b/news/diablo/Makefile @@ -3,7 +3,7 @@ # Date created: June 2nd 1997 # Whom: jfitz # -# $Id: Makefile,v 1.5 1999/07/04 20:54:41 steve Exp $ +# $Id: Makefile,v 1.6 1999/08/22 18:59:40 mharo Exp $ # DISTNAME= diablo-1.15-rel @@ -65,9 +65,9 @@ post-install: @ ${ECHO} "if [ -x ${PREFIX}/news/rc.news ]" >> \ ${PREFIX}/etc/rc.d/diablo.sh @ ${ECHO} "then" >> ${PREFIX}/etc/rc.d/diablo.sh - @ ${ECHO} "# ${PREFIX}/news/rc.news && echo -n ' diablo'" >> \ + @ ${ECHO} "# ${PREFIX}/news/rc.news && ${ECHO} -n ' diablo'" >> \ ${PREFIX}/etc/rc.d/diablo.sh - @ ${ECHO} " echo -n ' diablo(disabled)'" >> \ + @ ${ECHO} " ${ECHO} -n ' diablo(disabled)'" >> \ ${PREFIX}/etc/rc.d/diablo.sh @ ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/diablo.sh ${CHMOD} 0750 ${PREFIX}/etc/rc.d/diablo.sh diff --git a/news/nntpcache/Makefile b/news/nntpcache/Makefile index 5579e59ce2c6..63855ee2d99f 100644 --- a/news/nntpcache/Makefile +++ b/news/nntpcache/Makefile @@ -3,7 +3,7 @@ # Date created: 6 January 1997 # Whom: proff@suburbia.net # -# $Id: Makefile,v 1.10 1998/01/29 04:04:33 itojun Exp $ +# $Id: Makefile,v 1.11 1998/02/01 03:04:11 itojun Exp $ # DISTNAME= nntpcache-2.3.2 @@ -42,7 +42,7 @@ post-install: hardlink-pgp-files: for i in ${PREFIX}/etc/nntpcache/*asc-dist ${PREFIX}/etc/nntpcache/*pgp-dist ; do \ - j=`echo $$i | sed -e 's/-dist//'`; \ + j=`${ECHO} $$i | sed -e 's/-dist//'`; \ if [ \! -f $$j ]; then \ ln $$i $$j; \ fi; \ diff --git a/news/trn4/Makefile b/news/trn4/Makefile index 5e06949e6d3d..29c505db55bb 100644 --- a/news/trn4/Makefile +++ b/news/trn4/Makefile @@ -3,7 +3,7 @@ # Date created: 21 October 1994 # Whom: smace # -# $Id: Makefile,v 1.19 1999/02/09 17:48:55 mph Exp $ +# $Id: Makefile,v 1.20 1999/05/21 22:39:37 mph Exp $ # DISTNAME= trn4-test72 @@ -20,7 +20,7 @@ IS_INTERACTIVE= yes MAN1= trn.1 Pnews.1 Rnmail.1 pre-configure: - @echo "===> Running pre-configure target for ${DISTNAME}" + @${ECHO_MSG} "===> Running pre-configure target for ${DISTNAME}" @${SED} -e "s:__CC__:$(CC):" -e "s:__CFLAGS__:$(CFLAGS):" \ -e "s:/PREFIX:$(PREFIX):" ${SCRIPTDIR}/preconf > \ ${WRKDIR}/preconf.new diff --git a/print/psutils-letter/Makefile b/print/psutils-letter/Makefile index 4843ac0aa213..e8ff82eedd1d 100644 --- a/print/psutils-letter/Makefile +++ b/print/psutils-letter/Makefile @@ -3,7 +3,7 @@ # Date created: 21 September 1994 # Whom: jmz & David O'Brien (obrien@cs.ucdavis.edu) # -# $Id: Makefile,v 1.17 1998/10/30 08:35:38 asami Exp $ +# $Id: Makefile,v 1.18 1998/11/20 04:15:15 asami Exp $ # DISTNAME= psutils-p17 @@ -41,11 +41,11 @@ PAPERSIZE_UNSPECIFIED= yes pre-fetch: .if defined(PAPERSIZE_UNSPECIFIED) - @echo "Defaulting to ${PAPERSIZE} sized paper." - @echo "" - @echo "Set the environment variable PAPERSIZE if you want to use other sizes." - @echo "Possible values are: A3, A4, A5, B5, letter, legal," - @echo " ledger, tabloid, statement, executive, folio, quarto, and 10x14." + @${ECHO_MSG} "Defaulting to ${PAPERSIZE} sized paper." + @${ECHO_MSG} "" + @${ECHO_MSG} "Set the environment variable PAPERSIZE if you want to use other sizes." + @${ECHO_MSG} "Possible values are: A3, A4, A5, B5, letter, legal," + @${ECHO_MSG} " ledger, tabloid, statement, executive, folio, quarto, and 10x14." .endif .include <bsd.port.mk> diff --git a/print/rlpr/Makefile b/print/rlpr/Makefile index 56fdd70ddeb6..eeb6a2942a96 100644 --- a/print/rlpr/Makefile +++ b/print/rlpr/Makefile @@ -3,7 +3,7 @@ # Date created: 11 April 1999 # Whom: Mikhail Teterin # -# $Id: Makefile,v 1.2 1999/05/12 21:31:19 asami Exp $ +# $Id: Makefile,v 1.3 1999/08/22 18:59:46 mharo Exp $ DISTNAME= rlpr-2.00 CATEGORIES= print net @@ -20,7 +20,7 @@ CONFIGURE_ARGS= --with-catgets RLPRRC= ${WRKSRC}/src/rlprrc.h post-patch: - @echo "Replacing references to /etc/rlprrc to ${PREFIX}/etc/rlprrc" + @${ECHO_MSG} "Replacing references to /etc/rlprrc to ${PREFIX}/etc/rlprrc" @test -e ${RLPRRC}.orig || ${MV} ${RLPRRC} ${RLPRRC}.orig && \ ${SED} s%/etc/%${PREFIX}/etc/% ${RLPRRC}.orig > ${RLPRRC} @for man in `${GREP} -l /etc/rlprrc ${WRKSRC}/man/*.[0-9n]`; do \ @@ -31,8 +31,8 @@ post-patch: done post-install: - @echo "Making the installed binaries suid,\ - for the remote lpds to talk to them" + @${ECHO_MSG} "Making the installed binaries suid,\ + for the remote lpds to talk to them" ${CHMOD} u+s ${PREFIX}/bin/rlpq ${PREFIX}/bin/rlpr ${PREFIX}/bin/rlprm MAN1= rlpr.1 rlpq.1 rlprm.1 diff --git a/print/teTeX-base/Makefile b/print/teTeX-base/Makefile index 54c03a5036c0..47cd832d83ff 100644 --- a/print/teTeX-base/Makefile +++ b/print/teTeX-base/Makefile @@ -3,7 +3,7 @@ # Date created: 5 December 1996 # Whom: Bernd Rosauer <br@netland.inka.de> # -# $Id: Makefile,v 1.31 1999/07/07 19:04:10 obrien Exp $ +# $Id: Makefile,v 1.32 1999/08/25 14:25:38 tg Exp $ # DISTNAME= teTeX-1.0.6 @@ -57,9 +57,9 @@ LIBWWW_PREFIX?= ${LOCALBASE} TEXMF_TREE= ${PREFIX}/share/texmf pre-configure: - @echo - @echo "It will be ok if configure will complain about a missing texmf tree!" - @echo + @${ECHO_MSG} + @${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!" + @${ECHO_MSG} pre-install: @${MKDIR} ${TEXMF_TREE} @@ -74,10 +74,10 @@ post-install: ${PREFIX}/bin/texconfig font ro > /dev/null 2>&1 @${SETENV} TEXMFMAIN=${TEXMF_TREE} \ ${PREFIX}/bin/texconfig font options appendonlydir varfonts - @echo - @echo "You may want to run texconfig to configure teTeX for your" - @echo "local environment. You will find teTeX's local documentation" - @echo "in ${TEXMF_TREE}/doc/." - @echo + @${ECHO_MSG} + @${ECHO_MSG} "You may want to run texconfig to configure teTeX for your" + @${ECHO_MSG} "local environment. You will find teTeX's local documentation" + @${ECHO_MSG} "in ${TEXMF_TREE}/doc/." + @${ECHO_MSG} .include <bsd.port.mk> diff --git a/print/teTeX/Makefile b/print/teTeX/Makefile index 54c03a5036c0..47cd832d83ff 100644 --- a/print/teTeX/Makefile +++ b/print/teTeX/Makefile @@ -3,7 +3,7 @@ # Date created: 5 December 1996 # Whom: Bernd Rosauer <br@netland.inka.de> # -# $Id: Makefile,v 1.31 1999/07/07 19:04:10 obrien Exp $ +# $Id: Makefile,v 1.32 1999/08/25 14:25:38 tg Exp $ # DISTNAME= teTeX-1.0.6 @@ -57,9 +57,9 @@ LIBWWW_PREFIX?= ${LOCALBASE} TEXMF_TREE= ${PREFIX}/share/texmf pre-configure: - @echo - @echo "It will be ok if configure will complain about a missing texmf tree!" - @echo + @${ECHO_MSG} + @${ECHO_MSG} "It will be ok if configure will complain about a missing texmf tree!" + @${ECHO_MSG} pre-install: @${MKDIR} ${TEXMF_TREE} @@ -74,10 +74,10 @@ post-install: ${PREFIX}/bin/texconfig font ro > /dev/null 2>&1 @${SETENV} TEXMFMAIN=${TEXMF_TREE} \ ${PREFIX}/bin/texconfig font options appendonlydir varfonts - @echo - @echo "You may want to run texconfig to configure teTeX for your" - @echo "local environment. You will find teTeX's local documentation" - @echo "in ${TEXMF_TREE}/doc/." - @echo + @${ECHO_MSG} + @${ECHO_MSG} "You may want to run texconfig to configure teTeX for your" + @${ECHO_MSG} "local environment. You will find teTeX's local documentation" + @${ECHO_MSG} "in ${TEXMF_TREE}/doc/." + @${ECHO_MSG} .include <bsd.port.mk> diff --git a/print/virtualpaper/Makefile b/print/virtualpaper/Makefile index a8db73f0c5bb..75e2c5998f4f 100644 --- a/print/virtualpaper/Makefile +++ b/print/virtualpaper/Makefile @@ -3,7 +3,7 @@ # Date created: 13 June 1996 # Whom: jkh # -# $Id: Makefile,v 1.10 1998/10/13 01:17:27 jseger Exp $ +# $Id: Makefile,v 1.11 1999/08/22 18:59:48 mharo Exp $ # DISTNAME= virtualpaper-1.4 @@ -28,7 +28,7 @@ do-build: @cd ${WRKSRC}/editlectern; m3build do-install: - @echo "Installing files" + @${ECHO_MSG} "Installing files" @cd ${WRKSRC}; \ ${INSTALL_PROGRAM} \ lecternclient/FreeBSD2/LecternClient \ @@ -53,7 +53,7 @@ do-install: ${CHMOD} 755 ${PREFIX}/share/virtualpaper; \ fi; \ ${INSTALL_DATA} COPYRIGHT ${PREFIX}/share/virtualpaper - @echo "Stripping programs" + @${ECHO_MSG} "Stripping programs" @cd ${PREFIX}/bin; \ strip LecternClient Lectern BuildLectern EditLectern diff --git a/russian/apache13/Makefile b/russian/apache13/Makefile index 64dce67166ce..dcd3086a9403 100644 --- a/russian/apache13/Makefile +++ b/russian/apache13/Makefile @@ -3,7 +3,7 @@ # Date created: Sat Apr 10 22:30:36 EEST 1999 # Whom: vns@delta.odessa.ua # -# $Id: Makefile,v 1.3 1999/08/22 18:59:51 mharo Exp $ +# $Id: Makefile,v 1.4 1999/08/22 23:33:20 mharo Exp $ # DISTNAME= apache_1.3.6 @@ -85,7 +85,7 @@ post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ - ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO_MSG} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi diff --git a/russian/elm.language/Makefile b/russian/elm.language/Makefile index 8af5212e1299..c6342837f4ad 100644 --- a/russian/elm.language/Makefile +++ b/russian/elm.language/Makefile @@ -2,7 +2,7 @@ # Date created: 2 Dec 1995 # Whom: ache # -# $Id: Makefile,v 1.12 1998/12/01 09:35:42 asami Exp $ +# $Id: Makefile,v 1.13 1999/08/23 04:23:38 mharo Exp $ # PKGNAME= ru-elm-2.4ME @@ -21,8 +21,8 @@ do-fetch: do-install: ${GREP} -q -i koi8 ${PREFIX}/lib/elm.rc || \ ( \ - echo "charset=KOI8-R"; \ - echo "displaycharset=KOI8-R"; \ + ${ECHO_MSG} "charset=KOI8-R"; \ + ${ECHO_MSG} "displaycharset=KOI8-R"; \ ) >> \ ${PREFIX}/lib/elm.rc diff --git a/security/crack/Makefile b/security/crack/Makefile index ae7fddfe6cf3..7064ed682c30 100644 --- a/security/crack/Makefile +++ b/security/crack/Makefile @@ -5,7 +5,7 @@ # Whom: David O'Brien <obrien@FreeBSD.org> # Whom: Yukihiro Nakai <nakai@mlab.t.u-tokyo.ac.jp> # -# $Id: Makefile,v 1.6 1997/11/26 01:42:55 obrien Exp $ +# $Id: Makefile,v 1.7 1998/10/10 03:42:59 steve Exp $ # DISTNAME= crack5.0 @@ -27,12 +27,12 @@ pre-configure: @/bin/mv -f ${WRKSRC}/src/util/elcid.c ${WRKSRC}/src/util/elcid.c.orig @${CP} -p ${WRKSRC}/src/util/elcid.c,bsd ${WRKSRC}/src/util/elcid.c .endif - @echo "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile + @${ECHO} "XLIB+= -lcrypt" >> ${WRKSRC}/src/util/Makefile pre-build: @(if [ ! -f /usr/share/dict/words ];then \ - echo "You may want to install the dict distribution into /usr/share/dict" ; \ - echo "to increase the size of the cracking dictionary." ; \ + ${ECHO_MSG} "You may want to install the dict distribution into /usr/share/dict" ; \ + ${ECHO_MSG} "to increase the size of the cracking dictionary." ; \ fi) do-build: diff --git a/security/pgp/Makefile b/security/pgp/Makefile index e92ce41410a6..4bc263ecae35 100644 --- a/security/pgp/Makefile +++ b/security/pgp/Makefile @@ -5,7 +5,7 @@ # Date created: 8 Jul 1995 # Whom: ache # -# $Id: Makefile,v 1.26 1999/08/22 23:33:24 mharo Exp $ +# $Id: Makefile,v 1.27 1999/08/23 04:23:54 mharo Exp $ # # Pick an initial default, else it doesn't get set in the INDEX. @@ -39,9 +39,9 @@ do-install: .if !defined(USA_RESIDENT) || ${USA_RESIDENT} != YES && ${USA_RESIDENT} != NO pre-fetch: - @echo - @echo You must set variable USA_RESIDENT to YES, if you are USA resident - @echo or to NO, if you aren\'t USA resident to build this package + @${ECHO_MSG} + @${ECHO_MSG} You must set variable USA_RESIDENT to YES, if you are USA resident + @${ECHO_MSG} or to NO, if you aren\'t USA resident to build this package @${FALSE} .elif defined(USA_RESIDENT) .if ${USA_RESIDENT} == YES diff --git a/security/xinetd/Makefile b/security/xinetd/Makefile index 5cef34aa961f..9f843f32837f 100644 --- a/security/xinetd/Makefile +++ b/security/xinetd/Makefile @@ -3,7 +3,7 @@ # Date created: 28 June 1996 # Whom: markm # -# $Id: Makefile,v 1.8 1999/08/14 08:41:15 vanilla Exp $ +# $Id: Makefile,v 1.9 1999/08/22 18:59:59 mharo Exp $ # DISTNAME= xinetd-2.1.8.6b6 @@ -24,7 +24,7 @@ post-install: @if [ ! -f ${PREFIX}/etc/rc.d/xinetd.sh ]; then \ ${ECHO} "Install ${PREFIX}/etc/rc.d/xinetd.sh startup file."; \ ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/xinetd.sh; \ - ${ECHO} "[ -x ${PREFIX}/sbin/xinetd ] && ${PREFIX}/sbin/xinetd && echo -n ' xinetd'" >> ${PREFIX}/etc/rc.d/xinetd.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/xinetd ] && ${PREFIX}/sbin/xinetd && ${ECHO} -n ' xinetd'" >> ${PREFIX}/etc/rc.d/xinetd.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/xinetd.sh; \ fi strip ${PREFIX}/sbin/xinetd diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 211c8940b7a2..5bc80cba4ba5 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.35 1999/05/28 05:16:08 ache Exp $ +# $Id: Makefile,v 1.36 1999/06/05 22:31:47 mharo Exp $ # DISTNAME= bash-2.03 @@ -23,7 +23,7 @@ MAN1= bash.1 bashbug.1 post-install: ${CP} /etc/shells /etc/shells.bak - (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells + (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells ${RM} /etc/shells.bak .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/bash diff --git a/shells/bash2/Makefile b/shells/bash2/Makefile index 211c8940b7a2..5bc80cba4ba5 100644 --- a/shells/bash2/Makefile +++ b/shells/bash2/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.35 1999/05/28 05:16:08 ache Exp $ +# $Id: Makefile,v 1.36 1999/06/05 22:31:47 mharo Exp $ # DISTNAME= bash-2.03 @@ -23,7 +23,7 @@ MAN1= bash.1 bashbug.1 post-install: ${CP} /etc/shells /etc/shells.bak - (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells + (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells ${RM} /etc/shells.bak .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/bash diff --git a/shells/bash3/Makefile b/shells/bash3/Makefile index 211c8940b7a2..5bc80cba4ba5 100644 --- a/shells/bash3/Makefile +++ b/shells/bash3/Makefile @@ -3,7 +3,7 @@ # Date created: 21 August 1994 # Whom: jkh # -# $Id: Makefile,v 1.35 1999/05/28 05:16:08 ache Exp $ +# $Id: Makefile,v 1.36 1999/06/05 22:31:47 mharo Exp $ # DISTNAME= bash-2.03 @@ -23,7 +23,7 @@ MAN1= bash.1 bashbug.1 post-install: ${CP} /etc/shells /etc/shells.bak - (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; echo ${PREFIX}/bin/bash) >/etc/shells + (${GREP} -v ${PREFIX}/bin/bash /etc/shells.bak; ${ECHO} ${PREFIX}/bin/bash) >/etc/shells ${RM} /etc/shells.bak .if !defined(NOPORTDOCS) ${MKDIR} ${PREFIX}/share/doc/bash diff --git a/sysutils/lsof/Makefile b/sysutils/lsof/Makefile index 55e66245431a..ec511127585c 100644 --- a/sysutils/lsof/Makefile +++ b/sysutils/lsof/Makefile @@ -4,7 +4,7 @@ # Date created: Sat July 20, 1996 # Whom: David O'Brien (obrien@FreeBSD.org) # -# $Id: Makefile,v 1.45 1999/08/22 19:00:04 mharo Exp $ +# $Id: Makefile,v 1.46 1999/08/23 04:23:43 mharo Exp $ # DISTNAME= lsof_4.45_W @@ -39,14 +39,14 @@ post-extract: EXPMD5=`${GREP} MD5 README.${SRCBALL_NAME} | sed 's/^[ ]*//'` ; \ CALCMD5=`${MD5} ${SRCBALL_NAME}.tar` ; \ if [ "$${EXPMD5}"X != "$${CALCMD5}"X ]; then \ - echo "Expected and calculated MD5 signatures don't agree." ; \ - echo "($$EXPMD5 != $$CALCMD5)" ; \ + ${ECHO} "Expected and calculated MD5 signatures don't agree." ; \ + ${ECHO} "($$EXPMD5 != $$CALCMD5)" ; \ exit 1 ; \ fi ; \ ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS:S/z//} ${SRCBALL_NAME}.tar \ ${EXTRACT_AFTER_ARGS} \ ) - @( cd ${WRKSRC} ; echo "y" | ./Inventory || exit 1 ) + @( cd ${WRKSRC} ; ${ECHO} "y" | ./Inventory || exit 1 ) #pre-patch: # @${ECHO_MSG} "===> Applying distribution patches for ${PKGNAME}" diff --git a/textproc/docbook-241/Makefile b/textproc/docbook-241/Makefile index 8c1834e12b87..73353a042823 100644 --- a/textproc/docbook-241/Makefile +++ b/textproc/docbook-241/Makefile @@ -5,7 +5,7 @@ # # Based heavily on work by jfieber. # -# $Id: Makefile,v 1.2 1999/05/05 17:40:15 nik Exp $ +# $Id: Makefile,v 1.3 1999/08/22 19:00:09 mharo Exp $ # DISTNAME= docbook-241 @@ -31,7 +31,7 @@ pre-install: do-install: @zcat ${DISTDIR}/docbk241.tar.Z |(cd ${INSTDIR}/2.4.1; pax -r) @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/2.4.1/catalog - @echo "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/2.4.1/catalog + @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/2.4.1/catalog @${CHMOD} ${SHAREMODE} ${INSTDIR}/2.4.1/* @${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${INSTDIR} diff --git a/textproc/docbook-300/Makefile b/textproc/docbook-300/Makefile index 7ad92568afac..c72e51e589ff 100644 --- a/textproc/docbook-300/Makefile +++ b/textproc/docbook-300/Makefile @@ -5,7 +5,7 @@ # # Based heavily on work by jfieber # -# $Id: Makefile,v 1.2 1999/05/05 17:40:23 nik Exp $ +# $Id: Makefile,v 1.3 1999/08/22 19:00:10 mharo Exp $ # DISTNAME= docbook-3.0 @@ -31,7 +31,7 @@ pre-install: do-install: @zcat ${DISTDIR}/docbk30.tar.Z |(cd ${INSTDIR}/3.0; pax -r) @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.0/catalog - @echo "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog + @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.0/catalog @${CHMOD} ${SHAREMODE} ${INSTDIR}/3.0/* @${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${INSTDIR} diff --git a/textproc/docbook-310/Makefile b/textproc/docbook-310/Makefile index 1cb16ed07cef..2d4f5fe6c5a9 100644 --- a/textproc/docbook-310/Makefile +++ b/textproc/docbook-310/Makefile @@ -5,7 +5,7 @@ # # Based heavily on work by jfieber # -# $Id: Makefile,v 1.4 1999/05/05 17:40:24 nik Exp $ +# $Id: Makefile,v 1.5 1999/08/22 19:00:11 mharo Exp $ # DISTNAME= docbk31 @@ -32,7 +32,7 @@ pre-install: do-install: @unzip -a -q -o ${DISTDIR}/${DISTFILES} -d ${INSTDIR}/3.1 @${INSTALL_DATA} ${FILESDIR}/catalog ${INSTDIR}/3.1/catalog - @echo "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog + @${ECHO} "CATALOG \"${ISOCAT}\"" >> ${INSTDIR}/3.1/catalog @${CHMOD} ${SHAREMODE} ${INSTDIR}/3.1/* @${CHOWN} -R ${SHAREOWN}.${SHAREGRP} ${INSTDIR} diff --git a/textproc/ispell/Makefile b/textproc/ispell/Makefile index aa7691902c9d..481fe6c44e06 100644 --- a/textproc/ispell/Makefile +++ b/textproc/ispell/Makefile @@ -4,7 +4,7 @@ # Date created: 6 November 1994 # Whom: jmz # -# $Id: Makefile,v 1.28 1999/07/04 18:21:51 obrien Exp $ +# $Id: Makefile,v 1.29 1999/08/13 00:13:14 jmz Exp $ # DISTNAME= ispell-3.1 @@ -27,10 +27,10 @@ MLINKS= ispell.1 buildhash.1 ispell.1 findaffix.1 ispell.1 munchlist.1\ .if !defined(ISPELL_FR) .if (make(patch) || make(configure) || make(build) || make (install)) .BEGIN: - @echo '*********************************************************' - @echo '* Note that you can build a french or british version *' - @echo '* by typing "make french" or "make british" *' - @echo '*********************************************************' + @${ECHO_MSG} '*********************************************************' + @${ECHO_MSG} '* Note that you can build a french or british version *' + @${ECHO_MSG} '* by typing "make french" or "make british" *' + @${ECHO_MSG} '*********************************************************' .endif .else EXTRA_DICT= francais-IREQ-1.4.tar.gz @@ -40,28 +40,28 @@ DISTFILES+= ${EXTRA_DICT} pre-extract: .if !defined(LANG) - @echo '******************************************************' - @echo '* Note that you can build a british version by *' - @echo '* typing "make british" following a "make clean" *' - @echo '******************************************************' + @${ECHO_MSG} '******************************************************' + @${ECHO_MSG} '* Note that you can build a british version by *' + @${ECHO_MSG} '* typing "make british" following a "make clean" *' + @${ECHO_MSG} '******************************************************' .endif pre-configure: .if defined(EXTRA_DICT) - @echo ${EXTRA_DICT} > ${WRKDIR}/extra_dict + @${ECHO} ${EXTRA_DICT} > ${WRKDIR}/extra_dict .else - @echo -n + @${ECHO} -n .endif post-configure: - @echo "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h + @${ECHO} "#define CFLAGS \"${CFLAGS}\"" >> ${WRKSRC}/local.h british: - @echo "Okay, making a british version of ispell...." + @${ECHO_MSG} "Okay, making a british version of ispell...." @${MAKE} ${.MAKEFLAGS} LANG=british all french: - @echo "Okay, making a french/english version of ispell...." + @${ECHO_MSG} "Okay, making a french/english version of ispell...." @${MAKE} ${.MAKEFLAGS} ISPELL_FR=yes pre-install: diff --git a/textproc/nicetext/Makefile b/textproc/nicetext/Makefile index 3537640929ef..a7c91f8dd9fb 100644 --- a/textproc/nicetext/Makefile +++ b/textproc/nicetext/Makefile @@ -3,7 +3,7 @@ # Date created: 20 February 1998 # Whom: Mark Chapman <markc@ctgi.net> # -# $Id: Makefile,v 1.1.1.1 1999/05/03 02:40:33 steve Exp $ +# $Id: Makefile,v 1.2 1999/08/22 19:00:20 mharo Exp $ DISTNAME= nicetext-0.9 CATEGORIES= textproc @@ -22,8 +22,8 @@ PROGRAMS= bitcp dct2mstr expgram genmodel gramtest impkimmo impmsc \ sortdct txt2dct post-install: - @echo "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd - @echo ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd + @${ECHO} "#!/bin/sh" > ${WRKSRC}/bin/qstart-nttpd + @${ECHO} ${PREFIX}/bin/"nttpd -b " ${PREFIX}/share/examples/nicetext/database >> ${WRKSRC}/bin/qstart-nttpd ${CHMOD} a+rx ${WRKSRC}/bin/qstart-nttpd ${INSTALL_SCRIPT} ${WRKSRC}/bin/qstart-nttpd ${PREFIX}/bin/ .for f in ${MAN1} diff --git a/textproc/yodl/Makefile b/textproc/yodl/Makefile index d2339fc17aee..5d6ba121e62e 100644 --- a/textproc/yodl/Makefile +++ b/textproc/yodl/Makefile @@ -3,7 +3,7 @@ # Date created: 22 Oct 1997 # Whom: Donald Burr <dburr@FreeBSD.ORG> # -# $Id: Makefile,v 1.1.1.1 1998/07/20 23:55:33 dburr Exp $ +# $Id: Makefile,v 1.2 1999/01/10 10:05:02 simokawa Exp $ # DISTNAME= yodl-1.22 @@ -35,7 +35,7 @@ do-build: # this weird contortion is because the YODL makefile is broken # trust me, it works. do-install: - @echo "*** NOTE: any errors from make can be safely ignored." + @${ECHO_MSG} "*** NOTE: any errors from make can be safely ignored." (cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX} install) -(cd ${WRKSRC} && ${GMAKE} PREFIX=${PREFIX} manpages) (cd ${WRKSRC}/manpages && ${GMAKE} PREFIX=${PREFIX} manpages) diff --git a/www/apache13/Makefile b/www/apache13/Makefile index 35c8ae114e83..864f40bb1e51 100644 --- a/www/apache13/Makefile +++ b/www/apache13/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $ +# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $ # DISTNAME= apache_1.3.6 @@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ - echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi diff --git a/www/apache2/Makefile b/www/apache2/Makefile index 35c8ae114e83..864f40bb1e51 100644 --- a/www/apache2/Makefile +++ b/www/apache2/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $ +# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $ # DISTNAME= apache_1.3.6 @@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ - echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi diff --git a/www/apache20/Makefile b/www/apache20/Makefile index 35c8ae114e83..864f40bb1e51 100644 --- a/www/apache20/Makefile +++ b/www/apache20/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $ +# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $ # DISTNAME= apache_1.3.6 @@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ - echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi diff --git a/www/apache21/Makefile b/www/apache21/Makefile index 35c8ae114e83..864f40bb1e51 100644 --- a/www/apache21/Makefile +++ b/www/apache21/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $ +# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $ # DISTNAME= apache_1.3.6 @@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ - echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi diff --git a/www/apache22/Makefile b/www/apache22/Makefile index 35c8ae114e83..864f40bb1e51 100644 --- a/www/apache22/Makefile +++ b/www/apache22/Makefile @@ -3,7 +3,7 @@ # Date created: Fri Aug 25 16:42:36 CDT 1995 # Whom: ache@nagual.pp.ru # -# $Id: Makefile,v 1.71 1999/06/25 21:53:06 sada Exp $ +# $Id: Makefile,v 1.72 1999/08/22 19:00:30 mharo Exp $ # DISTNAME= apache_1.3.6 @@ -69,9 +69,9 @@ MAN8= ab.8 apachectl.8 apxs.8 httpd.8 logresolve.8 rotatelogs.8 post-install: @if [ ! -f ${PREFIX}/etc/rc.d/apache.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ - echo "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && echo -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/apache.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/apache.sh; \ + ${ECHO} "[ -x ${PREFIX}/sbin/apachectl ] && ${PREFIX}/sbin/apachectl start > /dev/null && ${ECHO} -n ' apache'" >> ${PREFIX}/etc/rc.d/apache.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/apache.sh; \ fi diff --git a/www/g-gcl/Makefile b/www/g-gcl/Makefile index b4857556cdf5..d57b6e2aca87 100644 --- a/www/g-gcl/Makefile +++ b/www/g-gcl/Makefile @@ -3,7 +3,7 @@ # Date created: 21 Jun 1999 # Whom: G. Adam Stanislav <adam@whizkidtech.net> # -# $Id$ +# $Id: Makefile,v 1.1.1.1 1999/06/22 06:23:45 cpiazza Exp $ # DISTNAME= g-gcl-1.10 @@ -31,10 +31,6 @@ do-install: ${INSTALL_SCRIPT} ${WRKSRC}/space.gcl.sample ${PREFIX}/share/examples/gracula ${INSTALL_SCRIPT} ${WRKSRC}/sec2000.gcl.sample ${PREFIX}/share/examples/gracula ${INSTALL_SCRIPT} ${WRKSRC}/tri.gcl.sample ${PREFIX}/share/examples/gracula - @echo - @echo " Sample scripts installed in the" - @echo " ${PREFIX}/share/examples/gracula/" - @echo " directory." - @echo + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/g-gcl/pkg-message b/www/g-gcl/pkg-message new file mode 100644 index 000000000000..67c534f70dd8 --- /dev/null +++ b/www/g-gcl/pkg-message @@ -0,0 +1,5 @@ + + Sample scripts installed in the + ${PREFIX}/share/examples/gracula/ + directory. + diff --git a/www/gn/Makefile b/www/gn/Makefile index 9817eb605668..f9c5e1effd46 100644 --- a/www/gn/Makefile +++ b/www/gn/Makefile @@ -3,7 +3,7 @@ # Date created: 20 Sep 1994 # Whom: adam # -# $Id: Makefile,v 1.20 1999/06/26 21:56:51 mharo Exp $ +# $Id: Makefile,v 1.21 1999/08/22 23:33:28 mharo Exp $ # DISTNAME= gn-2.24 @@ -35,18 +35,18 @@ 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} 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} mv gnroot/menu gnroot/menu.old; \ mv gnroot/menu gnroot/menu.old; \ fi; \ tar -cf - -C ${WRKSRC} gnroot libexec bin etc | tar xpf - && \ (cd gnroot; ${WRKSRC}/bin/mkcache -r); \ ${AWK} '$$1 ~ /#*gopher/ && $$6 == "${PREFIX}/libexec/gn" { exit 1 }' \ - ${INETD_CONF} || { \ echo '#'gopher${CONF} >>${INETD_CONF} + ${INETD_CONF} || { \ ${ECHO} '#'gopher${CONF} >>${INETD_CONF} } .include <bsd.port.mk> diff --git a/www/mapedit/Makefile b/www/mapedit/Makefile index 3a6b0e31e18c..f438f815487a 100644 --- a/www/mapedit/Makefile +++ b/www/mapedit/Makefile @@ -3,7 +3,7 @@ # Date created: Fr 4 Apr 1997 17:45:31 MET DST # Whom: Andreas Klemm <andreas@klemm.gtn.com> # -# $Id: Makefile,v 1.10 1999/06/28 19:29:03 billf Exp $ +# $Id: Makefile,v 1.11 1999/08/22 23:33:30 mharo Exp $ # DISTNAME= mapedit2.3 @@ -19,7 +19,7 @@ NO_BUILD= yes pre-install: @${CAT} ${WRKSRC}/README.TXT - @echo "" + @${ECHO_MSG} "" do-install: ${MKDIR} ${PREFIX}/lib/mapedit diff --git a/www/marc-search/Makefile b/www/marc-search/Makefile index 860a3b9736cd..d3cdd19c328e 100644 --- a/www/marc-search/Makefile +++ b/www/marc-search/Makefile @@ -3,7 +3,7 @@ # Date created: 25 November 1998 # Whom: Sheldon Hearn <axl@iafrica.com> # -# $Id: Makefile,v 1.2 1999/06/21 11:07:15 sheldonh Exp $ +# $Id: Makefile,v 1.3 1999/08/23 04:23:55 mharo Exp $ # DISTNAME= marc-search.4.3 @@ -31,8 +31,8 @@ MARC_LIBS= Marc.pm Marc/Form.pm Marc/Search.pm do-configure: .if !defined(PUB_HTML) || !defined(DOCROOT) || !defined(SCRIPTDIR) - @echo "You must tailor the port Makefile and set PUB_HTML, DOCROOT," - @echo "and SCRIPTDIR to match your site configuration." + @${ECHO_MSG} "You must tailor the port Makefile and set PUB_HTML, DOCROOT," + @${ECHO_MSG} "and SCRIPTDIR to match your site configuration." @${FALSE} .else ${CP} ${FILESDIR}/marc-search.conf ${WRKSRC}/ diff --git a/www/roxen/Makefile b/www/roxen/Makefile index f68df679a1e8..9a8b21cf11cc 100644 --- a/www/roxen/Makefile +++ b/www/roxen/Makefile @@ -3,7 +3,7 @@ # Date created: 26 February 1999 # Whom: Kai Voigt (k@123.org) # -# $Id: Makefile,v 1.1.1.1 1999/05/04 16:14:19 flathill Exp $ +# $Id: Makefile,v 1.2 1999/08/22 23:33:31 mharo Exp $ # DISTNAME= Roxen_1.2final-int @@ -23,16 +23,6 @@ pre-build: post-install: @${CP} ${FILESDIR}/roxen.sh ${PREFIX}/etc/rc.d/ - @echo "Installation of Roxen Challenger finished!" - @echo "" - @echo "Now perform the following steps to initialize" - @echo "the webserver." - @echo "" - @echo "% cd ${PREFIX}/roxen/server/" - @echo "% ./install" - @echo "" - @echo "Then follow the instructions. For further" - @echo "documentation read http://roxen.com/documentation/" - @echo "" + @${CAT} ${PKGMESSAGE} .include <bsd.port.mk> diff --git a/www/squid/Makefile b/www/squid/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid/Makefile +++ b/www/squid/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid22/Makefile b/www/squid22/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid22/Makefile +++ b/www/squid22/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid23/Makefile b/www/squid23/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid23/Makefile +++ b/www/squid23/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid24/Makefile b/www/squid24/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid24/Makefile +++ b/www/squid24/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid25/Makefile b/www/squid25/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid25/Makefile +++ b/www/squid25/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid26/Makefile b/www/squid26/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid26/Makefile +++ b/www/squid26/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid27/Makefile b/www/squid27/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid27/Makefile +++ b/www/squid27/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid30/Makefile b/www/squid30/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid30/Makefile +++ b/www/squid30/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squid31/Makefile b/www/squid31/Makefile index 774a81d2b7c5..76d84cd3adf7 100644 --- a/www/squid31/Makefile +++ b/www/squid31/Makefile @@ -3,7 +3,7 @@ # Date created: Thu Nov 7 00:53:18 WST 1996 # Whom: Peter Wemm <peter@freebsd.org> # -# $Id: Makefile,v 1.58 1999/08/08 13:53:34 peter Exp $ +# $Id: Makefile,v 1.59 1999/08/22 19:00:55 mharo Exp $ # DISTNAME= squid-2.2.STABLE4 @@ -94,11 +94,11 @@ post-install: ${MKDIR} ${PREFIX}/squid/logs ${MKDIR} ${PREFIX}/squid/cache @if [ ! -f ${PREFIX}/etc/rc.d/squid.sh ]; then \ - echo "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ - echo "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ - echo "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; echo -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ - echo "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "Installing ${PREFIX}/etc/rc.d/squid.sh startup file."; \ + ${ECHO} "#!/bin/sh" > ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "if [ -x ${PREFIX}/sbin/RunCache -a -f ${PREFIX}/etc/squid/squid.conf ]; then" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} " (cd /tmp; ${PREFIX}/sbin/RunCache >/dev/null 2>&1 &) ; ${ECHO} -n ' squid'" >> ${PREFIX}/etc/rc.d/squid.sh; \ + ${ECHO} "fi" >> ${PREFIX}/etc/rc.d/squid.sh; \ ${CHMOD} 751 ${PREFIX}/etc/rc.d/squid.sh; \ fi diff --git a/www/squirm/Makefile b/www/squirm/Makefile index caa30ac29fa5..b76c2ad7614b 100644 --- a/www/squirm/Makefile +++ b/www/squirm/Makefile @@ -3,7 +3,7 @@ # Date created: 24 May 1999 # Whom: Maxim Sobolev <sobomax@altavista.net> # -# $Id: Makefile,v 1.2 1999/06/30 19:27:17 steve Exp $ +# $Id: Makefile,v 1.3 1999/08/23 04:23:59 mharo Exp $ # DISTNAME= squirm-1.0betaB @@ -26,26 +26,26 @@ post-patch: pre-install: .if defined(SQUID_UID) && defined(SQUID_GID) .if (${SQUID_UID} == "nobody") || (${SQUID_GID} == "nogroup") - @echo - @echo 'WARNING! You are going to install squirm files with either nobody owner or' - @echo 'nogroup group, which may be insecure.' - @echo + @${ECHO_MSG} + @${ECHO_MSG} 'WARNING! You are going to install squirm files with either nobody owner or' + @${ECHO_MSG} 'nogroup group, which may be insecure.' + @${ECHO_MSG} .endif .else - @echo - @echo 'You should set SQUID_UID and SQUID_GID variables to your squid effective' - @echo 'user/group. For example: SQUID_UID=squid SQUID_GID=squid.' - @echo + @${ECHO_MSG} + @${ECHO_MSG} 'You should set SQUID_UID and SQUID_GID variables to your squid effective' + @${ECHO_MSG} 'user/group. For example: SQUID_UID=squid SQUID_GID=squid.' + @${ECHO_MSG} @${FALSE} .endif post-install: - @echo - @echo ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' - @echo ' You have to manually add "redirect_program ${PREFIX}/bin/squirm"' - @echo ' into your squid.conf file.' - @echo ' For help on configuring squirm try http://www.senet.com.au/squirm/' - @echo ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' - @echo + @${ECHO_MSG} + @${ECHO_MSG} ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' + @${ECHO_MSG} ' You have to manually add "redirect_program ${PREFIX}/bin/squirm"' + @${ECHO_MSG} ' into your squid.conf file.' + @${ECHO_MSG} ' For help on configuring squirm try http://www.senet.com.au/squirm/' + @${ECHO_MSG} ' +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++' + @${ECHO_MSG} .include <bsd.port.mk> diff --git a/www/tidy-devel/Makefile b/www/tidy-devel/Makefile index bd7f43251da2..6795964fbcf9 100644 --- a/www/tidy-devel/Makefile +++ b/www/tidy-devel/Makefile @@ -3,7 +3,7 @@ # Date created: 27 Oct 1998 # Whom: Abel Chow <achow@transoft.net> # -# $Id: Makefile,v 1.8 1999/07/06 01:07:35 cpiazza Exp $ +# $Id: Makefile,v 1.9 1999/07/11 02:28:34 cpiazza Exp $ # DISTNAME= tidy7jul99 @@ -21,7 +21,7 @@ DOCFILES= Overview.html tidy.gif release-notes.html grid.gif config.txt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy .if !defined(NOPORTDOCS) - @echo "===> Installing documentation for ${PKGNAME}" + @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${MKDIR} ${PREFIX}/share/doc/tidy .for docfile in ${DOCFILES} @${INSTALL_DATA} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy diff --git a/www/tidy/Makefile b/www/tidy/Makefile index bd7f43251da2..6795964fbcf9 100644 --- a/www/tidy/Makefile +++ b/www/tidy/Makefile @@ -3,7 +3,7 @@ # Date created: 27 Oct 1998 # Whom: Abel Chow <achow@transoft.net> # -# $Id: Makefile,v 1.8 1999/07/06 01:07:35 cpiazza Exp $ +# $Id: Makefile,v 1.9 1999/07/11 02:28:34 cpiazza Exp $ # DISTNAME= tidy7jul99 @@ -21,7 +21,7 @@ DOCFILES= Overview.html tidy.gif release-notes.html grid.gif config.txt do-install: ${INSTALL_PROGRAM} ${WRKSRC}/tidy ${PREFIX}/bin/tidy .if !defined(NOPORTDOCS) - @echo "===> Installing documentation for ${PKGNAME}" + @${ECHO_MSG} "===> Installing documentation for ${PKGNAME}" @${MKDIR} ${PREFIX}/share/doc/tidy .for docfile in ${DOCFILES} @${INSTALL_DATA} ${WRKSRC}/${docfile} ${PREFIX}/share/doc/tidy diff --git a/www/w3c-httpd/Makefile b/www/w3c-httpd/Makefile index b4488be8d30f..e56094cec7c5 100644 --- a/www/w3c-httpd/Makefile +++ b/www/w3c-httpd/Makefile @@ -3,7 +3,7 @@ # Date created: 29 October 1994 # Whom: pst (orig) # -# $Id: Makefile,v 1.20 1999/05/10 04:05:14 steve Exp $ +# $Id: Makefile,v 1.21 1999/05/10 20:00:22 steve Exp $ # DISTNAME= w3c-httpd-3.0A @@ -21,12 +21,12 @@ MAKE_ENV+= PORTSDIR=${PORTSDIR} pre-configure: .if !defined(MD5_PW) - @echo "" - @echo "Defaulting to DES encrypted passwords." - @echo "Set the environment variable MD5_PW if you want MD5 encrypted passwords." - @echo "" + @${ECHO_MSG} "" + @${ECHO_MSG} "Defaulting to DES encrypted passwords." + @${ECHO_MSG} "Set the environment variable MD5_PW if you want MD5 encrypted passwords." + @${ECHO_MSG} "" .else - @echo "CFLAGS += -DMD5_PW" >> ${WRKDIR}/All/${OSNAME}/Makefile.include + @${ECHO} "CFLAGS += -DMD5_PW" >> ${WRKDIR}/All/${OSNAME}/Makefile.include .endif do-install: diff --git a/www/wn/Makefile b/www/wn/Makefile index c1305e562094..c7a37e2a5136 100644 --- a/www/wn/Makefile +++ b/www/wn/Makefile @@ -3,7 +3,7 @@ # Date created: 4 May 1995 # Whom: adam # -# $Id: Makefile,v 1.28 1998/12/02 09:48:36 obrien Exp $ +# $Id: Makefile,v 1.29 1999/08/22 23:33:35 mharo Exp $ # DISTNAME= wn-1.18.6 @@ -31,7 +31,7 @@ post-install: @install -c -o bin -g bin ${WRKSRC}/bin/authwn ${PREFIX}/wn/bin @if [ -s ${PREFIX}/etc/wn_mime.types ]; then \ cmp -s ${PREFIX}/etc/wn_mime.types ${WRKSRC}/lib/mime.types || { \ - echo Warning: new mime.types installed as ${PREFIX}/etc/wn_mime.types-dist; \ + ${ECHO_MSG} Warning: new mime.types installed as ${PREFIX}/etc/wn_mime.types-dist; \ install -c -o bin -g bin -m 644 ${WRKSRC}/lib/mime.types \ ${PREFIX}/etc/wn_mime.types-dist; } \ else \ @@ -40,7 +40,7 @@ post-install: fi @if [ -s ${PREFIX}/wn/index ]; then \ cmp -s ${PREFIX}/wn/index ${WRKDIR}/index || { \ - echo Warning: new index installed as ${PREFIX}/wn/index-dist; \ + ${ECHO_MSG} Warning: new index installed as ${PREFIX}/wn/index-dist; \ install -c -o bin -g bin -m 644 ${WRKDIR}/index ${PREFIX}/wn/index-dist; } \ else \ install -c -o bin -g bin -m 644 ${WRKDIR}/index ${PREFIX}/wn; \ diff --git a/x11-toolkits/plib/Makefile b/x11-toolkits/plib/Makefile index 1aaf20a95525..ecd7a5ab241a 100644 --- a/x11-toolkits/plib/Makefile +++ b/x11-toolkits/plib/Makefile @@ -3,7 +3,7 @@ # Date created: 26 June 1999 # Whom: Brian Buchanan <brian@CSUA.Berkeley.EDU> # -# $Id: Makefile,v 1.3 1999/08/17 19:37:11 cpiazza Exp $ +# $Id: Makefile,v 1.4 1999/08/22 19:46:45 cpiazza Exp $ # DISTNAME= plib-1.0.12a @@ -31,7 +31,7 @@ MAN1= calibrate.1 pre-build: @(cd ${WRKDIR}/calibrate-0.0.1; ${MAKE}) - @echo "${PREFIX}" + @${ECHO_MSG} "${PREFIX}" pre-install: @(cd ${WRKDIR}/calibrate-0.0.1; ${MAKE} PREFIX=${PREFIX} install) diff --git a/x11-toolkits/v/Makefile b/x11-toolkits/v/Makefile index 70b6aee11d25..a26a6b87e3d2 100644 --- a/x11-toolkits/v/Makefile +++ b/x11-toolkits/v/Makefile @@ -3,7 +3,7 @@ # Date created: 8 Feb 1998 # Whom: Donald Burr <dburr@FreeBSD.ORG> # -# $Id: Makefile,v 1.10 1999/06/22 17:30:06 steve Exp $ +# $Id: Makefile,v 1.11 1999/08/22 19:01:01 mharo Exp $ # DISTNAME= v-1.19 @@ -32,14 +32,14 @@ pre-build: post-install: ${RANLIB} ${PREFIX}/lib/libV.a .ifdef NOPORTDOCS - @echo "==> Extra documentation WILL NOT be installed." + @${ECHO_MSG} "==> Extra documentation WILL NOT be installed." .else - @echo "==> Installing extra docs under ${PREFIX}/share/doc/v..." + @${ECHO_MSG} "==> Installing extra docs under ${PREFIX}/share/doc/v..." ${MKDIR} ${PREFIX}/share/doc/v ${CP} -R ${WRKSRC}/doc/* ${PREFIX}/share/doc/v find ${PREFIX}/share/doc/v -type d -exec ${CHMOD} 755 {} \; find ${PREFIX}/share/doc/v -type f -exec ${CHMOD} 644 {} \; - @echo "==> Extra docs installed. Note, you will need *tex to read 'em." + @${ECHO_MSG} "==> Extra docs installed. Note, you will need *tex to read 'em." .endif @${CAT} ${PKGDIR}/MESSAGE diff --git a/x11-wm/afterstep/Makefile b/x11-wm/afterstep/Makefile index da36a21157f8..4d320449c178 100644 --- a/x11-wm/afterstep/Makefile +++ b/x11-wm/afterstep/Makefile @@ -3,7 +3,7 @@ # Date created: October 29th 1996 # Whom: jfitz@FreeBSD.ORG # -# $Id: Makefile,v 1.27 1999/01/18 03:38:24 billf Exp $ +# $Id: Makefile,v 1.28 1999/02/21 21:51:00 billf Exp $ # DISTNAME= AfterStep-1.0 @@ -48,9 +48,9 @@ post-install: ${INSTALL_DATA} ${WRKSRC}/icons/*.xpm ${PREFIX}/include/X11/pixmaps/ .else .if !defined(BATCH) - @echo "===> Note: to use the hi-color icons," - @echo " reinstall this port with -DUSE_HICOLOR_ICONS" - @echo " defined" + @${ECHO_MSG} "===> Note: to use the hi-color icons," + @${ECHO_MSG} " reinstall this port with -DUSE_HICOLOR_ICONS" + @${ECHO_MSG} " defined" .endif @for file in AFstep.xpm penguin.xpm monitor_bsd.xpm; do \ ${CP} ${FILESDIR}/$$file ${WRKSRC}/icons/8bit; \ |