diff options
| author | Kris Kennaway <kris@FreeBSD.org> | 2003-03-19 06:26:14 +0000 |
|---|---|---|
| committer | Kris Kennaway <kris@FreeBSD.org> | 2003-03-19 06:26:14 +0000 |
| commit | 993f323caa009ab6a64a626a4b53a0f7a19d3594 (patch) | |
| tree | 7a50af65a119554864f5df9fbb1964b1f61da324 /Mk/bsd.port.mk | |
| parent | ad385a02f4f6073a0bc3ad89b39b9f00ba9003da (diff) | |
| download | ports-993f323caa009ab6a64a626a4b53a0f7a19d3594.tar.gz ports-993f323caa009ab6a64a626a4b53a0f7a19d3594.zip | |
* Don't include extraneous dependencies on bzip2 [1]
* Fix 'make package-depends' so it doesn't overflow on large ports [2]
* Fix logic in 'USE_PACKAGE_DEPENDS' [3]
Submitted by: dinoex [1][3], marcus [2]
PR: ports/48860 [1], ports/36083 [3]
Notes
Notes:
svn path=/head/; revision=77160
Diffstat (limited to 'Mk/bsd.port.mk')
| -rw-r--r-- | Mk/bsd.port.mk | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index 5a89b8369b1a..ff226bb8ed8b 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -719,6 +719,7 @@ BZIP2_CMD?= /usr/bin/bzip2 .else BZCAT?= ${LOCALBASE}/bin/bzcat BZIP2_CMD?= ${LOCALBASE}/bin/bzip2 +BZIP2DEPENDS= yes .endif CAT?= /bin/cat CHGRP?= /usr/bin/chgrp @@ -745,6 +746,7 @@ LN?= /bin/ln LS?= /bin/ls MKDIR?= /bin/mkdir -p MV?= /bin/mv +REALPATH?= /bin/realpath RM?= /bin/rm RMDIR?= /bin/rmdir SED?= /usr/bin/sed @@ -1056,7 +1058,7 @@ MANCOMPRESSED?= no .endif .if defined(PATCHFILES) -.if ${PATCHFILES:M*.bz2}x != x +.if ${PATCHFILES:M*.bz2}x != x && defined(BZIP2DEPENDS) PATCH_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif .if ${PATCHFILES:M*.zip}x != x @@ -1064,7 +1066,7 @@ PATCH_DEPENDS+= unzip:${PORTSDIR}/archivers/unzip .endif .endif -.if defined(USE_BZIP2) && !exists(/usr/bin/bzip2) +.if defined(USE_BZIP2) && defined(BZIP2DEPENDS) EXTRACT_DEPENDS+= bzip2:${PORTSDIR}/archivers/bzip2 .endif .if defined(USE_ZIP) @@ -3492,12 +3494,13 @@ ${deptype:L}-depends: if [ ! -d "$$dir" ]; then \ ${ECHO_MSG} " >> No directory for $$prog. Skipping.."; \ else \ - (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ if [ X${USE_PACKAGE_DEPENDS} != "X" ]; then \ subpkgfile=`(cd $$dir; ${MAKE} $$depends_args -V PKGFILE)`; \ if [ -r "$${subpkgfile}" ]; then \ ${ECHO_MSG} "===> Installing existing package $${subpkgfile}"; \ ${PKG_ADD} $${subpkgfile}; \ + else \ + (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ fi; \ else \ (cd $$dir; ${MAKE} -DINSTALLS_DEPENDS $$target $$depends_args) ; \ @@ -3713,6 +3716,7 @@ PACKAGE-DEPENDS-LIST?= \ fi; \ checked="${PARENT_CHECKED}"; \ for dir in $$(${ECHO_CMD} "${LIB_DEPENDS} ${RUN_DEPENDS}" | ${TR} '\040' '\012' | ${SED} -e 's/^[^:]*://' -e 's/:.*//') $$(${ECHO_CMD} ${DEPENDS} | ${TR} '\040' '\012' | ${SED} -e 's/:.*//'); do \ + dir=$$(${REALPATH} $$dir); \ if [ -d $$dir ]; then \ if (${ECHO_CMD} $$checked | ${GREP} -qwv "$$dir"); then \ childout=$$(cd $$dir; ${MAKE} CHILD_DEPENDS=yes PARENT_CHECKED="$$checked" package-depends-list); \ |