Attachment #163862 for bug #205032




				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"
				@${FALSE}
.			endif
_MASTER_SITES_${_group:C@-@_@g}+=	${_S:C@^(.*/):[^/:]+$@\1@}
.		endfor
.	else
_MASTER_SITES_DEFAULT+=	${_S:C@^(.*/):[^/:]+$@\1@}

				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
				@${FALSE}
.			endif
_PATCH_SITES_${_group:C@-@_@g}+=	${_S:C@^(.*/):[^/:]+$@\1@}
.		endfor
.	else
_PATCH_SITES_DEFAULT+=	${_S:C@^(.*/):[^/:]+$@\1@}

				@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
				@${FALSE}
.			endif
.			if defined(_MASTER_SITES_${_group:C@-@_@g})
_MASTER_SITE_SUBDIR_${_group:C@-@_@g}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
.			endif
.		endfor
.	else

				@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
				@${FALSE}
.			endif
.			if defined(_PATCH_SITES_${_group:C@-@_@g})
_PATCH_SITE_SUBDIR_${_group:C@-@_@g}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
.			endif
.		endfor
.	else

_S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
.	if !empty(_S_TEMP)
.		for _group in ${_S_TEMP:S/,/ /g}
.			if !defined(_MASTER_SITE_SUBDIR_${_group:C@-@_@g})
MASTER_SITES_TMP=	${_MASTER_SITES_${_group:C@-@_@g}:S^%SUBDIR%/^^}
.			else
_S_TEMP_TEMP=		${_MASTER_SITES_${_group:C@-@_@g}:M*%SUBDIR%/*}
.				if empty(_S_TEMP_TEMP)
MASTER_SITES_TMP=	${_MASTER_SITES_${_group:C@-@_@g}}
.				else
MASTER_SITES_TMP=
.					for site in ${_MASTER_SITES_${_group:C@-@_@g}}
_S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
.						if empty(_S_TEMP_TEMP)
MASTER_SITES_TMP+=	${site}
.						else
.							for dir in ${_MASTER_SITE_SUBDIR_${_group:C@-@_@g}}
MASTER_SITES_TMP+=	${site:S^%SUBDIR%^\${dir}^}
.							endfor
.						endif

.					endfor
.				endif
.			endif
_MASTER_SITES_${_group:C@-@_@g}:=	${MASTER_SITES_TMP}
.		endfor
.	endif
.endfor

_S_TEMP=	${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
.	if !empty(_S_TEMP)
.		for _group in ${_S_TEMP:S/,/ /g}
.			if !defined(_PATCH_SITE_SUBDIR_${_group:C@-@_@g})
PATCH_SITES_TMP=	${_PATCH_SITES_${_group:C@-@_@g}:S^%SUBDIR%/^^}
.			else
_S_TEMP_TEMP=		${_PATCH_SITES_${_group:C@-@_@g}:M*%SUBDIR%/*}
.				if empty(_S_TEMP_TEMP)
PATCH_SITES_TMP=	${_PATCH_SITES_${_group:C@-@_@g}}
.				else
PATCH_SITES_TMP=
.					for site in ${_PATCH_SITES_${_group:C@-@_@g}}
_S_TEMP_TEMP=	${site:M*%SUBDIR%/*}
.						if empty(_S_TEMP_TEMP)
PATCH_SITES_TMP+=	${site}
.						else
.							for dir in ${_PATCH_SITE_SUBDIR_${_group:C@-@_@g}}
PATCH_SITES_TMP+=	${site:S^%SUBDIR%^\${dir}^}
.							endfor
.						endif

.					endfor
.				endif
.			endif
_PATCH_SITES_${_group:C@-@_@g}:=	${PATCH_SITES_TMP}
.		endfor
.	endif
.endfor

_D_TEMP=	${_D:S/^${_D:C/:[^:]+$//}//}
.	if !empty(_D_TEMP)
.		for _group in ${_D_TEMP:S/^://:S/,/ /g}
.			if !defined(_MASTER_SITES_${_group:C@-@_@g})
_G_TEMP_TEMP=	${_G_TEMP:M/${_group}/}
.				if empty(_G_TEMP_TEMP)
_G_TEMP+=	${_group}
_MASTER_SITES_ALL+=	${_MASTER_SITES_${_group:C@-@_@g}}
.				endif
.			endif
.		endfor

_P_strip=	${_P_TEMP:S/^${_P_TEMP:C/:-[^:]*$//}//:S/^://}
.	if !empty(_P_groups)
.		for _group in ${_P_groups:S/,/ /g}
.			if !defined(_PATCH_SITES_${_group:C@-@_@g})
_G_TEMP_TEMP=	${_G_TEMP:M/${_group}/}
.				if empty(_G_TEMP_TEMP)
_G_TEMP+=	${_group}
_PATCH_SITES_ALL+=	${_PATCH_SITES_${_group:C@-@_@g}}
.				endif
.			endif
.		endfor

.	if !empty(_S_TEMP)
.		for _group in ${_S_TEMP:S/^://:S/,/ /g}
.			if !target(master-sites-${_group})
SORTED_MASTER_SITES_${_group:C@-@_@g}_CMD=	cd ${.CURDIR} && ${MAKE} master-sites-${_group}
master-sites-${_group}:
	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group:C@-@_@g}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
.			endif
.		endfor
.	endif

.	if !empty(_S_TEMP)
.		for _group in ${_S_TEMP:S/^://:S/,/ /g}
.			if !target(patch-sites-${_group})
SORTED_PATCH_SITES_${_group:C@-@_@g}_CMD=	cd ${.CURDIR} && ${MAKE} patch-sites-${_group}
patch-sites-${_group}:
	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group:C@-@_@g}}' | ${AWK} '${MASTER_SORT_AWK:S|\\|\\\\|g}'` ${_MASTER_SITE_BACKUP}
.			endif
.		endfor
.	endif

_F_TEMP=	${_F:S/^${_F:C/:[^:]+$//}//:S/^://}
.	if !empty(_F_TEMP)
.		for _group in ${_F_TEMP:S/,/ /g}
.			if defined(_MASTER_SITES_${_group:C@-@_@g})
_MASTER_SITES_ENV+=	_MASTER_SITES_${_group:C@-@_@g}="${_MASTER_SITES_${_group:C@-@_@g}}"
.			endif
.		endfor
.	endif

_F_TEMP=	${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}
.	if !empty(_F_TEMP)
.		for _group in ${_F_TEMP:S/,/ /g}
.			if defined(_PATCH_SITES_${_group:C@-@_@g})
_PATCH_SITES_ENV+=	_PATCH_SITES_${_group:C@-@_@g}="${_PATCH_SITES_${_group:C@-@_@g}}"
.			endif
.		endfor
.	endif

		if [ $$_file = $$file ]; then	\
			select='';	\
		else	\
			select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g' -e 's/-/_/'` ;	\
		fi;	\
		force_fetch=false; \
		filebasename=$${file##*/}; \

		if [ $$_file = $$file ]; then	\
			select='';	\
		else	\
			select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g' -e 's/-/_/g'` ;	\
		fi;	\
		file=`${ECHO_CMD} $$file | ${SED} -E -e 's/:-[^:]+$$//'` ; \
		force_fetch=false; \

		if [ $$_file = $$file ]; then	\
			select='';	\
		else	\
			select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g' -e 's/-/_/g'` ;	\
		fi;	\
		if [ ! -f $$file -a ! -f $${file##*/} ]; then \
			if [ ! -z "$$select" ] ; then \

		if [ $$_file = $$file ]; then	\
			select='';	\
		else	\
			select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g' -e 's/-/_/g'` ;	\
		fi;	\
		file=`${ECHO_CMD} $$file | ${SED} -E -e 's/:-[^:]+$$//'` ; \
		if [ ! -f $$file -a ! -f $${file##*/} ]; then \

		if [ $$_file = $$file ]; then	\
			select='';	\
		else	\
			select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g' -e 's/-/_/g'` ;	\
		fi;	\
		if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
			if [ ! -z "$$select" ] ; then \

		if [ $$_file = $$file ]; then	\
			select='';	\
		else	\
			select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g' -e 's/-/_/g'` ;	\
		fi;	\
		file=`${ECHO_CMD} $$file | ${SED} -E -e 's/:-[^:]+$$//'` ; \
		fileptn=`${ECHO_CMD} $$file | ${SED} 's|/|\\\\/|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \




.        if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+=	${_group}
.         endif
GH_ACCOUNT_${_group:C@-@_@g}=	${_A:C@^(.*):[^/:]+$@\1@}
.      endfor
.    else
GH_ACCOUNT_DEFAULT=	${_A:C@^(.*):[^/:]+$@\1@}

.        if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+=	${_group}
.         endif
GH_PROJECT_${_group:C@-@_@g}=	${_P:C@^(.*):[^/:]+$@\1@}
.      endfor
.    else
GH_PROJECT_DEFAULT=	${_P:C@^(.*):[^/:]+$@\1@}

.        if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+=	${_group}
.         endif
GH_TAGNAME_${_group:C@-@_@g}=	${_T:C@^(.*):[^/:]+$@\1@}
.      endfor
.    else
GH_TAGNAME_DEFAULT=	${_T:C@^(.*):[^/:]+$@\1@}

# entries with the correct group and create {WRKSRC,DISTNAME,DISTFILES}_group
# helper variables.
.    for _group in ${_GITHUB_GROUPS:NDEFAULT}
_groupu=${_group:C@-@_@g}
GH_ACCOUNT_${_groupu}?=	${GH_ACCOUNT_DEFAULT}
GH_PROJECT_${_groupu}?=	${GH_PROJECT_DEFAULT}
GH_TAGNAME_${_groupu}?=	${GH_TAGNAME_DEFAULT}
GH_TAGNAME_${_groupu}_SANITIZED=	${GH_TAGNAME_${_groupu}:S,/,-,}
GH_TAGNAME_${_groupu}_EXTRACT=	${GH_TAGNAME_${_groupu}_SANITIZED:C/^[vV]([0-9])/\1/}
DISTNAME_${_groupu}:=	${GH_ACCOUNT_${_groupu}}-${GH_PROJECT_${_groupu}}-${GH_TAGNAME_${_groupu}_SANITIZED}
DISTFILE_${_groupu}:=	${DISTNAME_${_groupu}}_GH${_GITHUB_REV}${_GITHUB_EXTRACT_SUFX}
DISTFILES:=	${DISTFILES} ${DISTFILE_${_groupu}}:${_group}
MASTER_SITES:=	${MASTER_SITES} ${MASTER_SITE_GITHUB:S@%SUBDIR%@${GH_ACCOUNT_${_groupu}}/${GH_PROJECT_${_groupu}}/tar.gz/${GH_TAGNAME_${_groupu}}?dummy=/:${_group}@}
WRKSRC_${_groupu}:=	${WRKDIR}/${GH_PROJECT_${_groupu}}-${GH_TAGNAME_${_groupu}_EXTRACT}
.    endfor
.  endif
.endif # defined(USE_GITHUB)

Return to bug 205032

Lines 557-563 Link Here

(-)Mk/bsd.sites.mk (-13 / +14 lines)
557	. if !${_GITHUB_GROUPS:M${_group}}	557	. if !${_GITHUB_GROUPS:M${_group}}
558	_GITHUB_GROUPS+= ${_group}	558	_GITHUB_GROUPS+= ${_group}
559	. endif	559	. endif
560	GH_ACCOUNT_${_group}= ${_A:C@^(.*):[^/:]+$@\1@}	560	GH_ACCOUNT_${_group:C@-@_@g}= ${_A:C@^(.*):[^/:]+$@\1@}
561	. endfor	561	. endfor
562	. else	562	. else
563	GH_ACCOUNT_DEFAULT= ${_A:C@^(.*):[^/:]+$@\1@}	563	GH_ACCOUNT_DEFAULT= ${_A:C@^(.*):[^/:]+$@\1@}
Lines 577-583 Link Here
577	. if !${_GITHUB_GROUPS:M${_group}}	577	. if !${_GITHUB_GROUPS:M${_group}}
578	_GITHUB_GROUPS+= ${_group}	578	_GITHUB_GROUPS+= ${_group}
579	. endif	579	. endif
580	GH_PROJECT_${_group}= ${_P:C@^(.*):[^/:]+$@\1@}	580	GH_PROJECT_${_group:C@-@_@g}= ${_P:C@^(.*):[^/:]+$@\1@}
581	. endfor	581	. endfor
582	. else	582	. else
583	GH_PROJECT_DEFAULT= ${_P:C@^(.*):[^/:]+$@\1@}	583	GH_PROJECT_DEFAULT= ${_P:C@^(.*):[^/:]+$@\1@}
Lines 597-603 Link Here
597	. if !${_GITHUB_GROUPS:M${_group}}	597	. if !${_GITHUB_GROUPS:M${_group}}
598	_GITHUB_GROUPS+= ${_group}	598	_GITHUB_GROUPS+= ${_group}
599	. endif	599	. endif
600	GH_TAGNAME_${_group}= ${_T:C@^(.*):[^/:]+$@\1@}	600	GH_TAGNAME_${_group:C@-@_@g}= ${_T:C@^(.*):[^/:]+$@\1@}
601	. endfor	601	. endfor
602	. else	602	. else
603	GH_TAGNAME_DEFAULT= ${_T:C@^(.*):[^/:]+$@\1@}	603	GH_TAGNAME_DEFAULT= ${_T:C@^(.*):[^/:]+$@\1@}
Lines 640-655 Link Here
640	# entries with the correct group and create {WRKSRC,DISTNAME,DISTFILES}_group	640	# entries with the correct group and create {WRKSRC,DISTNAME,DISTFILES}_group
641	# helper variables.	641	# helper variables.
642	. for _group in ${_GITHUB_GROUPS:NDEFAULT}	642	. for _group in ${_GITHUB_GROUPS:NDEFAULT}
643	GH_ACCOUNT_${_group}?= ${GH_ACCOUNT_DEFAULT}	643	_groupu=${_group:C@-@_@g}
644	GH_PROJECT_${_group}?= ${GH_PROJECT_DEFAULT}	644	GH_ACCOUNT_${_groupu}?= ${GH_ACCOUNT_DEFAULT}
645	GH_TAGNAME_${_group}?= ${GH_TAGNAME_DEFAULT}	645	GH_PROJECT_${_groupu}?= ${GH_PROJECT_DEFAULT}
646	GH_TAGNAME_${_group}_SANITIZED= ${GH_TAGNAME_${_group}:S,/,-,}	646	GH_TAGNAME_${_groupu}?= ${GH_TAGNAME_DEFAULT}
647	GH_TAGNAME_${_group}_EXTRACT= ${GH_TAGNAME_${_group}_SANITIZED:C/^[vV]([0-9])/\1/}	647	GH_TAGNAME_${_groupu}_SANITIZED= ${GH_TAGNAME_${_groupu}:S,/,-,}
648	DISTNAME_${_group}:= ${GH_ACCOUNT_${_group}}-${GH_PROJECT_${_group}}-${GH_TAGNAME_${_group}_SANITIZED}	648	GH_TAGNAME_${_groupu}_EXTRACT= ${GH_TAGNAME_${_groupu}_SANITIZED:C/^[vV]([0-9])/\1/}
649	DISTFILE_${_group}:= ${DISTNAME_${_group}}_GH${_GITHUB_REV}${_GITHUB_EXTRACT_SUFX}	649	DISTNAME_${_groupu}:= ${GH_ACCOUNT_${_groupu}}-${GH_PROJECT_${_groupu}}-${GH_TAGNAME_${_groupu}_SANITIZED}
650	DISTFILES:= ${DISTFILES} ${DISTFILE_${_group}}:${_group}	650	DISTFILE_${_groupu}:= ${DISTNAME_${_groupu}}_GH${_GITHUB_REV}${_GITHUB_EXTRACT_SUFX}
651	MASTER_SITES:= ${MASTER_SITES} ${MASTER_SITE_GITHUB:S@%SUBDIR%@${GH_ACCOUNT_${_group}}/${GH_PROJECT_${_group}}/tar.gz/${GH_TAGNAME_${_group}}?dummy=/:${_group}@}	651	DISTFILES:= ${DISTFILES} ${DISTFILE_${_groupu}}:${_group}
652	WRKSRC_${_group}:= ${WRKDIR}/${GH_PROJECT_${_group}}-${GH_TAGNAME_${_group}_EXTRACT}	652	MASTER_SITES:= ${MASTER_SITES} ${MASTER_SITE_GITHUB:S@%SUBDIR%@${GH_ACCOUNT_${_groupu}}/${GH_PROJECT_${_groupu}}/tar.gz/${GH_TAGNAME_${_groupu}}?dummy=/:${_group}@}
		653	WRKSRC_${_groupu}:= ${WRKDIR}/${GH_PROJECT_${_groupu}}-${GH_TAGNAME_${_groupu}_EXTRACT}
653	. endfor	654	. endfor
654	. endif	655	. endif
655	.endif # defined(USE_GITHUB)	656	.endif # defined(USE_GITHUB)

Lines 2188-2194 Link Here

(-)Mk/bsd.port.mk (-38 / +38 lines)
2188	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"	2188	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"
2189	@${FALSE}	2189	@${FALSE}
2190	. endif	2190	. endif
2191	_MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@}	2191	_MASTER_SITES_${_group:C@-@_@g}+= ${_S:C@^(.*/):[^/:]+$@\1@}
2192	. endfor	2192	. endfor
2193	. else	2193	. else
2194	_MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}	2194	_MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
Lines 2205-2211 Link Here
2205	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"	2205	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
2206	@${FALSE}	2206	@${FALSE}
2207	. endif	2207	. endif
2208	_PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@}	2208	_PATCH_SITES_${_group:C@-@_@g}+= ${_S:C@^(.*/):[^/:]+$@\1@}
2209	. endfor	2209	. endfor
2210	. else	2210	. else
2211	_PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}	2211	_PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
Lines 2227-2234 Link Here
2227	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"	2227	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
2228	@${FALSE}	2228	@${FALSE}
2229	. endif	2229	. endif
2230	. if defined(_MASTER_SITES_${_group})	2230	. if defined(_MASTER_SITES_${_group:C@-@_@g})
2231	_MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@}	2231	_MASTER_SITE_SUBDIR_${_group:C@-@_@g}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
2232	. endif	2232	. endif
2233	. endfor	2233	. endfor
2234	. else	2234	. else
Lines 2248-2255 Link Here
2248	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"	2248	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
2249	@${FALSE}	2249	@${FALSE}
2250	. endif	2250	. endif
2251	. if defined(_PATCH_SITES_${_group})	2251	. if defined(_PATCH_SITES_${_group:C@-@_@g})
2252	_PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@}	2252	_PATCH_SITE_SUBDIR_${_group:C@-@_@g}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
2253	. endif	2253	. endif
2254	. endfor	2254	. endfor
2255	. else	2255	. else
Lines 2265-2284 Link Here
2265	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}	2265	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
2266	. if !empty(_S_TEMP)	2266	. if !empty(_S_TEMP)
2267	. for _group in ${_S_TEMP:S/,/ /g}	2267	. for _group in ${_S_TEMP:S/,/ /g}
2268	. if !defined(_MASTER_SITE_SUBDIR_${_group})	2268	. if !defined(_MASTER_SITE_SUBDIR_${_group:C@-@_@g})
2269	MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^}	2269	MASTER_SITES_TMP= ${_MASTER_SITES_${_group:C@-@_@g}:S^%SUBDIR%/^^}
2270	. else	2270	. else
2271	_S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M%SUBDIR%/}	2271	_S_TEMP_TEMP= ${_MASTER_SITES_${_group:C@-@_@g}:M%SUBDIR%/}
2272	. if empty(_S_TEMP_TEMP)	2272	. if empty(_S_TEMP_TEMP)
2273	MASTER_SITES_TMP= ${_MASTER_SITES_${_group}}	2273	MASTER_SITES_TMP= ${_MASTER_SITES_${_group:C@-@_@g}}
2274	. else	2274	. else
2275	MASTER_SITES_TMP=	2275	MASTER_SITES_TMP=
2276	. for site in ${_MASTER_SITES_${_group}}	2276	. for site in ${_MASTER_SITES_${_group:C@-@_@g}}
2277	_S_TEMP_TEMP= ${site:M%SUBDIR%/}	2277	_S_TEMP_TEMP= ${site:M%SUBDIR%/}
2278	. if empty(_S_TEMP_TEMP)	2278	. if empty(_S_TEMP_TEMP)
2279	MASTER_SITES_TMP+= ${site}	2279	MASTER_SITES_TMP+= ${site}
2280	. else	2280	. else
2281	. for dir in ${_MASTER_SITE_SUBDIR_${_group}}	2281	. for dir in ${_MASTER_SITE_SUBDIR_${_group:C@-@_@g}}
2282	MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}	2282	MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}
2283	. endfor	2283	. endfor
2284	. endif	2284	. endif
Lines 2285-2291 Link Here
2285	. endfor	2285	. endfor
2286	. endif	2286	. endif
2287	. endif	2287	. endif
2288	_MASTER_SITES_${_group}:= ${MASTER_SITES_TMP}	2288	_MASTER_SITES_${_group:C@-@_@g}:= ${MASTER_SITES_TMP}
2289	. endfor	2289	. endfor
2290	. endif	2290	. endif
2291	.endfor	2291	.endfor
Lines 2315-2334 Link Here
2315	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}	2315	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
2316	. if !empty(_S_TEMP)	2316	. if !empty(_S_TEMP)
2317	. for _group in ${_S_TEMP:S/,/ /g}	2317	. for _group in ${_S_TEMP:S/,/ /g}
2318	. if !defined(_PATCH_SITE_SUBDIR_${_group})	2318	. if !defined(_PATCH_SITE_SUBDIR_${_group:C@-@_@g})
2319	PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^}	2319	PATCH_SITES_TMP= ${_PATCH_SITES_${_group:C@-@_@g}:S^%SUBDIR%/^^}
2320	. else	2320	. else
2321	_S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M%SUBDIR%/}	2321	_S_TEMP_TEMP= ${_PATCH_SITES_${_group:C@-@_@g}:M%SUBDIR%/}
2322	. if empty(_S_TEMP_TEMP)	2322	. if empty(_S_TEMP_TEMP)
2323	PATCH_SITES_TMP= ${_PATCH_SITES_${_group}}	2323	PATCH_SITES_TMP= ${_PATCH_SITES_${_group:C@-@_@g}}
2324	. else	2324	. else
2325	PATCH_SITES_TMP=	2325	PATCH_SITES_TMP=
2326	. for site in ${_PATCH_SITES_${_group}}	2326	. for site in ${_PATCH_SITES_${_group:C@-@_@g}}
2327	_S_TEMP_TEMP= ${site:M%SUBDIR%/}	2327	_S_TEMP_TEMP= ${site:M%SUBDIR%/}
2328	. if empty(_S_TEMP_TEMP)	2328	. if empty(_S_TEMP_TEMP)
2329	PATCH_SITES_TMP+= ${site}	2329	PATCH_SITES_TMP+= ${site}
2330	. else	2330	. else
2331	. for dir in ${_PATCH_SITE_SUBDIR_${_group}}	2331	. for dir in ${_PATCH_SITE_SUBDIR_${_group:C@-@_@g}}
2332	PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}	2332	PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}
2333	. endfor	2333	. endfor
2334	. endif	2334	. endif
Lines 2335-2341 Link Here
2335	. endfor	2335	. endfor
2336	. endif	2336	. endif
2337	. endif	2337	. endif
2338	_PATCH_SITES_${_group}:= ${PATCH_SITES_TMP}	2338	_PATCH_SITES_${_group:C@-@_@g}:= ${PATCH_SITES_TMP}
2339	. endfor	2339	. endfor
2340	. endif	2340	. endif
2341	.endfor	2341	.endfor
Lines 2389-2399 Link Here
2389	_D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//}	2389	_D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//}
2390	. if !empty(_D_TEMP)	2390	. if !empty(_D_TEMP)
2391	. for _group in ${_D_TEMP:S/^://:S/,/ /g}	2391	. for _group in ${_D_TEMP:S/^://:S/,/ /g}
2392	. if !defined(_MASTER_SITES_${_group})	2392	. if !defined(_MASTER_SITES_${_group:C@-@_@g})
2393	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}	2393	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}
2394	. if empty(_G_TEMP_TEMP)	2394	. if empty(_G_TEMP_TEMP)
2395	_G_TEMP+= ${_group}	2395	_G_TEMP+= ${_group}
2396	_MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}}	2396	_MASTER_SITES_ALL+= ${_MASTER_SITES_${_group:C@-@_@g}}
2397	. endif	2397	. endif
2398	. endif	2398	. endif
2399	. endfor	2399	. endfor
Lines 2410-2420 Link Here
2410	_P_strip= ${_P_TEMP:S/^${_P_TEMP:C/:-[^:]*$//}//:S/^://}	2410	_P_strip= ${_P_TEMP:S/^${_P_TEMP:C/:-[^:]*$//}//:S/^://}
2411	. if !empty(_P_groups)	2411	. if !empty(_P_groups)
2412	. for _group in ${_P_groups:S/,/ /g}	2412	. for _group in ${_P_groups:S/,/ /g}
2413	. if !defined(_PATCH_SITES_${_group})	2413	. if !defined(_PATCH_SITES_${_group:C@-@_@g})
2414	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}	2414	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}
2415	. if empty(_G_TEMP_TEMP)	2415	. if empty(_G_TEMP_TEMP)
2416	_G_TEMP+= ${_group}	2416	_G_TEMP+= ${_group}
2417	_PATCH_SITES_ALL+= ${_PATCH_SITES_${_group}}	2417	_PATCH_SITES_ALL+= ${_PATCH_SITES_${_group:C@-@_@g}}
2418	. endif	2418	. endif
2419	. endif	2419	. endif
2420	. endfor	2420	. endfor
Lines 2465-2473 Link Here
2465	. if !empty(_S_TEMP)	2465	. if !empty(_S_TEMP)
2466	. for _group in ${_S_TEMP:S/^://:S/,/ /g}	2466	. for _group in ${_S_TEMP:S/^://:S/,/ /g}
2467	. if !target(master-sites-${_group})	2467	. if !target(master-sites-${_group})
2468	SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} master-sites-${_group}	2468	SORTED_MASTER_SITES_${_group:C@-@_@g}_CMD= cd ${.CURDIR} && ${MAKE} master-sites-${_group}
2469	master-sites-${_group}:	2469	master-sites-${_group}:
2470	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}	2470	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group:C@-@_@g}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}
2471	. endif	2471	. endif
2472	. endfor	2472	. endfor
2473	. endif	2473	. endif
Lines 2477-2485 Link Here
2477	. if !empty(_S_TEMP)	2477	. if !empty(_S_TEMP)
2478	. for _group in ${_S_TEMP:S/^://:S/,/ /g}	2478	. for _group in ${_S_TEMP:S/^://:S/,/ /g}
2479	. if !target(patch-sites-${_group})	2479	. if !target(patch-sites-${_group})
2480	SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-${_group}	2480	SORTED_PATCH_SITES_${_group:C@-@_@g}_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-${_group}
2481	patch-sites-${_group}:	2481	patch-sites-${_group}:
2482	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}	2482	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group:C@-@_@g}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}
2483	. endif	2483	. endif
2484	. endfor	2484	. endfor
2485	. endif	2485	. endif
Lines 2493-2500 Link Here
2493	_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://}	2493	_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://}
2494	. if !empty(_F_TEMP)	2494	. if !empty(_F_TEMP)
2495	. for _group in ${_F_TEMP:S/,/ /g}	2495	. for _group in ${_F_TEMP:S/,/ /g}
2496	. if defined(_MASTER_SITES_${_group})	2496	. if defined(_MASTER_SITES_${_group:C@-@_@g})
2497	_MASTER_SITES_ENV+= _MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}"	2497	_MASTER_SITES_ENV+= _MASTER_SITES_${_group:C@-@_@g}="${_MASTER_SITES_${_group:C@-@_@g}}"
2498	. endif	2498	. endif
2499	. endfor	2499	. endfor
2500	. endif	2500	. endif
Lines 2504-2511 Link Here
2504	_F_TEMP= ${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}	2504	_F_TEMP= ${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}
2505	. if !empty(_F_TEMP)	2505	. if !empty(_F_TEMP)
2506	. for _group in ${_F_TEMP:S/,/ /g}	2506	. for _group in ${_F_TEMP:S/,/ /g}
2507	. if defined(_PATCH_SITES_${_group})	2507	. if defined(_PATCH_SITES_${_group:C@-@_@g})
2508	_PATCH_SITES_ENV+= _PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}"	2508	_PATCH_SITES_ENV+= _PATCH_SITES_${_group:C@-@_@g}="${_PATCH_SITES_${_group:C@-@_@g}}"
2509	. endif	2509	. endif
2510	. endfor	2510	. endfor
2511	. endif	2511	. endif
Lines 3061-3067 Link Here
3061	if [ $$_file = $$file ]; then \	3061	if [ $$_file = $$file ]; then \
3062	select=''; \	3062	select=''; \
3063	else \	3063	else \
3064	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	3064	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e 's/-/_/'` ; \
3065	fi; \	3065	fi; \
3066	force_fetch=false; \	3066	force_fetch=false; \
3067	filebasename=$${file##*/}; \	3067	filebasename=$${file##*/}; \
Lines 3145-3151 Link Here
3145	if [ $$_file = $$file ]; then \	3145	if [ $$_file = $$file ]; then \
3146	select=''; \	3146	select=''; \
3147	else \	3147	else \
3148	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	3148	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e 's/-/_/g'` ; \
3149	fi; \	3149	fi; \
3150	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \	3150	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \
3151	force_fetch=false; \	3151	force_fetch=false; \
Lines 4005-4011 Link Here
4005	if [ $$_file = $$file ]; then \	4005	if [ $$_file = $$file ]; then \
4006	select=''; \	4006	select=''; \
4007	else \	4007	else \
4008	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4008	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e 's/-/_/g'` ; \
4009	fi; \	4009	fi; \
4010	if [ ! -f $$file -a ! -f $${file##*/} ]; then \	4010	if [ ! -f $$file -a ! -f $${file##*/} ]; then \
4011	if [ ! -z "$$select" ] ; then \	4011	if [ ! -z "$$select" ] ; then \
Lines 4046-4052 Link Here
4046	if [ $$_file = $$file ]; then \	4046	if [ $$_file = $$file ]; then \
4047	select=''; \	4047	select=''; \
4048	else \	4048	else \
4049	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4049	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e 's/-/_/g'` ; \
4050	fi; \	4050	fi; \
4051	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \	4051	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \
4052	if [ ! -f $$file -a ! -f $${file##*/} ]; then \	4052	if [ ! -f $$file -a ! -f $${file##*/} ]; then \
Lines 4088-4094 Link Here
4088	if [ $$_file = $$file ]; then \	4088	if [ $$_file = $$file ]; then \
4089	select=''; \	4089	select=''; \
4090	else \	4090	else \
4091	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4091	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e 's/-/_/g'` ; \
4092	fi; \	4092	fi; \
4093	if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \	4093	if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
4094	if [ ! -z "$$select" ] ; then \	4094	if [ ! -z "$$select" ] ; then \
Lines 4121-4127 Link Here
4121	if [ $$_file = $$file ]; then \	4121	if [ $$_file = $$file ]; then \
4122	select=''; \	4122	select=''; \
4123	else \	4123	else \
4124	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4124	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e 's/-/_/g'` ; \
4125	fi; \	4125	fi; \
4126	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \	4126	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \
4127	fileptn=`${ECHO_CMD} $$file \| ${SED} 's\|/\|\\\\/\|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \	4127	fileptn=`${ECHO_CMD} $$file \| ${SED} 's\|/\|\\\\/\|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \