From f582b0e24dd37316b6d9880989788f6ce68dce34 Mon Sep 17 00:00:00 2001
From: Joerg Sonnenberger <joerg@dragonflybsd.org>
Date: Sun, 25 Jan 2004 16:52:34 +0000
Subject: [PATCH] Don't use non-existing DragonFly override ports for ports
 using bsd.port.pre.mk. Don't print the DragonFly override warning while doing
 "make package-depends-list", since that breaks the dependency generation.

---
 share/mk/bsd.port.mk | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index 5d587caf44..9d90488258 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/bsd.port.mk,v 1.303.2.2 2002/07/17 19:08:23 ru Exp $
-# $DragonFly: src/share/mk/Attic/bsd.port.mk,v 1.8 2004/01/21 19:40:57 joerg Exp $
+# $DragonFly: src/share/mk/Attic/bsd.port.mk,v 1.9 2004/01/25 16:52:34 joerg Exp $
 
 PORTSDIR?=	/usr/ports
 DFPORTSDIR?=	/usr/dfports
@@ -17,7 +17,8 @@ UNAME_r?=4.8-CURRENT
 .makeenv UNAME_r
 .makeenv OSVERSION
 
-.if !exists(${DFPORTSDIR}/${PORTPATH}/Makefile) || defined(BEFOREPORTMK)
+.if !exists(${DFPORTSDIR}/${PORTPATH}/Makefile)
+
 # If the port does not exist in /usr/dfports/<portpath> use the original
 # FreeBSD port.  Also process as per normal if BEFOREPORTMK is set so
 # any expected variables are set.
@@ -60,9 +61,11 @@ TARGETS+=	install
 TARGETS+=	tags
 
 .undef PORTSDIR
+.if !defined(CHILD_DEPENDS)
 .BEGIN:
 	@echo "WARNING, USING DRAGONFLY OVERRIDE ${DFPORTSDIR}/${PORTPATH}"
 	cd ${DFPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGETS}
+.endif
 
 ${.TARGETS}:
 
-- 
2.41.0