Index: bsd.port.mk =================================================================== --- bsd.port.mk (révision 305322) +++ bsd.port.mk (copie de travail) @@ -4252,12 +4252,11 @@ ! ${AWK} -v audit="$${PORTS_AUDIT}" -f ${PORTSDIR}/Tools/scripts/security-check.awk \ ${WRKDIR}/.PLIST.flattened ${WRKDIR}/.PLIST.objdump ${WRKDIR}/.PLIST.setuid ${WRKDIR}/.PLIST.writable; \ then \ - www_site=$$(cd ${.CURDIR} && ${MAKE} www-site); \ if [ ! -z "$${www_site}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} " For more information, and contact details about the security"; \ ${ECHO_MSG} " status of this software, see the following webpage: "; \ - ${ECHO_MSG} "$${www_site}"; \ + ${ECHO_MSG} "${WWW}"; \ fi; \ fi .endif @@ -4448,13 +4447,14 @@ .if !target(pretty-print-www-site) pretty-print-www-site: - @www_site=$$(cd ${.CURDIR} && ${MAKE} www-site); \ - if [ -n "$${www_site}" ]; then \ - ${ECHO_MSG} -n " and/or visit the "; \ - ${ECHO_MSG} -n "web site"; \ - ${ECHO_MSG} " for further information"; \ - fi +.if defined(WWW) + @${ECHO_MSG} -n " and/or visit the " +.for www_site in WWW + @${ECHO_MSG} -n "web site" +.endfor + @${ECHO_MSG} " for further information" .endif +.endif ################################################################ # Some more targets supplied for users' convenience @@ -5547,22 +5547,13 @@ describe: @(${ECHO_CMD} -n "${PKGNAME}|${.CURDIR}|${PREFIX}|"; \ ${ECHO_CMD} -n ${COMMENT:Q}; \ - ${ECHO_CMD} -n "|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|"; \ - while read one two discard; do \ - case "$$one" in \ - WWW:) case "$$two" in \ - https://*|http://*|ftp://*) ${ECHO_CMD} -n "$$two" ;; \ - *) ${ECHO_CMD} -n "http://$$two" ;; \ - esac; \ - break; \ - ;; \ - esac; \ - done < ${DESCR}; ${ECHO_CMD}) >>${INDEX_OUT} + ${ECHO_CMD} -n "|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|${WWW}"; \ + ) >>${INDEX_OUT} . endif www-site: -.if exists(${DESCR}) - @${AWK} '$$1 ~ /^WWW:/ {print $$2}' ${DESCR} | ${HEAD} -1 +.if defined(WWW) + @${ECHO_CMD} ${WWW} .else @${ECHO_CMD} .endif