diff options
| author | kris <kris@FreeBSD.org> | 2004-04-19 23:39:52 +0000 |
|---|---|---|
| committer | kris <kris@FreeBSD.org> | 2004-04-19 23:39:52 +0000 |
| commit | 232f8aaff2e840fc226b79287b74642ff9af7b39 (patch) | |
| tree | 7a6beac007e2fe254d0b31a38742b08bac5c03a8 /Mk/bsd.port.mk | |
| parent | 76eed687c661ca44ac006cc3bb9cc76887087f40 (diff) | |
| download | FreeBSD-ports-232f8aaff2e840fc226b79287b74642ff9af7b39.zip FreeBSD-ports-232f8aaff2e840fc226b79287b74642ff9af7b39.tar.gz | |
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.
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 1ae4409..66fd41c 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -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"; \ |
