[BACK]Return to bsd.pkg.mk CVS log [TXT][DIR] Up to [cvs.NetBSD.org] / pkgsrc / mk

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

Diff for /pkgsrc/mk/bsd.pkg.mk between version 1.1540.2.13 and 1.1540.2.14

version 1.1540.2.13, 2005/01/24 18:37:36 version 1.1540.2.14, 2005/01/24 18:50:16
Line 35  MAKEFLAGS+=  _PATH_ORIG=${_PATH_ORIG:Q}
Line 35  MAKEFLAGS+=  _PATH_ORIG=${_PATH_ORIG:Q}
 # Transform package Makefile variables and set defaults  # Transform package Makefile variables and set defaults
 ############################################################################  ############################################################################
   
 CHECK_FILES?=           YES     # run check-files after install  CHECK_FILES?=           NO      # run check-files after install
 CHECK_FILES_STRICT?=    NO      # make check-files very strict on errors  CHECK_FILES_STRICT?=    NO      # make check-files very strict on errors
 CHECK_SHLIBS?=          YES     # run check-shlibs after install  CHECK_SHLIBS?=          YES     # run check-shlibs after install
 CLEANDEPENDS?=          NO  CLEANDEPENDS?=          NO
Line 45  NOCLEAN?=  NO # don't clean up after upd
Line 45  NOCLEAN?=  NO # don't clean up after upd
 REINSTALL?=             NO      # reinstall upon update  REINSTALL?=             NO      # reinstall upon update
 SHLIB_HANDLING?=        YES     # do automatic shared lib handling  SHLIB_HANDLING?=        YES     # do automatic shared lib handling
   
 # A list of file names that will be skipped when analyzing file lists in  
 # the check-files target.  This is useful to avoid getting errors triggered  
 # by changes in directories not really handled by pkgsrc.  
 CHECK_FILES_SKIP+=      emul/linux/proc  
   
 CHECK_FILES_SKIP_CMD=  
 .for name in ${CHECK_FILES_SKIP}  
 CHECK_FILES_SKIP_CMD+=  | ${GREP} -v ${name}  
 .endfor  
 .undef name  
   
 ##### Variant spellings  ##### Variant spellings
   
 .if defined(LICENCE) && !defined(LICENSE)  .if defined(LICENCE) && !defined(LICENSE)
Line 2736  check-shlibs:
Line 2725  check-shlibs:
         fi          fi
 .endif # NO_PKG_REGISTER  .endif # NO_PKG_REGISTER
   
   # CHECK_FILES_SKIP is a list of file names that will be skipped when
   # analyzing file lists in the check-files target.  This is useful to
   # avoid getting errors triggered by changes in directories not really
   # handled by pkgsrc.
   #
   # We have to do this here, i.e., quite late in bsd.pkg.mk parsing, so
   # that the variables used in them are defined.  Otherwise we may get
   # problems with the 'for' expressions.
   .if defined(INFO_DIR)
   CHECK_FILES_SKIP+=      ${PREFIX}/${INFO_DIR}/dir
   .endif
   CHECK_FILES_SKIP+=      ${PREFIX}/emul/linux/proc
   
   .for e c in ${CONF_FILES} ${SUPPORT_FILES}
   CHECK_FILES_SKIP+=      ${c}/.pkgsrc
   .endfor
   .for e c o g m in ${CONF_FILES_PERMS} ${SUPPORT_FILES_PERMS}
   CHECK_FILES_SKIP+=      ${c}/.pkgsrc
   .endfor
   .for d in ${MAKE_DIRS} ${OWN_DIRS}
   CHECK_FILES_SKIP+=      ${d}
   .endfor
   .for d o g m in ${MAKE_DIRS_PERMS} ${OWN_DIRS_PERMS}
   CHECK_FILES_SKIP+=      ${d}
   .endfor
   .undef e c d o g m
   
   CHECK_FILES_SKIP_CMD=
   .for name in ${CHECK_FILES_SKIP}
   CHECK_FILES_SKIP_CMD+=  | ${GREP} -v ${name}
   .endfor
   .undef name
   
 # Check if the generated PLIST matches the list of really installed files.  # Check if the generated PLIST matches the list of really installed files.
 #  #
 .PHONY: check-files  .PHONY: check-files
Line 2744  check-files:
Line 2766  check-files:
         ${_PKG_SILENT}${_PKG_DEBUG}                                     \          ${_PKG_SILENT}${_PKG_DEBUG}                                     \
         errors=0;                                                       \          errors=0;                                                       \
         diff -u ${WRKDIR}/.prefix.pre ${WRKDIR}/.prefix.post            \          diff -u ${WRKDIR}/.prefix.pre ${WRKDIR}/.prefix.post            \
                 >${WRKDIR}/.files.diff;                                 \                  >${WRKDIR}/.files.diff || ${TRUE};                      \
         ${GREP} '^+/' ${WRKDIR}/.files.diff | ${SED} 's|^+${PREFIX}/||' \          ${GREP} '^+/' ${WRKDIR}/.files.diff | ${SED} "s|^+||" | ${SORT} \
                 | ${SORT} >${WRKDIR}/.files.added;                      \                  >${WRKDIR}/.files.added;                                \
         ${GREP} '^-/' ${WRKDIR}/.files.diff | ${SED} 's|^-${PREFIX}/||' \          ${GREP} '^-/' ${WRKDIR}/.files.diff | ${SED} "s|^-||" | ${SORT} \
                 | ${SORT} >${WRKDIR}/.files.deleted;                    \                  >${WRKDIR}/.files.deleted;                              \
         if ${TEST} `${WC} -l ${WRKDIR}/.files.deleted |                 \          if ${TEST} `${WC} -l ${WRKDIR}/.files.deleted |                 \
                 ${AWK} '{ print $$1; }'` -gt 0;                         \                  ${AWK} '{ print $$1; }'` -gt 0;                         \
         then                                                            \          then                                                            \
Line 2757  check-files:
Line 2779  check-files:
                 ${SED} "s|^|        |" <${WRKDIR}/.files.deleted;       \                  ${SED} "s|^|        |" <${WRKDIR}/.files.deleted;       \
                 errors=1;                                               \                  errors=1;                                               \
         fi;                                                             \          fi;                                                             \
         ${GREP} '^[A-Za-z]' ${PLIST} | ${SORT} >${WRKDIR}/.files.expected; \          ${GREP} '^[A-Za-z]' ${PLIST} | ${SED} "s|^|${PREFIX}/|" |       \
                   ${SORT} >${WRKDIR}/.files.expected;                     \
         if ! ${CMP} -s ${WRKDIR}/.files.expected ${WRKDIR}/.files.added; then \          if ! ${CMP} -s ${WRKDIR}/.files.expected ${WRKDIR}/.files.added; then \
                 echo "*** The PLIST does not match installed files!";   \                  echo "*** The PLIST does not match installed files!";   \
                 echo "    The following files were not expected in ${PREFIX}:";\                  echo "    The following files were not expected in ${PREFIX}:";\

Legend:
Removed from v.1.1540.2.13  
changed lines
  Added in v.1.1540.2.14

CVSweb <webmaster@jp.NetBSD.org>