From nobody Thu Sep 08 14:03:00 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 4MNgnM5FFPz4c9mr; Thu, 8 Sep 2022 14:03:03 +0000 (UTC) (envelope-from se@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MNgnM4f0Fz3Kgc; Thu, 8 Sep 2022 14:03:03 +0000 (UTC) (envelope-from se@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662645783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XF+phsuqLq6Np1i3LGiNdfgfVpbQ1N7qDJEmUFH/6Pk=; b=KJn6Vn9Du2uC+5Dr6j9Up7uoNpvqdBS2yQpiQnu3u0oHETkyz1qy0A6LRZ1fxZwozLCUQj x3fjV9HB7lid0EuRCzev2NxpZ3SaGSz16Ws2+0nCr408x58rJkipqnDD3zgG4tqT3UhhW+ IbCK7xgAuCtSbXZTfPrHGwS8Yqdi17xRMTwAtT9tKH2/N04mw5umcco/71rhdf21MVX6nh D74r9mI6ePntrRjVxVp174e1U/NdXY05dibUc29FdZHmcZD9HHERg9muFqKnLhc5jmgfHm OQn2mArivJfvQl2j0zCVp1CTywPvm71n+itkdJqXT1UKmB6bXOl2lEMwjFCmUg== Received: from [IPV6:2003:cd:5f1e:4500:988b:c7c0:b40:3010] (p200300cd5f1e4500988bc7c00b403010.dip0.t-ipconnect.de [IPv6:2003:cd:5f1e:4500:988b:c7c0:b40:3010]) (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 did not present a certificate) (Authenticated sender: se/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4MNgnL5yHFz18q6; Thu, 8 Sep 2022 14:03:02 +0000 (UTC) (envelope-from se@freebsd.org) Message-ID: <71d6ee71-0771-3f47-3341-6685b91c3450@FreeBSD.org> Date: Thu, 8 Sep 2022 16:03:00 +0200 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 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.2.1 From: =?UTF-8?Q?Stefan_E=c3=9fer?= Subject: Re: git: ddd0e820c8eb - main - Mk/bsd.ports.mk: Add suppport for WWW in Makefiles Content-Language: de-DE To: Antoine Brodin Cc: ports-committers , dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202209071941.287JfCRU062079@gitrepo.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1662645783; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XF+phsuqLq6Np1i3LGiNdfgfVpbQ1N7qDJEmUFH/6Pk=; b=gUBUijeNuTKPC8cLDUH2iaZ3/PQc68SEAxFF+u8p8jGrhSIR2ko/l2MvPqO0nc6mTz39Fu LZJI5lBypUY3wj4My3yv2Tit2oK+rwoAN/lKRic7ENKpU2FrlWxoSHyA+mnTfZSqrekva6 P5mmsGg6mPCLxNRMcFAsxeuNZcF2AzvAxdwxL9XKJX107uX4tOijL63LGoLLL7FYh/zeJv T68WYLV2tVuYCbLpxhQdS56rbIX28Dph1qPpExKDGCtFeZD5vrRWnfvFhAvor1EmD7QpjS 13pUaDPxq+Ewb3yGOlEs7Fk6UDGaWqFUaq54pIi3u4EYkxnvIDPEhG9ijz5Yfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1662645783; a=rsa-sha256; cv=none; b=wXVGQBeztdXgUst4RMl1r9HjXlirENYaceog/UizYj3VGOC/JRThK/NagI+0Apg7l73ZwA 6TwlifpEHhN8ikUKC3el3cOvToCqYF5XtaQS5IPnmA/FrEjxfYkIXh/i6JJ3QNfDndl+P+ 6dsw+bxfTs6WmV9T+gUIlH2qBHM+B8g4CIQ4omEXc8onupDDmbje/t4cVG84443RzCPgYE YmVZPGIHDCR8GIrVNQcrQoeSanumMka9wI0TMtRvYnNrYfBwp94X17i3XNzi1u70rGzzjy tXCs0U4G8wpnmK11DuxlPQy7uCOHxAOBXF9xnthAgTXzVNSlER4BHPxtUijsZg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Am 08.09.22 um 14:05 schrieb Antoine Brodin: > On Wed, Sep 7, 2022 at 7:41 PM Stefan Eßer wrote: >> >> The branch main has been updated by se: >> >> URL: https://cgit.FreeBSD.org/ports/commit/?id=ddd0e820c8eb73acef94c72434c382982d0fa329 >> >> commit ddd0e820c8eb73acef94c72434c382982d0fa329 >> Author: Stefan Eßer >> AuthorDate: 2022-09-07 19:32:54 +0000 >> Commit: Stefan Eßer >> 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}|${_DESCR}|${MAINTAINER}|${CATEGORIES}|${_EXTRACT_DEPENDS}|${_PATCH_DEPENDS}|${_FETCH_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. A, sorry, that's a bad effect that I had not seen during testing. I'm just testing a patch that restores the old behavior: ${ECHO_CMD} "...|${COMMENT:Q}|..." --> ${ECHO_CMD} "...|"${COMMENT:Q}"|..." By ending the quoted string before and restarting it after ${COMMENT:Q} the issue should be fixed. Thank you for pointing out this subtile bug! Best regards, STefan