diff options
| author | hubertf <hubertf@pkgsrc.org> | 2000-02-28 01:38:37 +0000 |
|---|---|---|
| committer | hubertf <hubertf@pkgsrc.org> | 2000-02-28 01:38:37 +0000 |
| commit | 586e83db553c38dd8f9f6680960cea38c92f862c (patch) | |
| tree | db1336562ac124dc7f39eac6e7b9670c07a0dd10 /mk | |
| parent | 65394e5a2271d1f0f991ebd92b1b74e23ee1bd0e (diff) | |
| download | pkgsrc-586e83db553c38dd8f9f6680960cea38c92f862c.tar.gz | |
We don't support FETCH_DEPENDS for some time now, remove the
remaining code (fetch-depends calls, fetch-depends calling
_DEPENDS_USE).
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 1827c033c29..65dbde1ce9e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.408 2000/02/26 21:58:55 hubertf Exp $ +# $NetBSD: bsd.pkg.mk,v 1.409 2000/02/28 01:38:37 hubertf Exp $ # # This file is in the public domain. # @@ -1328,9 +1328,6 @@ PLIST_SRC= ################################################################ _PORT_USE: .USE -.if make(real-fetch) - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} fetch-depends -.endif .if make(real-extract) ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} build-depends misc-depends .endif @@ -2167,7 +2164,6 @@ package-noinstall: .if !target(depends) depends: misc-depends - ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} fetch-depends ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} build-depends ${_PKG_SILENT}${_PKG_DEBUG}cd ${.CURDIR} && ${MAKE} ${.MAKEFLAGS} run-depends @@ -2225,14 +2221,13 @@ _DEPENDS_USE: @${DO_NADA} .endif +build-depends: _DEPENDS_USE +run-depends: _DEPENDS_USE + # Tells whether to halt execution if the object formats differ FATAL_OBJECT_FMT_SKEW?= yes WARN_NO_OBJECT_FMT?= yes -fetch-depends: _DEPENDS_USE -build-depends: _DEPENDS_USE -run-depends: _DEPENDS_USE - misc-depends: uptodate-pkgtools .if defined(DEPENDS) .if !defined(NO_DEPENDS) @@ -2296,8 +2291,8 @@ clean-depends: .if defined(BUILD_DEPENDS) || defined(DEPENDS) || defined(RUN_DEPENDS) ${_PKG_SILENT}${_PKG_DEBUG}\ for dir in `${ECHO} ${BUILD_DEPENDS:C/^[^:]*://:C/:.*//} \ - ${DEPENDS:C/^[^:]*://:C/:.*//} \ - ${RUN_DEPENDS:C/^[^:]*://:C/:.*//} | sort -u`; do \ + ${DEPENDS:C/^[^:]*://:C/:.*//} \ + ${RUN_DEPENDS:C/^[^:]*://:C/:.*//} | sort -u`; do \ if [ -d $$dir ] ; then \ (cd $$dir && ${MAKE} CLEANDEPENDS=${CLEANDEPENDS} clean ); \ fi \ |