From b4e40a22764a359840bed8a92baafc3de6e0be02 Mon Sep 17 00:00:00 2001 From: espie Date: Thu, 30 Sep 1999 17:34:22 +0000 Subject: [PATCH] print-depends-list and print-package-depends need similar checks, so they must appear before the default depends targets are generated. --- infrastructure/mk/bsd.port.mk | 41 ++++++++++++++++++----------------- 1 file changed, 21 insertions(+), 20 deletions(-) diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk index 6072336a5a4..486ad51e055 100644 --- a/infrastructure/mk/bsd.port.mk +++ b/infrastructure/mk/bsd.port.mk @@ -1,6 +1,6 @@ #-*- mode: Fundamental; tab-width: 4; -*- # ex:ts=4 -FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.127 1999/09/30 17:28:31 espie Exp $$ +FULL_REVISION=$$OpenBSD: bsd.port.mk,v 1.128 1999/09/30 17:34:22 espie Exp $$ # $FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $ # $NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $ # @@ -2334,6 +2334,26 @@ describe: fi .endif +.if !target(print-depends-list) +print-depends-list: +.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \ + defined(LIB_DEPENDS) || defined(DEPENDS) || target(depends-list) + @${ECHO} -n 'This port requires package(s) "' + @${ECHO} -n `make ${_DEPEND_THRU} depends-list | ${SORT_DEPENDS}` + @${ECHO} '" to build.' +.endif +.endif + +.if !target(print-package-depends) +print-package-depends: +.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) || \ + target(package-depends) + @${ECHO} -n 'This port requires package(s) "' + @${ECHO} -n `make ${_DEPEND_THRU} package-depends | ${SORT_DEPENDS}` + @${ECHO} '" to run.' +.endif +.endif + .if !target(depends-list) depends-list: .if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \ @@ -2420,25 +2440,6 @@ README.html: >> $@ @rm -f $@.tmp* -.if !target(print-depends-list) -print-depends-list: -.if defined(FETCH_DEPENDS) || defined(BUILD_DEPENDS) || \ - defined(LIB_DEPENDS) || defined(DEPENDS) - @${ECHO} -n 'This port requires package(s) "' - @${ECHO} -n `make ${_DEPEND_THRU} depends-list | ${SORT_DEPENDS}` - @${ECHO} '" to build.' -.endif -.endif - -.if !target(print-package-depends) -print-package-depends: -.if defined(RUN_DEPENDS) || defined(LIB_DEPENDS) || defined(DEPENDS) - @${ECHO} -n 'This port requires package(s) "' - @${ECHO} -n `make ${_DEPEND_THRU} package-depends | ${SORT_DEPENDS}` - @${ECHO} '" to run.' -.endif -.endif - .if !target(print-depends) print-depends: @${MAKE} FULL_PACKAGE_NAME=Yes print-depends-list print-package-depends