diff options
| author | jlam <jlam@pkgsrc.org> | 2007-07-12 19:41:46 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2007-07-12 19:41:46 +0000 |
| commit | 330917e1ad53bec960fa7ad4420b1de8660017f2 (patch) | |
| tree | 65d9ea88d837da23ad3b2a98c4094192d75dc2c4 /mk/pkginstall/files | |
| parent | 07a1a6df3ae498605ad36e0ea1c9a1e758ba4da7 (diff) | |
| download | pkgsrc-330917e1ad53bec960fa7ad4420b1de8660017f2.tar.gz | |
* Add a user-settable variable to tune the default verbosity of the
+INSTALL and +DEINSTALL scripts:
PKGINSTALL_VERBOSE
A list of scriptlets that will be verbose and output a message
noting the actions taken.
* "all" is a special value that implies all of the other items
* "fonts" for +FONTS
* "info-files" for +INFO_FILES
Default value: "all" for PKG_DEVELOPERs, empty otherwise.
* Be "one-liner brief" when doing the default actions. For example,
the info files output now looks like:
gmake-3.81: registering info file /usr/pkg/info/make.info
We retain the current verbosity for the CHECK-* actions.
Diffstat (limited to 'mk/pkginstall/files')
| -rw-r--r-- | mk/pkginstall/files | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/mk/pkginstall/files b/mk/pkginstall/files index 8571577a4d8..61a3ff6715d 100644 --- a/mk/pkginstall/files +++ b/mk/pkginstall/files @@ -1,4 +1,4 @@ -# $NetBSD: files,v 1.3 2006/12/15 13:15:06 martti Exp $ +# $NetBSD: files,v 1.4 2007/07/12 19:41:46 jlam Exp $ # # Generate a +FILES script that reference counts config files that are # required for the proper functioning of the package. @@ -118,7 +118,7 @@ exitcode=0 case $ACTION in ADD) ${SED} -n "/^\# FILE: /{s/^\# FILE: //;p;}" ${SELF} | ${SORT} -u | - { while read file f_flags f_eg f_mode f_user f_group; do + while read file f_flags f_eg f_mode f_user f_group; do case $file in "") continue ;; [!/]*) file="${PKG_PREFIX}/$file" ;; @@ -157,20 +157,10 @@ ADD) else case "$f_flags:$_PKG_CONFIG:$_PKG_RCD_SCRIPTS" in *f*:*:*|[!r]:yes:*|[!r][!r]:yes:*|[!r][!r][!r]:yes:*|*r*:yes:yes) - case "$printed_header" in - yes) ;; - *) printed_header=yes - ${ECHO} "===========================================================================" - ${ECHO} "Installing files needed by ${PKGNAME}:" - ;; - esac if ${TEST} -f "$file"; then - ${ECHO} "" - ${ECHO} " $file already exists." + ${ECHO} "${PKGNAME}: $file already exists" elif ${TEST} -f "$f_eg"; then - ${ECHO} "" - ${ECHO} " $file" - ${ECHO} " [$f_eg]" + ${ECHO} "${PKGNAME}: copying $f_eg to $file" ${CP} $f_eg $file case $f_user in "") ;; @@ -189,11 +179,6 @@ ADD) esac fi done - case "$printed_header" in - yes) ${ECHO} "" - ${ECHO} "===========================================================================" - ;; - esac; } ;; REMOVE) |