diff options
author | jlam <jlam@pkgsrc.org> | 2005-08-19 22:24:09 +0000 |
---|---|---|
committer | jlam <jlam@pkgsrc.org> | 2005-08-19 22:24:09 +0000 |
commit | 66030afca0a0165e45c1ebd5f6fc5e20eaacdb26 (patch) | |
tree | 594ac5dc63811b737d66d9802652bb0ea4aff979 /mk/bsd.pkg.check.mk | |
parent | 6b5e1a1b430560f6fa5ca564ee21258d5394a45b (diff) | |
download | pkgsrc-66030afca0a0165e45c1ebd5f6fc5e20eaacdb26.tar.gz |
Define new variables for package Makefile use:
REQD_FILES, REQD_FILES_PERMS, REQD_FILES_MODE
REQD_DIRS, REQD_DIRS_PERMS
These are the same as the CONF_* variables, except the files and
directories listed in REQD_* are always copied over, created or removed
(taking into account if there are user modifications from the originals,
etc.) regardless of the value of PKG_CONFIG.
The implementation involved pushing the knowledge of PKG_CONFIG,
PKG_RCD_SCRIPTS, PKG_CREATE_USERGROUP, and PKG_REGISTER_SHELLS into
the individual helper scripts. The helper scripts are now always
invoked by the +INSTALL and +DEINSTALL scripts. The +DIRS and +FILES
script have been enhanced to understand a new "f" flag that means
"force" to ignore the value of PKG_CONFIG and PKG_RCD_SCRIPTS.
Lastly, the +FILES script has been taught a new "r" flag just for rc.d
scripts and the +RCD_SCRIPTS script is now unnecessary.
Diffstat (limited to 'mk/bsd.pkg.check.mk')
-rw-r--r-- | mk/bsd.pkg.check.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.pkg.check.mk b/mk/bsd.pkg.check.mk index 92aab69399b..ddc6459ad25 100644 --- a/mk/bsd.pkg.check.mk +++ b/mk/bsd.pkg.check.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.check.mk,v 1.11 2005/08/19 22:07:46 jlam Exp $ +# $NetBSD: bsd.pkg.check.mk,v 1.12 2005/08/19 22:24:09 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and defines the # relevant variables and targets for the various install-time "check" @@ -59,10 +59,10 @@ CHECK_FILES_SKIP+= ${PREFIX}/${INFO_DIR}/dir .endif CHECK_FILES_SKIP+= ${PERL5_INSTALLARCHLIB}/perllocal.pod CHECK_FILES_SKIP+= ${PREFIX}/emul/linux/proc -.for d in ${MAKE_DIRS} ${OWN_DIRS} +.for d in ${MAKE_DIRS} ${REQD_DIRS} ${OWN_DIRS} CHECK_FILES_SKIP+= ${d} .endfor -.for d o g m in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS} +.for d o g m in ${MAKE_DIRS_PERMS} ${REQD_DIRS_PERMS} ${OWN_DIRS_PERMS} CHECK_FILES_SKIP+= ${d} .endfor _CHECK_FILES_SKIP_FILTER= ${GREP} -v ${CHECK_FILES_SKIP:@f@-e ${f:Q}@} |