pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk The check-files-post need to be done before post-in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/f83709d9b3b9
branches:  trunk
changeset: 498162:f83709d9b3b9
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Sun Aug 14 17:26:13 2005 +0000

description:
The check-files-post need to be done before post-install-script,
to prevent errors from pacakes using e.g. CONF_FILES.

diffstat:

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

diffs (25 lines):

diff -r 7355cfcb1e0e -r f83709d9b3b9 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sun Aug 14 15:35:54 2005 +0000
+++ b/mk/bsd.pkg.mk     Sun Aug 14 17:26:13 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1712 2005/08/10 18:21:07 kristerw Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1713 2005/08/14 17:26:13 kristerw Exp $
 #
 # This file is in the public domain.
 #
@@ -2118,7 +2118,6 @@
                # listed in the PLIST.                                          \
                #
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} ${PLIST}
-       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script
        ${_PKG_SILENT}${_PKG_DEBUG}newmanpages=`${EGREP} -h             \
                '^([^@/]*/)*man/([^/]*/)?(man[1-9ln]/.*\.[1-9ln]|cat[1-9ln]/.*\.0)(\.gz)?$$' \
                ${PLIST} 2>/dev/null || ${TRUE}`;                       \
@@ -2163,6 +2162,7 @@
 .if empty(CHECK_FILES:M[nN][oO])
        ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} check-files-post
 .endif
+       ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${MAKEFLAGS} post-install-script
 .if ${_DO_SHLIB_CHECKS} == "yes"
 .  if ${PKG_INSTALLATION_TYPE} == "overwrite"
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \



Home | Main Index | Thread Index | Old Index