Automatically add any of the {CONF,SUPPORT}_FILES and {MAKE,OWN}_DIRS stuff

to CHECK_FILES_SKIP to avoid some false positives.  These directories are
created in the pre-install stage so are included in the generated file list.
The files are also added to silence some problems that may arise during
"make replace".  Found by wiz@ in the gtk2 package.

2 files changed, 33 insertions, 13 deletions

diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 268f0c38804..54b7aed3d1b 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.67 2004/12/28 02:47:40 reed Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.68 2005/01/14 18:02:38 jmmv Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -190,6 +190,16 @@ FILES_SUBST+=		RCD_SCRIPTS_SHELL=${RCD_SCRIPTS_SHELL}
 MESSAGE_SUBST+=		RCD_SCRIPTS_DIR=${RCD_SCRIPTS_DIR}
 MESSAGE_SUBST+=		RCD_SCRIPTS_EXAMPLEDIR=${RCD_SCRIPTS_EXAMPLEDIR}
 
+.if defined(PKG_DEVELOPER) && ${CHECK_FILES} == "YES"
+.  for e c in ${CONF_FILES} ${SUPPORT_FILES}
+CHECK_FILES_SKIP+=	${c:S/${PREFIX}\///}/.pkgsrc
+.  endfor
+.  for e c u g m in ${CONF_FILES_PERMS} ${SUPPORT_FILES_PERMS}
+CHECK_FILES_SKIP+=	${c:S/${PREFIX}\///}/.pkgsrc
+.  endfor
+.  undef e c u g m
+.endif
+
 # OWN_DIRS contains a list of directories for this package that should be
 #       created and should attempt to be destroyed by the INSTALL/DEINSTALL
 #	scripts.  MAKE_DIRS is used the same way, but the package admin
@@ -211,6 +221,16 @@ FILES_SUBST+=		MAKE_DIRS_PERMS=${MAKE_DIRS_PERMS:Q}
 FILES_SUBST+=		OWN_DIRS=${OWN_DIRS:Q}
 FILES_SUBST+=		OWN_DIRS_PERMS=${OWN_DIRS_PERMS:Q}
 
+.if defined(PKG_DEVELOPER) && ${CHECK_FILES} == "YES"
+.  for d in ${MAKE_DIRS} ${OWN_DIRS}
+CHECK_FILES_SKIP+=	${d:S/${PREFIX}\///}
+.  endfor
+.  for d o g m in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS}
+CHECK_FILES_SKIP+=	${d:S/${PREFIX}\///}
+.  endfor
+.  undef d o g m
+.endif
+
 # PKG_CREATE_USERGROUP indicates whether the INSTALL script should
 #	automatically add any needed users/groups to the system using
 #	useradd/groupadd.  It is either YES or NO and defaults to YES.
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index dc7c37b9b68..04d6debb96d 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1561 2005/01/14 14:36:31 jmmv Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1562 2005/01/14 18:02:38 jmmv Exp $
 #
 # This file is in the public domain.
 #
@@ -111,17 +111,6 @@ CHECK_SHLIBS?=		YES	# run check-shlibs after install
 SHLIB_HANDLING?=	YES	# do automatic shared lib handling
 NOCLEAN?=		NO	# don't clean up after update
 
-# A list of file names that will be skipped when analyzing file lists in
-# the check-files target.  This is useful to avoid getting errors triggered
-# by changes in directories not really handled by pkgsrc.
-CHECK_FILES_SKIP+=	emul/linux/proc
-
-CHECK_FILES_SKIP_CMD=
-.for name in ${CHECK_FILES_SKIP}
-CHECK_FILES_SKIP_CMD+=	| ${GREP} -v ${name}
-.endfor
-.undef name
-
 PKGBASE?=		${PKGNAME:C/-[^-]*$//}
 PKGVERSION?=		${PKGNAME:C/^.*-//}
 PKGWILDCARD?=		${PKGBASE}-[0-9]*
@@ -819,6 +808,17 @@ MESSAGE_SUBST+=	PKGNAME=${PKGNAME}					\
 MESSAGE_SUBST_SED=	${MESSAGE_SUBST:S/=/}!/:S/$/!g/:S/^/ -e s!\\\${/}
 .endif
 
+# A list of file names that will be skipped when analyzing file lists in
+# the check-files target.  This is useful to avoid getting errors triggered
+# by changes in directories not really handled by pkgsrc.
+CHECK_FILES_SKIP+=	emul/linux/proc
+
+CHECK_FILES_SKIP_CMD=
+.for name in ${CHECK_FILES_SKIP}
+CHECK_FILES_SKIP_CMD+=	| ${GREP} -v ${name}
+.endfor
+.undef name
+
 # If pkgsrc is supposed to ensure that tests are run before installation
 # of the package, then the build targets should be "build test", otherwise
 # just "build" suffices.  _PKGSRC_BUILD_TARGETS is used in the "all",