diff options
| author | kris <kris@FreeBSD.org> | 2002-04-02 05:24:33 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2002-04-02 05:24:33 +0000 |
| commit | 65e6882f1cd16071872301d34d74efa5825d1b5c (patch) | |
| tree | 7202b0b04357b9c00c4f351a36fc886082206022 /Mk | |
| parent | 48db52a3881e331c1a6036675a079b7f3dbd569a (diff) | |
| download | FreeBSD-ports-65e6882f1cd16071872301d34d74efa5825d1b5c.zip FreeBSD-ports-65e6882f1cd16071872301d34d74efa5825d1b5c.tar.gz | |
Fix a fetch bug in MASTER_SITES_NN introduced in rev 1.396.
Submitted by: lioux
PR: ports/36078 (part of)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 098f784..35e2826 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1360,22 +1360,22 @@ _PATCH_SITE_SUBDIR_DEFAULT+= ${_S:C@^(.*)/:[^/:]+$@\1@} # XXX simpler/faster solution but not the best space wise, suggestions please .for _S in ${MASTER_SITES} _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -MASTER_SITES_TMP= . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/,/ /g} . if defined(_MASTER_SITE_SUBDIR_${_group}) +MASTER_SITES_TMP= . for dir in ${_MASTER_SITE_SUBDIR_${_group}} MASTER_SITES_TMP+= ${_MASTER_SITES_${_group}:S^%SUBDIR%^${dir}^} . endfor . else -MASTER_SITES_TMP+= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} +MASTER_SITES_TMP= ${_MASTER_SITES_${_group}:S^%SUBDIR%/^^} . endif _MASTER_SITES_${_group}:= ${MASTER_SITES_TMP} . endfor . endif .endfor -MASTER_SITES_TMP= .if defined(_MASTER_SITE_SUBDIR_DEFAULT) +MASTER_SITES_TMP= . for dir in ${_MASTER_SITE_SUBDIR_DEFAULT} MASTER_SITES_TMP+= ${_MASTER_SITES_DEFAULT:S^%SUBDIR%^${dir}^} . endfor @@ -1386,22 +1386,22 @@ _MASTER_SITES_DEFAULT:= ${MASTER_SITES_TMP} MASTER_SITES_TMP= .for _S in ${PATCH_SITES} _S_TEMP= ${_S:S/^${_S:C@/:[^/:]+$@/@}//:S/^://} -PATCH_SITES_TMP= . if !empty(_S_TEMP) . for _group in ${_S_TEMP:S/,/ /g} . if defined(_PATCH_SITE_SUBDIR_${_group}) +PATCH_SITES_TMP= . for dir in ${_PATCH_SITE_SUBDIR_${_group}} PATCH_SITES_TMP+= ${_PATCH_SITES_${_group}:S^%SUBDIR%^${dir}^} . endfor . else -PATCH_SITES_TMP+= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} +PATCH_SITES_TMP= ${_PATCH_SITES_${_group}:S^%SUBDIR%/^^} . endif _PATCH_SITES_${_group}:= ${PATCH_SITES_TMP} . endfor . endif .endfor -PATCH_SITES_TMP= .if defined(_PATCH_SITE_SUBDIR_DEFAULT) +PATCH_SITES_TMP= . for dir in ${_PATCH_SITE_SUBDIR_DEFAULT} PATCH_SITES_TMP+= ${_PATCH_SITES_DEFAULT:S^%SUBDIR%^${dir}^} . endfor |
