Sun Jun 22 23:54:06 2008 UTC ()
When bombing out because the package we need isn't installed, print
the full requirement rather than just the package name. This message
should never be seen (after all, the package we need is supposed to
*get* installed) but sometimes if things are screwed up in one way or
another it does show up. Since often what's wrong is that the package
that's installed is the wrong version, not that it's missing entirely,
this way the error message makes a lot more sense.

E.g. http://mail-index.netbsd.org/tech-pkg/2008/06/12/msg001126.html et seq.

ok dillo@


(dholland)
diff -r1.202 -r1.203 pkgsrc/mk/buildlink3/bsd.buildlink3.mk
cvs diff -r1.202 -r1.203 pkgsrc/mk/buildlink3/bsd.buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2008/03/10 20:05:59 1.202
+++ pkgsrc/mk/buildlink3/bsd.buildlink3.mk 2008/06/22 23:54:06 1.203
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1# $NetBSD: bsd.buildlink3.mk,v 1.202 2008/03/10 20:05:59 joerg Exp $ 1# $NetBSD: bsd.buildlink3.mk,v 1.203 2008/06/22 23:54:06 dholland Exp $
2# 2#
3# Copyright (c) 2004 The NetBSD Foundation, Inc. 3# Copyright (c) 2004 The NetBSD Foundation, Inc.
4# All rights reserved. 4# All rights reserved.
5# 5#
6# This code is derived from software contributed to The NetBSD Foundation 6# This code is derived from software contributed to The NetBSD Foundation
7# by Johnny C. Lam. 7# by Johnny C. Lam.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 1. Redistributions of source code must retain the above copyright 12# 1. Redistributions of source code must retain the above copyright
13# notice, this list of conditions and the following disclaimer. 13# notice, this list of conditions and the following disclaimer.
14# 2. Redistributions in binary form must reproduce the above copyright 14# 2. Redistributions in binary form must reproduce the above copyright
@@ -573,27 +573,27 @@ BUILDLINK_FILES_CMD.${_pkg_}?= \ @@ -573,27 +573,27 @@ BUILDLINK_FILES_CMD.${_pkg_}?= \
573# 573#
574_BLNK_FILES_CMD.${_pkg_}= ( 574_BLNK_FILES_CMD.${_pkg_}= (
575_BLNK_FILES_CMD.${_pkg_}+= ${BUILDLINK_FILES_CMD.${_pkg_}}; 575_BLNK_FILES_CMD.${_pkg_}+= ${BUILDLINK_FILES_CMD.${_pkg_}};
576.for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}} 576.for _filepattern_ in ${BUILDLINK_FILES.${_pkg_}}
577_BLNK_FILES_CMD.${_pkg_}+= ${LS} -1 ${_filepattern_} 2>/dev/null || ${TRUE}; 577_BLNK_FILES_CMD.${_pkg_}+= ${LS} -1 ${_filepattern_} 2>/dev/null || ${TRUE};
578.endfor 578.endfor
579_BLNK_FILES_CMD.${_pkg_}+= ) 579_BLNK_FILES_CMD.${_pkg_}+= )
580_BLNK_FILES_CMD.${_pkg_}+= | ${SORT} -u 580_BLNK_FILES_CMD.${_pkg_}+= | ${SORT} -u
581 581
582${_BLNK_COOKIE.${_pkg_}}: 582${_BLNK_COOKIE.${_pkg_}}:
583 ${RUN} \ 583 ${RUN} \
584 case ${BUILDLINK_PREFIX.${_pkg_}} in \ 584 case ${BUILDLINK_PREFIX.${_pkg_}} in \
585 *not_found) \ 585 *not_found) \
586 ${ERROR_MSG} "${_pkg_} is not installed; can't buildlink files."; \ 586 ${ERROR_MSG} "${BUILDLINK_API_DEPENDS.${_pkg_}} is not installed; can't buildlink files."; \
587 exit 1; \ 587 exit 1; \
588 ;; \ 588 ;; \
589 esac 589 esac
590 ${RUN} [ ${X11BASE:Q}"" ] || { \ 590 ${RUN} [ ${X11BASE:Q}"" ] || { \
591 ${ERROR_MSG} "[bsd.buildlink3.mk] X11BASE is not set correctly."; \ 591 ${ERROR_MSG} "[bsd.buildlink3.mk] X11BASE is not set correctly."; \
592 exit 1; \ 592 exit 1; \
593 } 593 }
594 ${RUN} \ 594 ${RUN} \
595 case ${BUILDLINK_PREFIX.${_pkg_}} in \ 595 case ${BUILDLINK_PREFIX.${_pkg_}} in \
596 ${LOCALBASE}) buildlink_dir="${BUILDLINK_DIR}" ;; \ 596 ${LOCALBASE}) buildlink_dir="${BUILDLINK_DIR}" ;; \
597 ${X11BASE}) buildlink_dir="${BUILDLINK_X11_DIR}" ;; \ 597 ${X11BASE}) buildlink_dir="${BUILDLINK_X11_DIR}" ;; \
598 *) buildlink_dir="${BUILDLINK_DIR}" ;; \ 598 *) buildlink_dir="${BUILDLINK_DIR}" ;; \
599 esac; \ 599 esac; \