Date: Mon, 19 Aug 2019 14:01:49 +0000 (UTC) From: Tobias Kortkamp <tobik@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r509288 - head/Mk Message-ID: <201908191401.x7JE1neP050839@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tobik Date: Mon Aug 19 14:01:49 2019 New Revision: 509288 URL: https://svnweb.freebsd.org/changeset/ports/509288 Log: Mk/bsd.sites.mk: Fix fetch with GL_TUPLE site:account:project:commit:group style entries Something like GL_TUPLE= https://gitlab.redox-os.org:redox-os:calc:afba9c5d184ddb9db5e4e71dc357da0499e212cf:calculate fails to fetch because GL_SITE_calculate still has the colon left after parsing: => Attempting to fetch https://gitlab.redox-os.org:/redox-os/calc/repository/afba9c5d184ddb9db5e4e71dc357da0499e212cf/archive.tar.gz?dummy=/redox-os-calc-afba9c5d184ddb9db5e4e71dc357da0499e212cf_GL0.tar.gz fetch: https://gitlab.redox-os.org:/redox-os/calc/repository/afba9c5d184ddb9db5e4e71dc357da0499e212cf/archive.tar.gz?dummy=/redox-os-calc-afba9c5d184ddb9db5e4e71dc357da0499e212cf_GL0.tar.gz: parse error $ make -V GL_SITE_calculate https://gitlab.redox-os.org: Changing the already complex regular expressions to correct this would make them even more complex. Instead we correct the :: that appears in GL_SITE after parsing GL_TUPLE. Approved by: portmgr (mat) Differential Revision: https://reviews.freebsd.org/D21171 Modified: head/Mk/bsd.sites.mk Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Mon Aug 19 13:56:36 2019 (r509287) +++ head/Mk/bsd.sites.mk Mon Aug 19 14:01:49 2019 (r509288) @@ -544,7 +544,7 @@ check-makevars:: @${FALSE} . endif . endfor -GL_SITE+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\1\8@} +GL_SITE+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\1\8@:S@::@:@} GL_ACCOUNT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\5\8@} GL_PROJECT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\6\8@} GL_COMMIT+= ${GL_TUPLE:C@^(([^:]*://[^:/]*(:[0-9]{1,5})?(/[^:]*[^/])?:)?)([^:]*):([^:]*):([^:]*)(:[^:/]*)((/.*)?)@\7\8@}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201908191401.x7JE1neP050839>