CVS commit: pkgsrc/mk/pkginstall

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Apr 26 10:24:50 UTC 2023

Modified Files:
        pkgsrc/mk/pkginstall: bsd.pkginstall.mk info-files

Log Message:
mk: retire INFO_FILES_VERBOSE

registering info files hasn't caused any errors, and this
clutters PKG_DEVELOPER=yes install outputs


To generate a diff of this commit:
cvs rdiff -u -r1.77 -r1.78 pkgsrc/mk/pkginstall/bsd.pkginstall.mk
cvs rdiff -u -r1.4 -r1.5 pkgsrc/mk/pkginstall/info-files

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/mk/pkginstall/bsd.pkginstall.mk
diff -u pkgsrc/mk/pkginstall/bsd.pkginstall.mk:1.77 pkgsrc/mk/pkginstall/bsd.pkginstall.mk:1.78
--- pkgsrc/mk/pkginstall/bsd.pkginstall.mk:1.77 Wed Nov 23 11:32:47 2022
+++ pkgsrc/mk/pkginstall/bsd.pkginstall.mk      Wed Apr 26 10:24:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.77 2022/11/23 11:32:47 jperkin Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.78 2023/04/26 10:24:50 wiz Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -11,14 +11,9 @@
 #      noting the actions taken if PKG_UPDATE_FONTS_DB is YES.  It is either
 #      YES or NO and defaults to YES for PKG_DEVELOPERs, otherwise NO.
 #
-# INFO_FILES_VERBOSE indicates whether the +INFO_FILES scriptlet will output
-#      a message noting the actions taken.  It is either YES or NO and
-#      defaults to  YES for PKG_DEVELOPERs, otherwise NO.
-#
 _VARGROUPS+=           pkginstall
 _USER_VARS.pkginstall= \
        FONTS_VERBOSE \
-       INFO_FILES_VERBOSE \
        OCAML_FINDLIB_REGISTER_VERBOSE \
        PKG_CREATE_USERGROUP \
        PKG_CONFIG PKG_CONFIG_PERMS \
@@ -1038,11 +1033,9 @@ ${_INSTALL_ICON_THEMES_FILE}: ../../mk/p
 #
 .if ${PKG_DEVELOPER:Uno} != "no"
 FONTS_VERBOSE?=                YES
-INFO_FILES_VERBOSE?=   YES
 OCAML_FINDLIB_REGISTER_VERBOSE?=       YES
 .else
 FONTS_VERBOSE?=                NO
-INFO_FILES_VERBOSE?=   NO
 OCAML_FINDLIB_REGISTER_VERBOSE?=       NO
 .endif
 PKG_CREATE_USERGROUP?= YES
@@ -1058,7 +1051,6 @@ FILES_SUBST+=             PKG_RCD_SCRIPTS=${PKG_RCD
 FILES_SUBST+=          PKG_REGISTER_SHELLS=${PKG_REGISTER_SHELLS:Q}
 FILES_SUBST+=          PKG_UPDATE_FONTS_DB=${PKG_UPDATE_FONTS_DB:Q}
 FILES_SUBST+=          FONTS_VERBOSE=${FONTS_VERBOSE:Q}
-FILES_SUBST+=          INFO_FILES_VERBOSE=${INFO_FILES_VERBOSE:Q}
 FILES_SUBST+=          OCAML_FINDLIB_REGISTER_VERBOSE=${OCAML_FINDLIB_REGISTER_VERBOSE:Q}
 
 # Substitute for various programs used in the DEINSTALL/INSTALL scripts and

Index: pkgsrc/mk/pkginstall/info-files
diff -u pkgsrc/mk/pkginstall/info-files:1.4 pkgsrc/mk/pkginstall/info-files:1.5
--- pkgsrc/mk/pkginstall/info-files:1.4 Thu Jul 12 19:41:46 2007
+++ pkgsrc/mk/pkginstall/info-files     Wed Apr 26 10:24:50 2023
@@ -1,4 +1,4 @@
-# $NetBSD: info-files,v 1.4 2007/07/12 19:41:46 jlam Exp $
+# $NetBSD: info-files,v 1.5 2023/04/26 10:24:50 wiz Exp $
 #
 # Generate an +INFO_FILES script that handles info file registration for
 # the package.
@@ -29,7 +29,6 @@ UNPACK,|UNPACK,+INFO_FILES)
 # relative to ${PKG_PREFIX}.
 #
 
-ECHO="@ECHO@"
 GREP="@GREP@"
 INSTALL_INFO="@INSTALL_INFO@"
 MKDIR="@MKDIR@"
@@ -48,15 +47,6 @@ PKG_METADATA_DIR="${2-${CURDIR}}"
 : ${PKGNAME=${PKG_METADATA_DIR##*/}}
 : ${PKG_PREFIX=@PREFIX@}
 
-case "${INFO_FILES_VERBOSE:-@INFO_FILES_VERBOSE@}" in
-[Yy][Ee][Ss]|[Tt][Rr][Uu][Ee]|[Oo][Nn]|1)
-       echo="${ECHO}"
-       ;;
-[Nn][Oo]|[Ff][Aa][Ll][Ss][Ee]|[Oo][Ff][Ff]|0)
-       echo=":"
-       ;;
-esac
-
 exitcode=0
 case $ACTION in
 ADD)
@@ -79,7 +69,6 @@ ADD)
                        case "$nentries" in
                        [0-9]*) ${TEST} $nentries -gt 0 || ${RM} $infoindex ;;
                        esac
-                       $echo "${PKGNAME}: registering info file $file"
                        ${MKDIR} -p "$infodir"
                        ${INSTALL_INFO} --info-dir="$infodir" --delete $file >/dev/null 2>&1
                        ${INSTALL_INFO} --info-dir="$infodir" $file >/dev/null 2>&1
@@ -103,7 +92,6 @@ REMOVE)
                        [!/]*)  infodir="${PKG_PREFIX}/$infodir" ;;
                        esac
                        infoindex="$infodir/dir"
-                       $echo "${PKGNAME}: unregistering info file $file"
                        ${INSTALL_INFO} --info-dir="$infodir" --delete $file >/dev/null 2>&1
                        nentries="`${GREP} -c '^\*' $infoindex 2>/dev/null`"
                        case "$nentries" in