Date: Thu, 25 Dec 2014 01:12:46 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r375501 - head/Mk Message-ID: <201412250112.sBP1CkCf066349@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Dec 25 01:12:46 2014 New Revision: 375501 URL: https://svnweb.freebsd.org/changeset/ports/375501 QAT: https://qat.redports.org/buildarchive/r375501/ Log: Allow PATCH_SITES to use the same abbreviations as MASTER_SITES Differential Revision: https://reviews.freebsd.org/D1362 Modified: head/Mk/bsd.sites.mk Modified: head/Mk/bsd.sites.mk ============================================================================== --- head/Mk/bsd.sites.mk Thu Dec 25 01:10:19 2014 (r375500) +++ head/Mk/bsd.sites.mk Thu Dec 25 01:12:46 2014 (r375501) @@ -1580,3 +1580,44 @@ MASTER_SITES_EXP:= ${MASTER_SITES_EXP} MASTER_SITES= ${MASTER_SITES_EXP} .endif + +.if defined(PATCH_SITES) && ${PATCH_SITES:N*\:/*} + +.for _site__ in ${PATCH_SITES} +_site_=${_site__} +. if ${_site_:M*\:/*} +PATCH_SITES_EXP+= ${_site_} +PATCH_SITES_EXP:= ${PATCH_SITES_EXP} +. else +_site_urlpath_= ${_site_:C@^(.*):[^/:]+$@\1@} +. if ${_site_urlpath_:M*/*} +_site_url_= ${_site_urlpath_:C@^([^/]+)/.*$@\1@} +_site_subdir_= ${_site_urlpath_:S/^${_site_urlpath_:C@^([^/]+)/.*$@\1@}//:S!^/!!:S!/$!!} +. else +_site_url_= ${_site_urlpath_} +.undef _site_subdir_ +. endif +_site_group_= ${_site_:S/^${_site_:C@^(.*):[^/:]+$@\1@}//:S/^://} +. for _abbrev_ in ${MASTER_SITES_ABBREVS} +. if ${_site_url_} == ${_abbrev_:C/:.*//} +_site_url_= ${_abbrev_:C/.*://} +. endif +. endfor +. for _subdir_ in ${MASTER_SITES_SUBDIRS} +. if ${_site_url_} == ${_subdir_:C/:.*//} && !defined(MASTER_SITE_SUBDIR) +_site_subdir_?= ${_subdir_:C/.*://} +. endif +. endfor +. ifdef MASTER_SITE_${_site_url_} +. ifdef _site_subdir_ +PATCH_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S^%SUBDIR%^${_site_subdir_}^:S/$/:${_site_group_}/:S/:$//} +. else +PATCH_SITES_EXP+= ${MASTER_SITE_${_site_url_}:S/$/:${_site_group_}/:S/:$//} +. endif +PATCH_SITES_EXP:= ${PATCH_SITES_EXP} +. endif +. endif +.endfor +PATCH_SITES= ${PATCH_SITES_EXP} + +.endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412250112.sBP1CkCf066349>