Two bugfixes:

* Move the add-plist-info target after post-install, so that ports that
  install their info files in the post-install phase will have them
  correctly registered in the plist.

* all-depends-list was too aggressive: it should only include the
  run-depends of the ports upon which it depends, plus the
  non-runtime dependencies of the port itself.  Previously it was also
  including the non-runtime (e.g. BUILD, EXTRACT, FETCH) dependencies of
  the ports upon which it depends, which are irrelevant.
This commit is contained in:
Kris Kennaway 2004-04-19 23:39:52 +00:00
parent de8bf68a11
commit d2404aab2f
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=107639

View file

@ -3491,7 +3491,7 @@ _INSTALL_SEQ= install-message check-conflicts \
run-depends lib-depends pre-install pre-install-script \
generate-plist check-already-installed
_INSTALL_SUSEQ= check-umask install-mtree pre-su-install \
pre-su-install-script do-install add-plist-info post-install \
pre-su-install-script do-install post-install add-plist-info \
post-install-script add-plist-docs compress-man run-ldconfig fake-pkg \
security-check
_PACKAGE_DEP= install
@ -4163,7 +4163,7 @@ ALL-DEPENDS-LIST= \
for dir in $$(${ECHO_CMD} "${EXTRACT_DEPENDS} ${PATCH_DEPENDS} ${FETCH_DEPENDS} ${BUILD_DEPENDS} ${LIB_DEPENDS} ${RUN_DEPENDS}" | ${SED} -e 'y/ /\n/' | ${CUT} -f 2 -d ':') $$(${ECHO_CMD} ${DEPENDS} | ${SED} -e 'y/ /\n/' | ${CUT} -f 1 -d ':'); do \
if [ -d $$dir ]; then \
if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \
child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" all-depends-list); \
child=$$(cd $$dir; ${MAKE} PARENT_CHECKED="$$checked" run-depends-list); \
for d in $$child; do ${ECHO_CMD} $$d; done; \
${ECHO_CMD} $$dir; \
checked="$$dir $$child $$checked"; \