diff options
| author | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-10-20 19:55:03 +0800 |
|---|---|---|
| committer | kwm <kwm@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2013-10-20 19:55:03 +0800 |
| commit | 8e36e108253eb861db7a162232a46ea99cec853e (patch) | |
| tree | 2cd8f33edef24dd42043a946b98ef4a7e6a8bd71 | |
| parent | 290c083257553e25886fa37c4933d709e4ea39f7 (diff) | |
| download | xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.tar xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.tar.gz xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.tar.bz2 xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.tar.lz xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.tar.xz xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.tar.zst xorg-devel-ports-8e36e108253eb861db7a162232a46ea99cec853e.zip | |
Sync with port 331002.
git-svn-id: https://trillian.chruetertee.ch/svn/ports/trunk@1194 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | Mk/bsd.port.mk | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 03d261b..1576015 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3546,7 +3546,13 @@ do-fetch: else \ SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ fi; \ - for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ + sites_remaining=0; \ + sites="`eval $$SORTED_PATCH_SITES_CMD_TMP`"; \ + for site in $${sites}; do \ + sites_remaining=$$(($${sites_remaining} + 1)); \ + done; \ + for site in $${sites}; do \ + sites_remaining=$$(($${sites_remaining} - 1)); \ ${ECHO_MSG} "=> Attempting to fetch $${site}$${file}"; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ @@ -3555,7 +3561,16 @@ do-fetch: *) args=$${site}$${file};; \ esac; \ if ${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} $${args} ${FETCH_AFTER_ARGS}; then \ - continue 2; \ + actual_size=`stat -f %z "$${file}"`; \ + if [ -n "${DISABLE_SIZE}" ] || [ -z "$${CKSIZE}" ] || [ $${actual_size} -eq $${CKSIZE} ]; then \ + continue 2; \ + else \ + ${ECHO_MSG} "=> Fetched file size mismatch (expected $${CKSIZE}, actual $${actual_size})"; \ + if [ $${sites_remaining} -gt 1 ]; then \ + ${ECHO_MSG} "=> Trying next site"; \ + ${RM} -f $${file}; \ + fi; \ + fi; \ fi; \ done; \ ${ECHO_MSG} "=> Couldn't fetch it - please try to retrieve this";\ @@ -4132,7 +4147,7 @@ install-ldconfig-file: @${MKDIR} ${STAGEDIR}${PREFIX}/${LDCONFIG_32DIR} .endif @${ECHO_CMD} ${USE_LDCONFIG32} | ${TR} ' ' '\n' \ - > ${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} + > ${STAGEDIR}${PREFIX}/${LDCONFIG32_DIR}/${UNIQUENAME} @${ECHO_CMD} "@cwd ${PREFIX}" >> ${TMPPLIST} @${ECHO_CMD} ${LDCONFIG32_DIR}/${UNIQUENAME} >> ${TMPPLIST} .if defined(NO_LDCONFIG_MTREE) @@ -4350,7 +4365,7 @@ _STAGE_DEP= build _STAGE_SEQ= stage-message stage-dir run-depends lib-depends apply-slist pre-install generate-plist \ pre-su-install .if defined(NEED_ROOT) -_STAGE_SUSEQ= create-users-groups do-install post-install post-stage compress-man \ +_STAGE_SUSEQ= create-users-groups do-install post-install post-install-script post-stage compress-man \ install-rc-script install-ldconfig-file install-license \ install-desktop-entries add-plist-info add-plist-docs add-plist-examples \ add-plist-data add-plist-post fix-plist-sequence @@ -4358,7 +4373,7 @@ _STAGE_SUSEQ= create-users-groups do-install post-install post-stage compress-ma _STAGE_SUSEQ+= stage-qa .endif .else -_STAGE_SEQ+= create-users-groups do-install post-install post-stage compress-man \ +_STAGE_SEQ+= create-users-groups do-install post-install post-install-script post-stage compress-man \ install-rc-script install-ldconfig-file install-license \ install-desktop-entries add-plist-info add-plist-docs add-plist-examples \ add-plist-data add-plist-post fix-plist-sequence |