Attachment #164190 for bug #205032

Lines 1425-1430 Link Here

(-)Mk/bsd.port.mk (-38 / +42 lines)
1425	UID!= ${ID} -u	1425	UID!= ${ID} -u
1426	.endif	1426	.endif
1427		1427
		1428	# allow group names have period and hyphen
		1429	_GRP_RE=C@(\.\|-)@_@g
		1430	_GRP_RE_SED='s/[.-]/_/g'
		1431
1428	DESTDIRNAME?= DESTDIR	1432	DESTDIRNAME?= DESTDIR
1429		1433
1430	# setup empty variables for USES targets	1434	# setup empty variables for USES targets
Lines 2188-2194 Link Here
2188	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"	2192	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITES"
2189	@${FALSE}	2193	@${FALSE}
2190	. endif	2194	. endif
2191	_MASTER_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@}	2195	_MASTER_SITES_${_group:${_GRP_RE}}+= ${_S:C@^(.*/):[^/:]+$@\1@}
2192	. endfor	2196	. endfor
2193	. else	2197	. else
2194	_MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}	2198	_MASTER_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
Lines 2205-2211 Link Here
2205	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"	2209	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITES"
2206	@${FALSE}	2210	@${FALSE}
2207	. endif	2211	. endif
2208	_PATCH_SITES_${_group}+= ${_S:C@^(.*/):[^/:]+$@\1@}	2212	_PATCH_SITES_${_group:${_GRP_RE}}+= ${_S:C@^(.*/):[^/:]+$@\1@}
2209	. endfor	2213	. endfor
2210	. else	2214	. else
2211	_PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}	2215	_PATCH_SITES_DEFAULT+= ${_S:C@^(.*/):[^/:]+$@\1@}
Lines 2227-2234 Link Here
2227	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"	2231	@${ECHO_MSG} "used in group definitions. Please fix your MASTER_SITE_SUBDIR"
2228	@${FALSE}	2232	@${FALSE}
2229	. endif	2233	. endif
2230	. if defined(_MASTER_SITES_${_group})	2234	. if defined(_MASTER_SITES_${_group:${_GRP_RE}})
2231	_MASTER_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@}	2235	_MASTER_SITE_SUBDIR_${_group:${_GRP_RE}}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
2232	. endif	2236	. endif
2233	. endfor	2237	. endfor
2234	. else	2238	. else
Lines 2248-2255 Link Here
2248	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"	2252	@${ECHO_MSG} "used in group definitions. Please fix your PATCH_SITE_SUBDIR"
2249	@${FALSE}	2253	@${FALSE}
2250	. endif	2254	. endif
2251	. if defined(_PATCH_SITES_${_group})	2255	. if defined(_PATCH_SITES_${_group:${_GRP_RE}})
2252	_PATCH_SITE_SUBDIR_${_group}+= ${_S:C@^(.*)/:[^/:]+$@\1@}	2256	_PATCH_SITE_SUBDIR_${_group:${_GRP_RE}}+= ${_S:C@^(.*)/:[^/:]+$@\1@}
2253	. endif	2257	. endif
2254	. endfor	2258	. endfor
2255	. else	2259	. else
Lines 2265-2284 Link Here
2265	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}	2269	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
2266	. if !empty(_S_TEMP)	2270	. if !empty(_S_TEMP)
2267	. for _group in ${_S_TEMP:S/,/ /g}	2271	. for _group in ${_S_TEMP:S/,/ /g}
2268	. if !defined(_MASTER_SITE_SUBDIR_${_group})	2272	. if !defined(_MASTER_SITE_SUBDIR_${_group:${_GRP_RE}})
2269	MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^}	2273	MASTER_SITES_TMP= ${_MASTER_SITES_${_group:${_GRP_RE}}:S^%SUBDIR%/^^}
2270	. else	2274	. else
2271	_S_TEMP_TEMP= ${_MASTER_SITES_${_group}:M%SUBDIR%/}	2275	_S_TEMP_TEMP= ${_MASTER_SITES_${_group:${_GRP_RE}}:M%SUBDIR%/}
2272	. if empty(_S_TEMP_TEMP)	2276	. if empty(_S_TEMP_TEMP)
2273	MASTER_SITES_TMP= ${_MASTER_SITES_${_group}}	2277	MASTER_SITES_TMP= ${_MASTER_SITES_${_group:${_GRP_RE}}}
2274	. else	2278	. else
2275	MASTER_SITES_TMP=	2279	MASTER_SITES_TMP=
2276	. for site in ${_MASTER_SITES_${_group}}	2280	. for site in ${_MASTER_SITES_${_group:${_GRP_RE}}}
2277	_S_TEMP_TEMP= ${site:M%SUBDIR%/}	2281	_S_TEMP_TEMP= ${site:M%SUBDIR%/}
2278	. if empty(_S_TEMP_TEMP)	2282	. if empty(_S_TEMP_TEMP)
2279	MASTER_SITES_TMP+= ${site}	2283	MASTER_SITES_TMP+= ${site}
2280	. else	2284	. else
2281	. for dir in ${_MASTER_SITE_SUBDIR_${_group}}	2285	. for dir in ${_MASTER_SITE_SUBDIR_${_group:${_GRP_RE}}}
2282	MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}	2286	MASTER_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}
2283	. endfor	2287	. endfor
2284	. endif	2288	. endif
Lines 2285-2291 Link Here
2285	. endfor	2289	. endfor
2286	. endif	2290	. endif
2287	. endif	2291	. endif
2288	_MASTER_SITES_${_group}:= ${MASTER_SITES_TMP}	2292	_MASTER_SITES_${_group:${_GRP_RE}}:= ${MASTER_SITES_TMP}
2289	. endfor	2293	. endfor
2290	. endif	2294	. endif
2291	.endfor	2295	.endfor
Lines 2315-2334 Link Here
2315	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}	2319	_S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://}
2316	. if !empty(_S_TEMP)	2320	. if !empty(_S_TEMP)
2317	. for _group in ${_S_TEMP:S/,/ /g}	2321	. for _group in ${_S_TEMP:S/,/ /g}
2318	. if !defined(_PATCH_SITE_SUBDIR_${_group})	2322	. if !defined(_PATCH_SITE_SUBDIR_${_group:${_GRP_RE}})
2319	PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^}	2323	PATCH_SITES_TMP= ${_PATCH_SITES_${_group:${_GRP_RE}}:S^%SUBDIR%/^^}
2320	. else	2324	. else
2321	_S_TEMP_TEMP= ${_PATCH_SITES_${_group}:M%SUBDIR%/}	2325	_S_TEMP_TEMP= ${_PATCH_SITES_${_group:${_GRP_RE}}:M%SUBDIR%/}
2322	. if empty(_S_TEMP_TEMP)	2326	. if empty(_S_TEMP_TEMP)
2323	PATCH_SITES_TMP= ${_PATCH_SITES_${_group}}	2327	PATCH_SITES_TMP= ${_PATCH_SITES_${_group:${_GRP_RE}}}
2324	. else	2328	. else
2325	PATCH_SITES_TMP=	2329	PATCH_SITES_TMP=
2326	. for site in ${_PATCH_SITES_${_group}}	2330	. for site in ${_PATCH_SITES_${_group:${_GRP_RE}}}
2327	_S_TEMP_TEMP= ${site:M%SUBDIR%/}	2331	_S_TEMP_TEMP= ${site:M%SUBDIR%/}
2328	. if empty(_S_TEMP_TEMP)	2332	. if empty(_S_TEMP_TEMP)
2329	PATCH_SITES_TMP+= ${site}	2333	PATCH_SITES_TMP+= ${site}
2330	. else	2334	. else
2331	. for dir in ${_PATCH_SITE_SUBDIR_${_group}}	2335	. for dir in ${_PATCH_SITE_SUBDIR_${_group:${_GRP_RE}}}
2332	PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}	2336	PATCH_SITES_TMP+= ${site:S^%SUBDIR%^\${dir}^}
2333	. endfor	2337	. endfor
2334	. endif	2338	. endif
Lines 2335-2341 Link Here
2335	. endfor	2339	. endfor
2336	. endif	2340	. endif
2337	. endif	2341	. endif
2338	_PATCH_SITES_${_group}:= ${PATCH_SITES_TMP}	2342	_PATCH_SITES_${_group:${_GRP_RE}}:= ${PATCH_SITES_TMP}
2339	. endfor	2343	. endfor
2340	. endif	2344	. endif
2341	.endfor	2345	.endfor
Lines 2389-2399 Link Here
2389	_D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//}	2393	_D_TEMP= ${_D:S/^${_D:C/:[^:]+$//}//}
2390	. if !empty(_D_TEMP)	2394	. if !empty(_D_TEMP)
2391	. for _group in ${_D_TEMP:S/^://:S/,/ /g}	2395	. for _group in ${_D_TEMP:S/^://:S/,/ /g}
2392	. if !defined(_MASTER_SITES_${_group})	2396	. if !defined(_MASTER_SITES_${_group:${_GRP_RE}})
2393	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}	2397	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}
2394	. if empty(_G_TEMP_TEMP)	2398	. if empty(_G_TEMP_TEMP)
2395	_G_TEMP+= ${_group}	2399	_G_TEMP+= ${_group}
2396	_MASTER_SITES_ALL+= ${_MASTER_SITES_${_group}}	2400	_MASTER_SITES_ALL+= ${_MASTER_SITES_${_group:${_GRP_RE}}}
2397	. endif	2401	. endif
2398	. endif	2402	. endif
2399	. endfor	2403	. endfor
Lines 2410-2420 Link Here
2410	_P_strip= ${_P_TEMP:S/^${_P_TEMP:C/:-[^:]*$//}//:S/^://}	2414	_P_strip= ${_P_TEMP:S/^${_P_TEMP:C/:-[^:]*$//}//:S/^://}
2411	. if !empty(_P_groups)	2415	. if !empty(_P_groups)
2412	. for _group in ${_P_groups:S/,/ /g}	2416	. for _group in ${_P_groups:S/,/ /g}
2413	. if !defined(_PATCH_SITES_${_group})	2417	. if !defined(_PATCH_SITES_${_group:${_GRP_RE}})
2414	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}	2418	_G_TEMP_TEMP= ${_G_TEMP:M/${_group}/}
2415	. if empty(_G_TEMP_TEMP)	2419	. if empty(_G_TEMP_TEMP)
2416	_G_TEMP+= ${_group}	2420	_G_TEMP+= ${_group}
2417	_PATCH_SITES_ALL+= ${_PATCH_SITES_${_group}}	2421	_PATCH_SITES_ALL+= ${_PATCH_SITES_${_group:${_GRP_RE}}}
2418	. endif	2422	. endif
2419	. endif	2423	. endif
2420	. endfor	2424	. endfor
Lines 2465-2473 Link Here
2465	. if !empty(_S_TEMP)	2469	. if !empty(_S_TEMP)
2466	. for _group in ${_S_TEMP:S/^://:S/,/ /g}	2470	. for _group in ${_S_TEMP:S/^://:S/,/ /g}
2467	. if !target(master-sites-${_group})	2471	. if !target(master-sites-${_group})
2468	SORTED_MASTER_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} master-sites-${_group}	2472	SORTED_MASTER_SITES_${_group:${_GRP_RE}}_CMD= cd ${.CURDIR} && ${MAKE} master-sites-${_group}
2469	master-sites-${_group}:	2473	master-sites-${_group}:
2470	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}	2474	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_MASTER_SITES_${_group:${_GRP_RE}}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}
2471	. endif	2475	. endif
2472	. endfor	2476	. endfor
2473	. endif	2477	. endif
Lines 2477-2485 Link Here
2477	. if !empty(_S_TEMP)	2481	. if !empty(_S_TEMP)
2478	. for _group in ${_S_TEMP:S/^://:S/,/ /g}	2482	. for _group in ${_S_TEMP:S/^://:S/,/ /g}
2479	. if !target(patch-sites-${_group})	2483	. if !target(patch-sites-${_group})
2480	SORTED_PATCH_SITES_${_group}_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-${_group}	2484	SORTED_PATCH_SITES_${_group:${_GRP_RE}}_CMD= cd ${.CURDIR} && ${MAKE} patch-sites-${_group}
2481	patch-sites-${_group}:	2485	patch-sites-${_group}:
2482	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}	2486	@${ECHO_CMD} ${_MASTER_SITE_OVERRIDE} `${ECHO_CMD} '${_PATCH_SITES_${_group:${_GRP_RE}}}' \| ${AWK} '${MASTER_SORT_AWK:S\|\\\|\\\\\|g}'` ${_MASTER_SITE_BACKUP}
2483	. endif	2487	. endif
2484	. endfor	2488	. endfor
2485	. endif	2489	. endif
Lines 2493-2500 Link Here
2493	_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://}	2497	_F_TEMP= ${_F:S/^${_F:C/:[^:]+$//}//:S/^://}
2494	. if !empty(_F_TEMP)	2498	. if !empty(_F_TEMP)
2495	. for _group in ${_F_TEMP:S/,/ /g}	2499	. for _group in ${_F_TEMP:S/,/ /g}
2496	. if defined(_MASTER_SITES_${_group})	2500	. if defined(_MASTER_SITES_${_group:${_GRP_RE}})
2497	_MASTER_SITES_ENV+= _MASTER_SITES_${_group}="${_MASTER_SITES_${_group}}"	2501	_MASTER_SITES_ENV+= _MASTER_SITES_${_group:${_GRP_RE}}="${_MASTER_SITES_${_group:${_GRP_RE}}}"
2498	. endif	2502	. endif
2499	. endfor	2503	. endfor
2500	. endif	2504	. endif
Lines 2504-2511 Link Here
2504	_F_TEMP= ${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}	2508	_F_TEMP= ${_F:S/^${_F:C/:[^-:][^:]*$//}//:S/^://}
2505	. if !empty(_F_TEMP)	2509	. if !empty(_F_TEMP)
2506	. for _group in ${_F_TEMP:S/,/ /g}	2510	. for _group in ${_F_TEMP:S/,/ /g}
2507	. if defined(_PATCH_SITES_${_group})	2511	. if defined(_PATCH_SITES_${_group:${_GRP_RE}})
2508	_PATCH_SITES_ENV+= _PATCH_SITES_${_group}="${_PATCH_SITES_${_group}}"	2512	_PATCH_SITES_ENV+= _PATCH_SITES_${_group:${_GRP_RE}}="${_PATCH_SITES_${_group:${_GRP_RE}}}"
2509	. endif	2513	. endif
2510	. endfor	2514	. endfor
2511	. endif	2515	. endif
Lines 3061-3067 Link Here
3061	if [ $$_file = $$file ]; then \	3065	if [ $$_file = $$file ]; then \
3062	select=''; \	3066	select=''; \
3063	else \	3067	else \
3064	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	3068	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e ${_GRP_RE_SED}` ; \
3065	fi; \	3069	fi; \
3066	force_fetch=false; \	3070	force_fetch=false; \
3067	filebasename=$${file##*/}; \	3071	filebasename=$${file##*/}; \
Lines 3145-3151 Link Here
3145	if [ $$_file = $$file ]; then \	3149	if [ $$_file = $$file ]; then \
3146	select=''; \	3150	select=''; \
3147	else \	3151	else \
3148	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	3152	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e ${_GRP_RE_SED}` ; \
3149	fi; \	3153	fi; \
3150	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \	3154	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \
3151	force_fetch=false; \	3155	force_fetch=false; \
Lines 4005-4011 Link Here
4005	if [ $$_file = $$file ]; then \	4009	if [ $$_file = $$file ]; then \
4006	select=''; \	4010	select=''; \
4007	else \	4011	else \
4008	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4012	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e ${_GRP_RE_SED}` ; \
4009	fi; \	4013	fi; \
4010	if [ ! -f $$file -a ! -f $${file##*/} ]; then \	4014	if [ ! -f $$file -a ! -f $${file##*/} ]; then \
4011	if [ ! -z "$$select" ] ; then \	4015	if [ ! -z "$$select" ] ; then \
Lines 4046-4052 Link Here
4046	if [ $$_file = $$file ]; then \	4050	if [ $$_file = $$file ]; then \
4047	select=''; \	4051	select=''; \
4048	else \	4052	else \
4049	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4053	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e ${_GRP_RE_SED}` ; \
4050	fi; \	4054	fi; \
4051	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \	4055	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \
4052	if [ ! -f $$file -a ! -f $${file##*/} ]; then \	4056	if [ ! -f $$file -a ! -f $${file##*/} ]; then \
Lines 4088-4094 Link Here
4088	if [ $$_file = $$file ]; then \	4092	if [ $$_file = $$file ]; then \
4089	select=''; \	4093	select=''; \
4090	else \	4094	else \
4091	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4095	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e ${_GRP_RE_SED}` ; \
4092	fi; \	4096	fi; \
4093	if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \	4097	if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
4094	if [ ! -z "$$select" ] ; then \	4098	if [ ! -z "$$select" ] ; then \
Lines 4121-4127 Link Here
4121	if [ $$_file = $$file ]; then \	4125	if [ $$_file = $$file ]; then \
4122	select=''; \	4126	select=''; \
4123	else \	4127	else \
4124	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g'` ; \	4128	select=`${ECHO_CMD} $${_file##*:} \| ${SED} -e 's/,/ /g' -e ${_GRP_RE_SED}` ; \
4125	fi; \	4129	fi; \
4126	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \	4130	file=`${ECHO_CMD} $$file \| ${SED} -E -e 's/:-[^:]+$$//'` ; \
4127	fileptn=`${ECHO_CMD} $$file \| ${SED} 's\|/\|\\\\/\|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \	4131	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:${_GRP_RE}}=	${_A:C@^(.*):[^/:]+$@\1@}
.      endfor
.    else
GH_ACCOUNT_DEFAULT=	${_A:C@^(.*):[^/:]+$@\1@}

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

.        if !${_GITHUB_GROUPS:M${_group}}
_GITHUB_GROUPS+=	${_group}
.         endif
GH_TAGNAME_${_group:${_GRP_RE}}=	${_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:${_GRP_RE}}
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:${_GRP_RE}}= ${_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:${_GRP_RE}}= ${_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:${_GRP_RE}}= ${_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:${_GRP_RE}}
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)