mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-24 00:45:52 +00:00
Code Issues Releases Activity

Use the same, working, logic for DIST/PATCH group parsing everywhere.

Browse Source 
With hat:	portmgr
Sponsored by:	Absolight
This commit is contained in:
Mathieu Arnold 2015-05-14 10:10:16 +00:00
parent 2f140cb709
commit 18cec56a95
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=386310
1 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Mk/bsd.port.mk
View File

@ -3177,7 +3177,11 @@ do-fetch:
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^-:][^:]*$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ $$_file = $$file ]; then \
select=''; \
else \
select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g'` ; \
fi; \
file=`${ECHO_CMD} $$file | ${SED} -E -e 's/:-[^:]+$$//'` ; \
force_fetch=false; \
filebasename=$${file##*/}; \
@ -3997,7 +4001,11 @@ fetch-list:
${_MASTER_SITES_ENV} ; \
for _file in ${DISTFILES}; do \
file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ $$_file = $$file ]; then \
select=''; \
else \
select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g'` ; \
fi; \
if [ ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
__MASTER_SITES_TMP= ; \
@ -4034,7 +4042,11 @@ fetch-list:
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^-:][^:]*$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ $$_file = $$file ]; then \
select=''; \
else \
select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g'` ; \
fi; \
file=`${ECHO_CMD} $$file | ${SED} -E -e 's/:-[^:]+$$//'` ; \
if [ ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
@ -4072,7 +4084,11 @@ fetch-url-list-int:
for _file in ${DISTFILES}; do \
file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^:]+$$//'` ; \
fileptn=`${ECHO_CMD} $$file | ${SED} 's|/|\\\\/|g;s/\./\\\\./g;s/\+/\\\\+/g;s/\?/\\\\?/g'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ $$_file = $$file ]; then \
select=''; \
else \
select=`${ECHO_CMD} $${_file##*:} | ${SED} -e 's/,/ /g'` ; \
fi; \
if [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \
if [ ! -z "$$select" ] ; then \
__MASTER_SITES_TMP= ; \
@ -4101,7 +4117,11 @@ fetch-url-list-int:
${_PATCH_SITES_ENV} ; \
for _file in ${PATCHFILES}; do \
file=`${ECHO_CMD} $$_file | ${SED} -E -e 's/:[^-:][^:]*$$//'` ; \
select=`${ECHO_CMD} $${_file#$${file}} | ${SED} -e 's/^://' -e 's/,/ /g'` ; \
if [ $$_file = $$file ]; then \
select=''; \
else \
select=`${ECHO_CMD} $${_file##*:} | ${SED} -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 [ ! -z "${LISTALL}" -o ! -f $$file -a ! -f $${file##*/} ]; then \