diff options
| author | mat <mat@FreeBSD.org> | 2015-05-14 18:10:16 +0800 |
|---|---|---|
| committer | mat <mat@FreeBSD.org> | 2015-05-14 18:10:16 +0800 |
| commit | c4b2fd081621434610f5bc010fea10512792f2c9 (patch) | |
| tree | fc35cb22aef91cc271373594cb633c49144a93ac /Mk | |
| parent | e0f8844992cbed92a540d6dc9a7b3498141957f3 (diff) | |
| download | freebsd-ports-gnome-c4b2fd081621434610f5bc010fea10512792f2c9.tar.gz freebsd-ports-gnome-c4b2fd081621434610f5bc010fea10512792f2c9.tar.zst freebsd-ports-gnome-c4b2fd081621434610f5bc010fea10512792f2c9.zip | |
Use the same, working, logic for DIST/PATCH group parsing everywhere.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index a7ccb4bce23c..bd17be75731e 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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 \ |