From 5e87acd0ddfd5038ffd5fe31b3e139999527f8b6 Mon Sep 17 00:00:00 2001
From: agc <agc@NetBSD.org>
Date: Thu, 15 Jan 1998 09:37:25 +0000
Subject: [PATCH] Move the inclusion of bsd.own.mk back to the correct place in
 bsd.port.mk, but this time use a definition before the inclusion, which stops
 <bsd.own.mk> defining its own install target when using the package system.

This makes the package system take notice of the definitions in
/etc/mk.conf
---
 share/mk/bsd.own.mk  |  8 +++++++-
 share/mk/bsd.port.mk | 18 +++++++-----------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk
index 24bfbd9ecfa4..53583c33116c 100644
--- a/share/mk/bsd.own.mk
+++ b/share/mk/bsd.own.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.own.mk,v 1.57 1997/11/03 22:53:25 cgd Exp $
+#	$NetBSD: bsd.own.mk,v 1.58 1998/01/15 09:37:25 agc Exp $
 
 .if defined(MAKECONF) && exists(${MAKECONF})
 .include "${MAKECONF}"
@@ -88,6 +88,11 @@ TARGETS+=	all clean cleandir depend includes install lint obj regress \
 		tags beforedepend afterdepend beforeinstall afterinstall \
 		realinstall
 
+# set NEED_install_TARGET, if it's not already set, to yes
+# this is used by bsd.port.mk to stop "install" being defined
+NEED_OWN_INSTALL_TARGET?=	yes
+
+.if (${NEED_OWN_INSTALL_TARGET} == "yes")
 .if !target(install)
 install:	.NOTMAIN beforeinstall subdir-install realinstall afterinstall
 beforeinstall:	.NOTMAIN
@@ -95,3 +100,4 @@ subdir-install:	.NOTMAIN beforeinstall
 realinstall:	.NOTMAIN beforeinstall
 afterinstall:	.NOTMAIN subdir-install realinstall
 .endif
+.endif
diff --git a/share/mk/bsd.port.mk b/share/mk/bsd.port.mk
index cd9e83e1aa89..0e38581b0c2e 100644
--- a/share/mk/bsd.port.mk
+++ b/share/mk/bsd.port.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.port.mk,v 1.28 1997/12/29 20:10:24 hubertf Exp $
+#	$NetBSD: bsd.port.mk,v 1.29 1998/01/15 09:37:27 agc Exp $
 #
 #	bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -529,6 +529,12 @@ MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
 .if (${OPSYS} == "OpenBSD")
 .include <bsd.own.mk>
 MAKE_ENV+=	EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>"
+.elif (${OPSYS} == "NetBSD")
+NEED_OWN_INSTALL_TARGET=	no
+.include <bsd.own.mk>
+SHAREOWN = ${DOCOWN}
+SHAREGRP = ${DOCGRP}
+SHAREMODE = ${DOCMODE}
 .endif
 
 # A few aliases for *-install targets
@@ -1890,13 +1896,3 @@ ${PLIST}: ${PLIST_SRC}
 
 
 .endif # __ARCH_OK
-
-.if (${OPSYS} == "NetBSD")
-.include <bsd.own.mk>
-
-SHAREOWN = ${DOCOWN}
-SHAREGRP = ${DOCGRP}
-SHAREMODE = ${DOCMODE}
-
-.endif
-