[pkgsrc/trunk]: pkgsrc/mk/pkginstall The last change didn't receive enough te...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8643ae295f40
branches:  trunk
changeset: 535618:8643ae295f40
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Nov 23 11:50:19 2007 +0000

description:
The last change didn't receive enough testing. Now it is ok to have
/dev/null as an example file, and the proper file names are checked.

diffstat:

 mk/pkginstall/bsd.pkginstall.mk |  28 ++++++++++++----------------
 1 files changed, 12 insertions(+), 16 deletions(-)

diffs (56 lines):

diff -r eb4a9272d046 -r 8643ae295f40 mk/pkginstall/bsd.pkginstall.mk
--- a/mk/pkginstall/bsd.pkginstall.mk   Fri Nov 23 11:48:56 2007 +0000
+++ b/mk/pkginstall/bsd.pkginstall.mk   Fri Nov 23 11:50:19 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkginstall.mk,v 1.35 2007/11/23 11:36:19 rillig Exp $
+# $NetBSD: bsd.pkginstall.mk,v 1.36 2007/11/23 11:50:19 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and implements the
 # common INSTALL/DEINSTALL scripts framework.  To use the pkginstall
@@ -417,35 +417,31 @@
 _pkginstall-postinstall-check: .PHONY
        ${RUN} p="${DESTDIR}${PREFIX}";                                 \
        ${_FUNC_STRIP_PREFIX};                                          \
+       canon() { f=`strip_prefix "$$1"`; case $$f in [!/]*) f="$$p/$$f"; esac; echo "$$f"; }; \
        set args ${RCD_SCRIPTS}; shift;                                 \
        while [ $$# -gt 0 ]; do                                         \
-               egfile=$$p/`strip_prefix "${RCD_SCRIPTS_EXAMPLEDIR}/$$1"`; \
-               shift 1;                                                \
-               [ -f "$$egfile" ] || ${FAIL_MSG} "RCD_SCRIPT $$egfile does not exist."; \
+               egfile=`canon "${RCD_SCRIPTS_EXAMPLEDIR}/$$1"`; shift;  \
+               [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "RCD_SCRIPT $$egfile does not exist."; \
        done;                                                           \
        set args ${CONF_FILES}; shift;                                  \
        while [ $$# -gt 0 ]; do                                         \
-               egfile=$$p/`strip_prefix "$$1"`;                        \
-               shift 2;                                                \
-               [ -f "$$1" ] || ${FAIL_MSG} "CONF_FILE $$egfile does not exist."; \
+               egfile=`canon "$$1"`; shift 2;                          \
+               [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILE $$egfile does not exist."; \
        done;                                                           \
        set args ${REQD_FILES}; shift;                                  \
        while [ $$# -gt 0 ]; do                                         \
-               egfile=$$p/`strip_prefix "$$1"`;                        \
-               shift 2;                                                \
-               [ -f "$$1" ] || ${FAIL_MSG} "REQD_FILE $$egfile does not exist."; \
+               egfile=`canon "$$1"`; shift 2;                          \
+               [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILE $$egfile does not exist."; \
        done;                                                           \
        set args ${CONF_FILES_PERMS}; shift;                            \
        while [ $$# -gt 0 ]; do                                         \
-               egfile=$$p/`strip_prefix "$$1"`;                        \
-               shift 5;                                                \
-               [ -f "$$1" ] || ${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist."; \
+               egfile=`canon "$$1"`; shift 5;                          \
+               [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "CONF_FILES_PERMS $$egfile does not exist."; \
        done;                                                           \
        set args ${REQD_FILES_PERMS}; shift;                            \
        while [ $$# -gt 0 ]; do                                         \
-               egfile=$$p/`strip_prefix "$$1"`;                        \
-               shift 5;                                                \
-               [ -f "$$1" ] || ${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist."; \
+               egfile=`canon "$$1"`; shift 5;                          \
+               [ -f "$$egfile" ] || [ -c "$$egfile" ] || ${FAIL_MSG} "REQD_FILES_PERMS $$egfile does not exist."; \
        done
 
 ${_INSTALL_FILES_DATAFILE}: