diff options
| author | miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2011-02-19 00:15:56 +0800 |
|---|---|---|
| committer | miwi <miwi@058c260c-8361-11dd-a0ac-aa2bafec7d09> | 2011-02-19 00:15:56 +0800 |
| commit | 4207532167df12eb772d649e992d9afcbcb80967 (patch) | |
| tree | cada9984813f79befc102b716b243e1741618f48 | |
| parent | 5a424482f0b69e00e866603092a3d14562311207 (diff) | |
| download | xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.tar xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.tar.gz xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.tar.bz2 xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.tar.lz xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.tar.xz xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.tar.zst xorg-devel-ports-4207532167df12eb772d649e992d9afcbcb80967.zip | |
- Sync with FreeBSD Ports
git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-dev@211 058c260c-8361-11dd-a0ac-aa2bafec7d09
| -rw-r--r-- | Mk/bsd.port.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 627ae2c..882d509 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -1,7 +1,7 @@ #-*- mode: makefile; tab-width: 4; -*- # ex:ts=4 # -# $FreeBSD: ports/Mk/bsd.port.mk,v 1.667 2011/02/05 15:55:58 erwin Exp $ +# $FreeBSD: ports/Mk/bsd.port.mk,v 1.669 2011/02/16 10:43:53 erwin Exp $ # $NetBSD: $ # # bsd.port.mk - 940820 Jordan K. Hubbard. @@ -3574,7 +3574,7 @@ do-fetch: SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \ fi; \ for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \ - ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ + ${ECHO_MSG} "=> Attempting to fetch $${site}/$${file}"; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ @@ -3626,7 +3626,7 @@ do-fetch: SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \ fi; \ for site in `eval $$SORTED_PATCH_SITES_CMD_TMP`; do \ - ${ECHO_MSG} "=> Attempting to fetch from $${site}."; \ + ${ECHO_MSG} "=> Attempting to fetch $${site}/$${file}"; \ CKSIZE=`alg=SIZE; ${DISTINFO_DATA}`; \ case $${file} in \ */*) ${MKDIR} $${file%/*}; \ @@ -5564,8 +5564,13 @@ ACTUAL-PACKAGE-DEPENDS?= \ fi; \ done); \ for dir in ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,}; do \ - tmp=$${dir%/*}; \ - dir=$${tmp\#\#*/}/$${dir\#\#*/}; \ + tmp=$${dir\#${PORTSDIR}/}; \ + if [ "$$tmp" = "$$dir" ]; then \ + tmp=$${dir%/*}; \ + dir=$${tmp\#\#*/}/$${dir\#\#*/}; \ + else \ + dir=$$tmp; \ + fi; \ set -- $$origins; \ while [ $$\# -gt 1 ]; do \ if [ ! -d "${PORTSDIR}/$$2" ]; then \ |