Date: Thu, 8 Sep 2022 12:05:58 +0000 From: Antoine Brodin <antoine@freebsd.org> To: =?UTF-8?B?U3RlZmFuIEXDn2Vy?= <se@freebsd.org> Cc: ports-committers <ports-committers@freebsd.org>, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: ddd0e820c8eb - main - Mk/bsd.ports.mk: Add suppport for WWW in Makefiles Message-ID: <CAALwa8mG38Fv0R=yYNH3ExMrP08JtHZU6uWrfeYWsxSqey=eEQ@mail.gmail.com> In-Reply-To: <202209071941.287JfCRU062079@gitrepo.freebsd.org> References: <202209071941.287JfCRU062079@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Wed, Sep 7, 2022 at 7:41 PM Stefan E=C3=9Fer <se@freebsd.org> wrote: > > The branch main has been updated by se: > > URL: https://cgit.FreeBSD.org/ports/commit/?id=3Dddd0e820c8eb73acef94c724= 34c382982d0fa329 > > commit ddd0e820c8eb73acef94c72434c382982d0fa329 > Author: Stefan E=C3=9Fer <se@FreeBSD.org> > AuthorDate: 2022-09-07 19:32:54 +0000 > Commit: Stefan E=C3=9Fer <se@FreeBSD.org> > CommitDate: 2022-09-07 19:32:54 +0000 > > Mk/bsd.ports.mk: Add suppport for WWW in Makefiles > > Expect the project website or other relevant URL of a port to be > specified in a WWW macro in its Makefile. > > This information used to be available in WWW: lines at the end of > each port's pkg-descr file. By moving it into the Makefile, this > value is easier to access, verify, and maintain. > > A WWW: line is added to the "desc" element of package manifests > based on the WWW macro value by the create-manifest.sh script. > This restores the previous contents of this line in the manifest > (as e.g. expected by the Freshports website). > > The ports-mgmt/portlint port has been updated in commit 9800743f0 > (version 2.19.13) to support the planned introduction of WWW in > port Makefiles. > > Approved by: portmgr (tcberner) > Differential Revision: https://reviews.freebsd.org/D36434 > --- > Mk/Scripts/create-manifest.sh | 4 ++++ > Mk/bsd.port.mk | 43 +++++++++++++++----------------------= ------ > 2 files changed, 19 insertions(+), 28 deletions(-) ... > - @(${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} "${PKGNAME}|${.CURDIR}|${PREFIX}|${COMMENT:Q}|${_DE= SCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_F= ETCH_DEPENDS}|${_BUILD_DEPENDS:O:u}|${_RUN_DEPENDS:O:u}|${_WWW}" >> ${INDEX= _OUT}) Hi, The regression is here, ${ECHO_CMD} -n ${COMMENT:Q}; is not the same as ${ECHO_CMD} "...${COMMENT:Q}.." You can see in INDEX that there are now a lot of backslashes to escape spaces, they weren't here before. Antoine
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAALwa8mG38Fv0R=yYNH3ExMrP08JtHZU6uWrfeYWsxSqey=eEQ>