Permalink
Browse files

Fix typo in error message. From Sergey Svishchev.

  • Loading branch information...
1 parent 0e2c6ba commit 50bbb409d07812fea69b73f4b37582751d6535b5 wiz committed Dec 2, 2007
Showing with 7 additions and 4 deletions.
  1. +5 −2 mk/bulk/bsd.bulk-pkg.mk
  2. +2 −2 mk/x11.buildlink3.mk
View
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.bulk-pkg.mk,v 1.145 2007/12/01 11:11:55 rillig Exp $
+# $NetBSD: bsd.bulk-pkg.mk,v 1.146 2007/12/02 12:57:32 wiz Exp $
#
# Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org>
@@ -177,6 +177,9 @@ BULK_DBFILE?= ${BULKFILESDIR}/.bulk_db${BULK_ID}
# use is for digest and also for xpkgwedge. Add pkgtools/xpkgwedge in
# /etc/mk.conf to do an xpkgwedged bulk build.
BULK_PREREQ+= pkgtools/digest
+.ifdef PKG_CHK_FILE
+BULK_PREREQ+= pkgtools/pkg_chk
+.endif
# Commands for printing informational messages from the bulk build.
# BULK_MSG_CONT is used for continuing a message started with BULK_MSG
@@ -243,7 +246,7 @@ bulk-cache:
.endfor
${RM} -f ${BULK_DBFILE}
${TOUCH} ${BULK_DBFILE}
-.if !defined(SPECIFIC_PKGS)
+.if !defined(SPECIFIC_PKGS) && !defined(PKG_CHK_FILE)
@${ECHO} "This file is unused for a full pkgsrc bulk build" >> ${BULK_DBFILE}
@${ECHO} "It is only used for a SPECIFIC_PKGS bulk build" >> ${BULK_DBFILE}
@${BULK_MSG} "Building complete pkgsrc dependency tree (this may take a while)."
View
@@ -1,4 +1,4 @@
-# $NetBSD: x11.buildlink3.mk,v 1.10 2007/10/09 19:19:12 martti Exp $
+# $NetBSD: x11.buildlink3.mk,v 1.11 2007/12/02 12:57:32 wiz Exp $
#
# This file should only be included from the buildlink3.mk files from
# the modular Xorg packages and only in the case that the native X11
@@ -20,7 +20,7 @@ USE_X11= yes
. if ${X11_TYPE} != "native"
_WRONG_X11_TYPE:= ${X11_TYPE}
-PKG_FAIL_REASON+= "Do not include x11.version.mk for X11_TYPE != \"native\"."
+PKG_FAIL_REASON+= "Do not include x11.buildlink3.mk for X11_TYPE != \"native\"."
X11_TYPE:= native
X11BASE:= /usr
. endif

0 comments on commit 50bbb40

Please sign in to comment.