summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-03-13 19:12:36 +0800
committerzeising <zeising@058c260c-8361-11dd-a0ac-aa2bafec7d09>2013-03-13 19:12:36 +0800
commit9bd63b480460893bbc1cbbb86b53dc9bf0330e9a (patch)
tree89a2786179bb61c8ddf82568d6f94874c5f11487
parentc60f26e55ef6961a9c5a16a5fb90f858361774ca (diff)
downloadxorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.tar
xorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.tar.gz
xorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.tar.bz2
xorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.tar.lz
xorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.tar.xz
xorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.tar.zst
xorg-devel-ports-9bd63b480460893bbc1cbbb86b53dc9bf0330e9a.zip
Merge r734 from trunk
Sync with ports. git-svn-id: https://trillian.chruetertee.ch/svn/ports/branches/xorg-7.7@735 058c260c-8361-11dd-a0ac-aa2bafec7d09
-rw-r--r--Mk/bsd.port.mk8
1 files changed, 2 insertions, 6 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
index af124aa..d2a7123 100644
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -1,7 +1,7 @@
#-*- tab-width: 4; -*-
# ex:ts=4
#
-# $FreeBSD: head/Mk/bsd.port.mk 313760 2013-03-09 21:43:02Z bapt $
+# $FreeBSD: head/Mk/bsd.port.mk 314015 2013-03-13 02:20:47Z bdrewery $
# $NetBSD: $
#
# bsd.port.mk - 940820 Jordan K. Hubbard.
@@ -4723,8 +4723,6 @@ fetch-url-list-int:
SORTED_MASTER_SITES_CMD_TMP="${SORTED_MASTER_SITES_DEFAULT_CMD}" ; \
fi ; \
for site in `eval $$SORTED_MASTER_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
- DIR=${DIST_SUBDIR:S/\//\\\\\//g:S/./\\\\./g:S/+/\\\\+/g:S/?/\\\\?/g}; \
- CKSIZE=`${AWK} "/^SIZE \($${DIR:+$$DIR\/}$$fileptn\)/"'{print $$4}' ${DISTINFO_FILE}`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
*) args=$${site}$${file};; \
@@ -4755,8 +4753,6 @@ fetch-url-list-int:
SORTED_PATCH_SITES_CMD_TMP="${SORTED_PATCH_SITES_DEFAULT_CMD}" ; \
fi ; \
for site in `eval $$SORTED_PATCH_SITES_CMD_TMP ${_RANDOMIZE_SITES}`; do \
- DIR=${DIST_SUBDIR:S/\//\\\\\//g:S/./\\\\./g:S/+/\\\\+/g:S/?/\\\\?/g}; \
- CKSIZE=`${AWK} "/^SIZE \($${DIR:+$$DIR\/}$$fileptn\)/"'{print $$4}' ${DISTINFO_FILE}`; \
case $${file} in \
*/*) args="-o $${file} $${site}$${file}";; \
*) args=$${site}$${file};; \
@@ -6072,7 +6068,7 @@ check-config: _check-config
.if !target(sanity-config)
sanity-config: _check-config
.if !empty(_CHECK_CONFIG_ERROR)
- @echo -n "Config is invalid. Re-edit? [Y/N] "; \
+ @echo -n "Config is invalid. Re-edit? [Y/n] "; \
read answer; \
case $$answer in \
[Nn]|[Nn][Oo]) \