From nobody Thu Sep 08 12:05:58 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4MNdBb6WmNz4bxX2; Thu, 8 Sep 2022 12:06:15 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: from mail-lf1-f51.google.com (mail-lf1-f51.google.com [209.85.167.51]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MNdBb0n6zz47jF; Thu, 8 Sep 2022 12:06:15 +0000 (UTC) (envelope-from antoine.brodin.freebsd@gmail.com) Received: by mail-lf1-f51.google.com with SMTP id q7so27377090lfu.5; Thu, 08 Sep 2022 05:06:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date; bh=HsaMmXdS9yelHIVYugSCeXsXaxeuqYdtT8FKLGmGdaU=; b=40b+0R7jqa3g6/dSHJ+EX2AHoEDItnmWJ6COFXgHI/WV8qPxCFnwDlDcWDSGTJ6RnB d/GebpgIOifWPCz9KSW/8u/xFG6WJz3q2NQsZfjLAN/ANfCKXuTTFagp+xDdwc8hamkw YXUqnlv8e7c8fzTHpfNiAX3WPHvq/wB3l0LfslcK7q/fIYRJJoWdMxrJH9gDewoiIHCf tITQh89vMQJO/+3YfwP79H+Flga1UKRkdkdAJBfN4o8UaVbywNcda7dB3OWueVL9vp7L OBd15KZUHDgIRpiuvxrewNENSLheL6xLUETDYKuD26qGOGm87OUcAMQwUu5/Hd8xJmf6 d6GA== X-Gm-Message-State: ACgBeo0mz1jBwOZnH6NYTPN3WKoCx+lqb9m+8Iu6PbUFjbQdq6mJfzcd LmP6u84MuXP/7S3CVUxtOm7x8yijYaxGNg3iijbXheEnVwI= X-Google-Smtp-Source: AA6agR4hg6R69NNU5UjynWUY/4w4c9dOHY56IxFWsTX2eymEg2SU3hd6e/57WOAlucxHqkmP4omTuacqzk45YxlJ1EQ= X-Received: by 2002:a05:6512:b97:b0:497:5c43:2d61 with SMTP id b23-20020a0565120b9700b004975c432d61mr2380651lfv.251.1662638772170; Thu, 08 Sep 2022 05:06:12 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202209071941.287JfCRU062079@gitrepo.freebsd.org> In-Reply-To: <202209071941.287JfCRU062079@gitrepo.freebsd.org> From: Antoine Brodin Date: Thu, 8 Sep 2022 12:05:58 +0000 Message-ID: Subject: Re: git: ddd0e820c8eb - main - Mk/bsd.ports.mk: Add suppport for WWW in Makefiles To: =?UTF-8?B?U3RlZmFuIEXDn2Vy?= Cc: ports-committers , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4MNdBb0n6zz47jF X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org; dkim=none; dmarc=none; spf=pass (mx1.freebsd.org: domain of antoine.brodin.freebsd@gmail.com designates 209.85.167.51 as permitted sender) smtp.mailfrom=antoine.brodin.freebsd@gmail.com X-Spamd-Result: default: False [-2.86 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-0.997]; NEURAL_HAM_SHORT(-0.86)[-0.863]; FORGED_SENDER(0.30)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.167.51:from]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; RCVD_IN_DNSWL_NONE(0.00)[209.85.167.51:from]; MIME_TRACE(0.00)[0:+]; FREEMAIL_ENVFROM(0.00)[gmail.com]; R_DKIM_NA(0.00)[]; ARC_NA(0.00)[]; TO_DN_SOME(0.00)[]; FROM_HAS_DN(0.00)[]; FROM_NEQ_ENVFROM(0.00)[antoine@freebsd.org,antoinebrodinfreebsd@gmail.com]; TAGGED_FROM(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; RCVD_TLS_LAST(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[freebsd.org]; RCVD_COUNT_TWO(0.00)[2] X-ThisMailContainsUnwantedMimeParts: N On Wed, Sep 7, 2022 at 7:41 PM Stefan E=C3=9Fer 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 > AuthorDate: 2022-09-07 19:32:54 +0000 > Commit: Stefan E=C3=9Fer > 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