[pkgsrc/pkgsrc-2005Q3]: pkgsrc/mk/install Pullup ticket 791 - requested by Jo...

[salo <salo%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/93dddd020a09
branches:  pkgsrc-2005Q3
changeset: 499544:93dddd020a09
user:      salo <salo%pkgsrc.org@localhost>
date:      Sat Oct 01 10:53:04 2005 +0000

description:
Pullup ticket 791 - requested by Johnny C. Lam
install infrastructure fix

Revisions pulled up:
- pkgsrc/mk/install/bsd.pkginstall.mk           1.28

   Module Name:         pkgsrc
   Committed By:        jlam
   Date:                Fri Sep 30 16:39:26 UTC 2005

   Modified Files:
        pkgsrc/mk/install: bsd.pkginstall.mk

   Log Message:
   Fix a typo... missing a : before the Q variable qualifier, which caused
   ${PKG_SYSCONFDIR} to not be automatically creates/refcounted by the
   ÏIRS script for packages that only set CONF_FILES_PERMS and not
   CONF_FILES or PKG_SYSCONFSUBDIR, e.g. security/sudo.  This caused
   problems when PKG_SYSCONFBASE was set to a non-default directory that
   didn't pre-exist, e.g. PKG_SYSCONFBASE=/etc/pkg.  Problem noted by
   <jmmv>.

diffstat:

 mk/install/bsd.pkginstall.mk |  4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r b9aa88ba929e -r 93dddd020a09 mk/install/bsd.pkginstall.mk
--- a/mk/install/bsd.pkginstall.mk      Fri Sep 30 13:14:22 2005 +0000
+++ b/mk/install/bsd.pkginstall.mk      Sat Oct 01 10:53:04 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.26 2005/08/24 22:43:02 rillig Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.26.2.1 2005/10/01 10:53:04 salo Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -426,7 +426,7 @@
        ${ECHO} ""
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        exec 1>>${.TARGET}.tmp;                                         \
-       case ${PKG_SYSCONFSUBDIR:M*:Q}${CONF_FILES:M*:Q}${CONF_FILES_PERMS:M*Q}"" in \
+       case ${PKG_SYSCONFSUBDIR:M*:Q}${CONF_FILES:M*:Q}${CONF_FILES_PERMS:M*:Q}"" in \
        "")     ;;                                                      \
        *)      ${ECHO} "# DIR: ${PKG_SYSCONFDIR:S/${PREFIX}\///} m" ;; \
        esac;                                                           \