summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2007-01-17 03:11:18 +0000
committerrillig <rillig@pkgsrc.org>2007-01-17 03:11:18 +0000
commit5acfb0b6caa4d8066c5625bf704f469f65c8cf28 (patch)
treea39571a04e7bf4b504ce85d2a01ea2a06d085ccc /mk
parent51e3b4ad94dd7072b220d19f010934b1022e7d71 (diff)
downloadpkgsrc-5acfb0b6caa4d8066c5625bf704f469f65c8cf28.tar.gz
Renamed BUILDLINK_TRANSFORM.* to BUILDLINK_FNAME_TRANSFORM.*, to make
clear that these variables are completely unrelated to BUILDLINK_TRANSFORM. Added a legacy check that catches appearances of BUILDLINK_TRANSFORM.*. XXX: Where should incompatible changes in pkgsrc be documented?
Diffstat (limited to 'mk')
-rw-r--r--mk/buildlink3/bsd.buildlink3.mk14
1 files changed, 9 insertions, 5 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 9caa72e2dbf..6bda459761b 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.190 2006/12/20 01:04:47 joerg Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.191 2007/01/17 03:11:19 rillig Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -512,7 +512,7 @@ buildlink-directories:
# +CONTENTS, and for pkgviews packages, it outputs any libtool
# archives in lib directories.
#
-# BUILDLINK_TRANSFORM.<pkg>
+# BUILDLINK_FNAME_TRANSFORM.<pkg>
# sed arguments used to transform the name of the source filename
# into a destination filename, e.g. -e "s|/curses.h|/ncurses.h|g"
#
@@ -574,7 +574,7 @@ ${_BLNK_COOKIE.${_pkg_}}:
${ERROR_MSG} "[bsd.buildlink3.mk] X11BASE is not set correctly."; \
exit 1; \
}
- ${_PKG_SILENT}${_PKG_DEBUG} \
+ ${RUN} \
case ${BUILDLINK_PREFIX.${_pkg_}} in \
${LOCALBASE}) buildlink_dir="${BUILDLINK_DIR}" ;; \
${X11BASE}) buildlink_dir="${BUILDLINK_X11_DIR}" ;; \
@@ -587,12 +587,16 @@ ${_BLNK_COOKIE.${_pkg_}}:
if [ ! -f "$$src" ]; then \
msg="$$src: not found"; \
else \
- if [ -z "${BUILDLINK_TRANSFORM.${_pkg_}:Q}" ]; then \
+ : "Legacy: Can be removed after 2007Q2."; \
+ if [ ${BUILDLINK_TRANSFORM.${_pkg_}:Q}"" ]; then \
+ ${FAIL_MSG} "[bsd.buildlink3.mk] BUILDLINK_TRANSFORM.${_pkg_} is obsolete. Use BUILDLINK_FNAME_TRANSFORM.${_pkg_} instead."; \
+ fi; \
+ if [ -z "${BUILDLINK_FNAME_TRANSFORM.${_pkg_}:Q}" ]; then \
dest="$$buildlink_dir/$$file"; \
msg="$$src"; \
else \
dest="$$buildlink_dir/$$file"; \
- dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_TRANSFORM.${_pkg_}}`; \
+ dest=`${ECHO} $$dest | ${SED} ${BUILDLINK_FNAME_TRANSFORM.${_pkg_}}`; \
msg="$$src -> $$dest"; \
fi; \
dir=`${DIRNAME} "$$dest"`; \