From 96e28b0c1c0a6909aeb6fc36952ac02f4f27d3ad Mon Sep 17 00:00:00 2001
From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Mon, 8 Sep 2003 23:39:23 +0000
Subject: [PATCH] Add bsd.dport.mk, which Makefile's in /usr/dports will use
 instead of bsd.port.mk.  Modify bsd.port.mk to check for the existance of the
 same port in /usr/dports and, if found, to cd into the dport and run the
 target there.

NOTE: /usr/bin/relpath is required (see /usr/src/usr.bin/relpath).
---
 share/mk/Makefile      |  3 ++-
 share/mk/bsd.dfport.mk |  7 ++++++
 share/mk/bsd.port.mk   | 50 +++++++++++++++++++++++++++++++++++++++++-
 3 files changed, 58 insertions(+), 2 deletions(-)
 create mode 100644 share/mk/bsd.dfport.mk

diff --git a/share/mk/Makefile b/share/mk/Makefile
index 5137c03c8b..6bf51d515a 100644
--- a/share/mk/Makefile
+++ b/share/mk/Makefile
@@ -1,5 +1,5 @@
 # $FreeBSD: src/share/mk/Makefile,v 1.27.2.8 2002/07/22 14:21:51 ru Exp $
-# $DragonFly: src/share/mk/Makefile,v 1.2 2003/06/17 04:37:02 dillon Exp $
+# $DragonFly: src/share/mk/Makefile,v 1.3 2003/09/08 23:39:23 dillon Exp $
 #	@(#)Makefile	8.1 (Berkeley) 6/8/93
 
 FILES=	bsd.README
@@ -9,6 +9,7 @@ FILES+=	bsd.kern.mk bsd.kmod.mk
 FILES+=	bsd.lib.mk bsd.libnames.mk bsd.links.mk bsd.man.mk
 FILES+=	bsd.obj.mk bsd.own.mk
 FILES+=	bsd.port.mk bsd.port.post.mk  bsd.port.pre.mk bsd.port.subdir.mk
+FILES+= bsd.dport.mk
 FILES+=	bsd.prog.mk bsd.subdir.mk bsd.sys.mk
 FILES+=	sys.mk
 NOOBJ=	noobj
diff --git a/share/mk/bsd.dfport.mk b/share/mk/bsd.dfport.mk
new file mode 100644
index 0000000000..06fd11931f
--- /dev/null
+++ b/share/mk/bsd.dfport.mk
@@ -0,0 +1,7 @@
+# $DragonFly: src/share/mk/Attic/bsd.dfport.mk,v 1.1 2003/09/08 23:39:23 dillon Exp $
+
+PORTSDIR?=	/usr/dports
+
+.include <bsd.own.mk>
+.include "${PORTSDIR}/Mk/bsd.port.mk"
+
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index d58c066484..2696b410e4 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,7 +1,55 @@
 # $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.2 2003/06/17 04:37:02 dillon Exp $
+# $DragonFly: src/share/mk/Attic/bsd.port.mk,v 1.3 2003/09/08 23:39:23 dillon Exp $
 
 PORTSDIR?=	/usr/ports
+DPORTSDIR?=	/usr/dports
+PORTPATH!=	/usr/bin/relpath ${PORTSDIR} ${.CURDIR}
 
+.if !exists(${DPORTSDIR}/${PORTPATH}/Makefile)
+# If the port does not exist in /usr/dports/<portpath> use the original
+# FreeBSD port
+#
 .include <bsd.own.mk>
 .include "${PORTSDIR}/Mk/bsd.port.mk"
+
+.else
+
+# Otherwise retarget to the DragonFly override port.
+#
+
+TARGETS+=	all
+TARGETS+=	build
+TARGETS+=	checksum
+TARGETS+=	clean
+TARGETS+=	clean-for-cdrom
+TARGETS+=	clean-for-cdrom-list
+TARGETS+=	clean-restricted
+TARGETS+=	clean-restricted-list
+TARGETS+=	configure
+TARGETS+=	deinstall
+TARGETS+=	depend
+TARGETS+=	depends
+TARGETS+=	describe
+TARGETS+=	distclean
+TARGETS+=	extract
+TARGETS+=	fetch
+TARGETS+=	fetch-list
+TARGETS+=	ignorelist
+TARGETS+=	makesum
+TARGETS+=	maintainer
+TARGETS+=	package
+TARGETS+=	realinstall
+TARGETS+=	reinstall
+TARGETS+=	install
+TARGETS+=	tags
+
+.for __target in ${TARGETS}
+.if !target(${__target})
+${__target}:
+	@echo "WARNING, USING DRAGONFLY OVERRIDE ${DPORTSDIR}/${PORTPATH}"
+	cd ${DPORTSDIR}/${PORTPATH} && ${MAKE} -B ${.TARGET}
+.endif
+.endfor
+
+.endif
+
-- 
2.41.0