From 3211747145ec7f4b687a9f069685030aee7b9d0c Mon Sep 17 00:00:00 2001
From: rillig <rillig>
Date: Tue, 29 Jan 2008 19:14:45 +0000
Subject: Disabled the check for missing example configuration files, since
 according to PR 37905, it gets called too early.

---
 mk/pkginstall/bsd.pkginstall.mk | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

(limited to 'mk/pkginstall')

diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk
index d84ab75c735..0e610b0906b 100644
--- a/mk/pkginstall/bsd.pkginstall.mk
+++ b/mk/pkginstall/bsd.pkginstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.40 2008/01/23 14:46:33 rillig Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.41 2008/01/29 19:14:45 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -451,6 +451,7 @@ _INSTALL_FILES_DATAFILE=	${_PKGINSTALL_DIR}/files-data
 _INSTALL_UNPACK_TMPL+=		${_INSTALL_FILES_FILE}
 _INSTALL_DATA_TMPL+=		${_INSTALL_FILES_DATAFILE}
 
+# XXX: These checks should be run _after_ ./+INSTALL
 privileged-install-hook: _pkginstall-postinstall-check
 _pkginstall-postinstall-check: .PHONY
 	${RUN} p="${DESTDIR}${PREFIX}";					\
@@ -460,31 +461,31 @@ _pkginstall-postinstall-check: .PHONY
 	set args ${RCD_SCRIPTS}; shift;					\
 	while [ $$# -gt 0 ]; do						\
 		egfile=`canon "${RCD_SCRIPTS_EXAMPLEDIR}/$$1"`; shift;	\
-		[ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "RCD_SCRIPT $$egfile does not exist."; \
+		: [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "RCD_SCRIPT $$egfile does not exist."; \
 	done;								\
 	set args ${CONF_FILES}; shift;					\
 	while [ $$# -gt 0 ]; do						\
 		needargs CONF_FILES 2 $$# "$$*";			\
 		egfile=`canon "$$1"`; shift 2;				\
-		[ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILE $$egfile does not exist."; \
+		: [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILE $$egfile does not exist."; \
 	done;								\
 	set args ${REQD_FILES}; shift;					\
 	while [ $$# -gt 0 ]; do						\
 		needargs REDQ_FILES 2 $$# "$$*";			\
 		egfile=`canon "$$1"`; shift 2;				\
-		[ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILE $$egfile does not exist."; \
+		: [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILE $$egfile does not exist."; \
 	done;								\
 	set args ${CONF_FILES_PERMS}; shift;				\
 	while [ $$# -gt 0 ]; do						\
 		needargs CONF_FILES_PERMS 5 $$# "$$*";			\
 		egfile=`canon "$$1"`; shift 5;				\
-		[ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist."; \
+		: [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist."; \
 	done;								\
 	set args ${REQD_FILES_PERMS}; shift;				\
 	while [ $$# -gt 0 ]; do						\
 		needargs REQD_FILES_PERMS 5 $$# "$$*";			\
 		egfile=`canon "$$1"`; shift 5;				\
-		[ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist."; \
+		: [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist."; \
 	done
 
 ${_INSTALL_FILES_DATAFILE}:
-- 
cgit v1.2.3