View | Details | Raw Unified | Return to bug 2949 | Differences between
and this patch

Collapse All | Expand All

(-)bsd.port.mk (-4 / +5 lines)
Lines 164-169 Link Here
164
#
164
#
165
# FETCH_CMD		  - Full path to ftp/http fetch command if not in $PATH
165
# FETCH_CMD		  - Full path to ftp/http fetch command if not in $PATH
166
#				  (default: /usr/bin/fetch).
166
#				  (default: /usr/bin/fetch).
167
# FETCH_ENV			- Environment to pass to fetch command
167
# FETCH_BEFORE_ARGS -
168
# FETCH_BEFORE_ARGS -
168
#				  Arguments to ${FETCH_CMD} before filename (default: none).
169
#				  Arguments to ${FETCH_CMD} before filename (default: none).
169
# FETCH_AFTER_ARGS -
170
# FETCH_AFTER_ARGS -
Lines 768-774 Link Here
768
			${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
769
			${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
769
			for site in ${MASTER_SITES}; do \
770
			for site in ${MASTER_SITES}; do \
770
			    ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
771
			    ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
771
				if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS}; then \
772
				if ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS}; then \
772
					continue 2; \
773
					continue 2; \
773
				fi \
774
				fi \
774
			done; \
775
			done; \
Lines 790-796 Link Here
790
			${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
791
			${ECHO_MSG} ">> $$file doesn't seem to exist on this system."; \
791
			for site in ${PATCH_SITES}; do \
792
			for site in ${PATCH_SITES}; do \
792
			    ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
793
			    ${ECHO_MSG} ">> Attempting to fetch from $${site}."; \
793
				if ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS}; then \
794
				if ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} ${FETCH_AFTER_ARGS}; then \
794
					continue 2; \
795
					continue 2; \
795
				fi \
796
				fi \
796
			done; \
797
			done; \
Lines 1194-1200 Link Here
1194
	 for file in ${DISTFILES}; do \
1195
	 for file in ${DISTFILES}; do \
1195
		if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
1196
		if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
1196
			for site in ${MASTER_SITES}; do \
1197
			for site in ${MASTER_SITES}; do \
1197
				${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '||' ; \
1198
				${ECHO} -n ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '||' ; \
1198
					break; \
1199
					break; \
1199
			done; \
1200
			done; \
1200
			${ECHO} "echo $${file} not fetched" ; \
1201
			${ECHO} "echo $${file} not fetched" ; \
Lines 1205-1211 Link Here
1205
	 for file in ${PATCHFILES}; do \
1206
	 for file in ${PATCHFILES}; do \
1206
		if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
1207
		if [ ! -f $$file -a ! -f `${BASENAME} $$file` ]; then \
1207
			for site in ${PATCH_SITES}; do \
1208
			for site in ${PATCH_SITES}; do \
1208
				${ECHO} -n ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '||' ; \
1209
				${ECHO} -n ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${site}$${file} "${FETCH_AFTER_ARGS}" '||' ; \
1209
					break; \
1210
					break; \
1210
			done; \
1211
			done; \
1211
			${ECHO} "echo $${file} not fetched" ; \
1212
			${ECHO} "echo $${file} not fetched" ; \

Return to bug 2949