pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Put back behavior that was lost in the initial spli...
details: https://anonhg.NetBSD.org/pkgsrc/rev/66f4eb30f6bd
branches: trunk
changeset: 496157:66f4eb30f6bd
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu Jun 23 21:06:56 2005 +0000
description:
Put back behavior that was lost in the initial split of the check-files
implementation out of bsd.pkg.mk -- if NO_PKG_REGISTER is defined,
then don't bother with the file-checks because we don't care about
cleaning up afterwards if we can't uninstall the package.
diffstat:
mk/bsd.pkg.check.mk | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diffs (55 lines):
diff -r a1f3f7bef94d -r 66f4eb30f6bd mk/bsd.pkg.check.mk
--- a/mk/bsd.pkg.check.mk Thu Jun 23 20:51:00 2005 +0000
+++ b/mk/bsd.pkg.check.mk Thu Jun 23 21:06:56 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.check.mk,v 1.4 2005/06/23 20:51:00 jlam Exp $
+# $NetBSD: bsd.pkg.check.mk,v 1.5 2005/06/23 21:06:56 jlam Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and defines the
# relevant variables and targets the for various install-time "check"
@@ -188,6 +188,7 @@
# Check ${PREFIX} for files which are not listed in the generated ${PLIST}.
${_CHECK_FILES_COOKIE.prefix}:
+.if !defined(NO_PKG_REGISTER)
${_PKG_SILENT}${_PKG_DEBUG} \
if ${TEST} ! -f ${_CHECK_FILES_PRE.prefix} -o \
! -f ${_CHECK_FILES_POST.prefix}; \
@@ -221,12 +222,14 @@
${_PKG_SILENT}${_PKG_DEBUG} \
${RM} -f ${WRKDIR}/.files.added ${WRKDIR}/.files.deleted \
${WRKDIR}/.files.diff ${WRKDIR}/.files.expected
+.endif
${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
# Check ${SYSCONFDIR} for files which are not in the PLIST and are also
# not copied into place by the INSTALL scripts.
#
${_CHECK_FILES_COOKIE.sysconfdir}:
+.if !defined(NO_PKG_REGISTER)
${_PKG_SILENT}${_PKG_DEBUG} \
if ${TEST} ! -f ${_CHECK_FILES_PRE.sysconfdir} -o \
! -f ${_CHECK_FILES_POST.sysconfdir}; \
@@ -244,12 +247,14 @@
| ${GREP} '^+[^+]' | ${SED} "s|^+| |"; \
} > ${.TARGET}; \
fi
+.endif
${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
# Check ${VARBASE} for files which are not in the PLIST and are also
# not created by the INSTALL scripts.
#
${_CHECK_FILES_COOKIE.varbase}:
+.if !defined(NO_PKG_REGISTER)
${_PKG_SILENT}${_PKG_DEBUG} \
if ${TEST} ! -f ${_CHECK_FILES_PRE.varbase} -o \
! -f ${_CHECK_FILES_POST.varbase}; \
@@ -267,6 +272,7 @@
| ${GREP} '^+[^+]' | ${SED} "s|^+| |"; \
} > ${.TARGET}; \
fi
+.endif
${_PKG_SILENT}${_PKG_DEBUG}${TOUCH} ${TOUCH_FLAGS} ${.TARGET}
###########################################################################
Home |
Main Index |
Thread Index |
Old Index