Date: Mon, 6 Dec 2004 09:26:28 +0100 (CET) From: Volker Stolz <vs@FreeBSD.org> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/74758: [patch] bsd.port.mk: Replace '>>' with '=>' Message-ID: <200412060826.iB68QSsp096736@i2.informatik.rwth-aachen.de> Resent-Message-ID: <200412060830.iB68USMq007426@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 74758 >Category: ports >Synopsis: [patch] bsd.port.mk: Replace '>>' with '=>' >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Mon Dec 06 08:30:28 GMT 2004 >Closed-Date: >Last-Modified: >Originator: Volker Stolz >Release: FreeBSD 4.10-STABLE i386 >Organization: Lehrstuhl für Informatik II; RWTH Aachen Universität >Environment: System: FreeBSD menelaos.informatik.rwth-aachen.de 4.10-STABLE FreeBSD 4.10-STABLE #20: Thu Oct 28 13:24:05 CEST 2004 root@menelaos.informatik.rwth-aachen.de:/usr/obj/usr/src/sys/MENELAOS i386 >Description: As proposed on the EuroBSD ports BOF, here's the patch which sanitizes the intermittent output by the build infrastructure so that cutting and pasting from it no longer interferes with GNATS-tags. NetBSD's pkgsrc uses the same convention, btw. >How-To-Repeat: Check http://www.freebsd.org/cgi/query-pr.cgi?pr=71684, see how most of the output ended up in the Unformatted-section. >Fix: --- bsd.port.mk.diff begins here --- Index: bsd.port.mk =================================================================== RCS file: /usr/freebsdcvs/cvs-ports/ports/Mk/bsd.port.mk,v retrieving revision 1.500 diff -u -r1.500 bsd.port.mk --- bsd.port.mk 19 Nov 2004 13:45:07 -0000 1.500 +++ bsd.port.mk 30 Nov 2004 15:54:34 -0000 @@ -2875,13 +2879,13 @@ vlist=`${_EXTRACT_AUDITFILE} | ${AWK} -F\| ' \ /^[^#]/ { \ if (!system("${PKG_VERSION} -T \"${PKGNAME}\" \"" $$1 "\"")) \ - print ">> " $$3 ".\n Reference: <" $$2 ">" \ + print "=> " $$3 ".\n Reference: <" $$2 ">" \ } \ '`; \ if [ -n "$$vlist" ]; then \ ${ECHO_MSG} "===> ${PKGNAME} has known vulnerabilities:"; \ ${ECHO_MSG} "$$vlist"; \ - ${ECHO_MSG} ">> Please update your ports tree and try again."; \ + ${ECHO_MSG} "=> Please update your ports tree and try again."; \ exit 1; \ fi; \ else \ @@ -2913,22 +2917,22 @@ DIR=${DIST_SUBDIR}; \ pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ if [ -L $$file -o -L $$filebasename ]; then \ - ${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} ">> Please correct this problem and try again."; \ + ${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \ + ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ + ${ECHO_MSG} "=> Please correct this problem and try again."; \ exit 1; \ fi ; \ if [ -f ${MD5_FILE} -a "x${NO_CHECKSUM}" = "x" ]; then \ if ! ${GREP} -q "^MD5 ($$pattern)" ${MD5_FILE}; then \ - ${ECHO_MSG} ">> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \ - ${ECHO_MSG} ">> Either ${MD5_FILE} is out of date, or"; \ - ${ECHO_MSG} ">> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \ + ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is not in ${MD5_FILE}."; \ + ${ECHO_MSG} "=> Either ${MD5_FILE} is out of date, or"; \ + ${ECHO_MSG} "=> $${DIR:+$$DIR/}$$file is spelled incorrectly."; \ exit 1; \ fi; \ fi; \ - ${ECHO_MSG} ">> $$file doesn't seem to exist in ${_DISTDIR}."; \ + ${ECHO_MSG} "=> $$file doesn't seem to exist in ${_DISTDIR}."; \ if [ ! -w ${DISTDIR} ]; then \ - ${ECHO_MSG} ">> ${DISTDIR} is not writable by you; cannot fetch."; \ + ${ECHO_MSG} "=> ${DISTDIR} is not writable by you; cannot fetch."; \ exit 1; \ fi; \ if [ ! -z "$$select" ] ; then \ @@ -2945,7 +2949,7 @@ SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ fi ; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ - ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \ + ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ DIR=${DIST_SUBDIR}; \ CKSIZE=`${GREP} "^SIZE ($${DIR:+$$DIR/}$$file)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ case $${file} in \ @@ -2957,8 +2961,8 @@ continue 2; \ fi \ done; \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} ">> port manually into ${_DISTDIR} and try again."; \ + ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ + ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ fi \ done) @@ -2978,12 +2982,12 @@ done; \ if [ ! -f $$file -a ! -f $$filebasename -o "$$force_fetch" = "true" ]; then \ if [ -L $$file -o -L `${BASENAME} $$file` ]; then \ - ${ECHO_MSG} ">> ${_DISTDIR}/$$file is a broken symlink."; \ - ${ECHO_MSG} ">> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ - ${ECHO_MSG} ">> Please correct this problem and try again."; \ + ${ECHO_MSG} "=> ${_DISTDIR}/$$file is a broken symlink."; \ + ${ECHO_MSG} "=> Perhaps a filesystem (most likely a CD) isn't mounted?"; \ + ${ECHO_MSG} "=> Please correct this problem and try again."; \ exit 1; \ fi ; \ - ${ECHO_MSG} ">> $$file doesn't seem to exist in ${_DISTDIR}."; \ + ${ECHO_MSG} "=> $$file doesn't seem to exist in ${_DISTDIR}."; \ if [ ! -z "$$select" ] ; then \ __PATCH_SITES_TMP= ; \ for group in $$select; do \ @@ -2998,7 +3002,7 @@ SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ fi ; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ - ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \ + ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ DIR=${DIST_SUBDIR}; \ pattern="$${DIR:+$$DIR/}`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ CKSIZE=`${GREP} "^SIZE ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ @@ -3011,8 +3015,8 @@ continue 2; \ fi \ done; \ - ${ECHO_MSG} ">> Couldn't fetch it - please try to retrieve this";\ - ${ECHO_MSG} ">> port manually into ${_DISTDIR} and try again."; \ + ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ + ${ECHO_MSG} "=> port manually into ${_DISTDIR} and try again."; \ exit 1; \ fi \ done) @@ -3085,9 +3089,9 @@ if ${PATCH} ${PATCH_ARGS} < $$i ; then \ PATCHES_APPLIED="$$PATCHES_APPLIED $$i" ; \ else \ - ${ECHO_MSG} `${ECHO_CMD} ">> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \ + ${ECHO_MSG} `${ECHO_CMD} "=> Patch $$i failed to apply cleanly." | ${SED} "s|${PATCHDIR}/||"` ; \ if [ x"$$PATCHES_APPLIED" != x"" ]; then \ - ${ECHO_MSG} `${ECHO_CMD} ">> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \ + ${ECHO_MSG} `${ECHO_CMD} "=> Patch(es) $$PATCHES_APPLIED applied cleanly." | ${SED} "s|${PATCHDIR}/||g"` ; \ fi; \ ${FALSE} ; \ fi; \ @@ -3225,7 +3229,7 @@ @if [ -d ${PACKAGES} ]; then \ if [ ! -d ${PKGREPOSITORY} ]; then \ if ! ${MKDIR} ${PKGREPOSITORY}; then \ - ${ECHO_MSG} ">> Can't create directory ${PKGREPOSITORY}."; \ + ${ECHO_MSG} "=> Can't create directory ${PKGREPOSITORY}."; \ exit 1; \ fi; \ fi; \ @@ -3261,7 +3265,7 @@ @for cat in ${CATEGORIES}; do \ if [ ! -d ${PACKAGES}/$$cat ]; then \ if ! ${MKDIR} ${PACKAGES}/$$cat; then \ - ${ECHO_MSG} ">> Can't create directory ${PACKAGES}/$$cat."; \ + ${ECHO_MSG} "=> Can't create directory ${PACKAGES}/$$cat."; \ exit 1; \ fi; \ fi; \ @@ -3270,7 +3274,7 @@ .if !defined(NO_LATEST_LINK) @if [ ! -d ${PKGLATESTREPOSITORY} ]; then \ if ! ${MKDIR} ${PKGLATESTREPOSITORY}; then \ - ${ECHO_MSG} ">> Can't create directory ${PKGLATESTREPOSITORY}."; \ + ${ECHO_MSG} "=> Can't create directory ${PKGLATESTREPOSITORY}."; \ exit 1; \ fi; \ fi @@ -3973,10 +3977,10 @@ CKSUM=`${MD5} < $$file`; \ CKSUM2=`${GREP} "^MD5 ($$pattern)" ${MD5_FILE} | ${AWK} '{print $$4}'`; \ if [ -z "$$CKSUM2" ]; then \ - ${ECHO_MSG} ">> No checksum recorded for $$file."; \ + ${ECHO_MSG} "=> No checksum recorded for $$file."; \ OK="false"; \ elif [ "$$CKSUM2" = "IGNORE" ]; then \ - ${ECHO_MSG} ">> Checksum for $$file is set to IGNORE in distinfo file even though"; \ + ${ECHO_MSG} "=> Checksum for $$file is set to IGNORE in distinfo file even though"; \ ${ECHO_MSG} " the file is not in the "'$$'"{IGNOREFILES} list."; \ OK="false"; \ else \ @@ -3988,9 +3992,9 @@ fi; \ done; \ if $$ckmatch; then \ - ${ECHO_MSG} ">> Checksum OK for $$file."; \ + ${ECHO_MSG} "=> Checksum OK for $$file."; \ else \ - ${ECHO_MSG} ">> Checksum mismatch for $$file."; \ + ${ECHO_MSG} "=> Checksum mismatch for $$file."; \ refetchlist="$$refetchlist$$file "; \ OK="$${OK:-retry}"; \ fi; \ @@ -4000,10 +4004,10 @@ pattern="`${ECHO_CMD} $$file | ${SED} -e 's/\./\\\\./g'`"; \ CKSUM2=`${GREP} "($$pattern)" ${MD5_FILE} | ${AWK} '{if(NR<2)print $$4}'`; \ if [ "$$CKSUM2" = "" ]; then \ - ${ECHO_MSG} ">> No checksum recorded for $$file, file is in "'$$'"{IGNOREFILES} list."; \ + ${ECHO_MSG} "=> No checksum recorded for $$file, file is in "'$$'"{IGNOREFILES} list."; \ OK="false"; \ elif [ "$$CKSUM2" != "IGNORE" ]; then \ - ${ECHO_MSG} ">> Checksum for $$file is not set to IGNORE in distinfo file even though"; \ + ${ECHO_MSG} "=> Checksum for $$file is not set to IGNORE in distinfo file even though"; \ ${ECHO_MSG} " the file is in the "'$$'"{IGNOREFILES} list."; \ OK="false"; \ fi; \ @@ -4029,7 +4033,7 @@ exit 1; \ fi); \ elif [ -n "${_CKSUMFILES:M*}" ]; then \ - ${ECHO_MSG} ">> No checksum file (${MD5_FILE})."; \ + ${ECHO_MSG} "=> No checksum file (${MD5_FILE})."; \ fi .endif @@ -4128,7 +4132,7 @@ if [ $$notfound != 0 ]; then \ ${ECHO_MSG} "===> Verifying $$target for $$prog in $$dir"; \ if [ ! -d "$$dir" ]; then \ - ${ECHO_MSG} " >> No directory for $$prog. Skipping.."; \ + ${ECHO_MSG} " => No directory for $$prog. Skipping.."; \ else \ if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \ subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \ @@ -4184,7 +4188,7 @@ if [ $$notfound != 0 ]; then \ ${ECHO_MSG} "===> Verifying $$target for $$lib in $$dir"; \ if [ ! -d "$$dir" ]; then \ - ${ECHO_MSG} " >> No directory for $$lib. Skipping.."; \ + ${ECHO_MSG} " => No directory for $$lib. Skipping.."; \ else \ if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \ subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \ @@ -4221,7 +4225,7 @@ ${ECHO_MSG} "===> ${PKGNAME} depends on: $$dir"; \ ${ECHO_MSG} "===> Verifying $$target for $$dir"; \ if [ ! -d $$dir ]; then \ - ${ECHO_MSG} " >> No directory for $$dir. Skipping.."; \ + ${ECHO_MSG} " => No directory for $$dir. Skipping.."; \ else \ (cd $$dir; ${MAKE} $$target $$depends_args) ; \ fi \ --- bsd.port.mk.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200412060826.iB68QSsp096736>