Add a copy of bsd.own.mk to the pkgsrc tree, and modify bsd.pkg.mk to

include it, rather than the copy in /usr/share/mk. This should fix the
last remaining "sync" problems between pkgsrc and /usr/share/mk.

XXX pkgsrc/mk/bsd.own.mk will go away in 1.4 XXX

This was all done by Hubert Feyrer.

2 files changed, 132 insertions, 2 deletions

diff --git a/mk/bsd.own.mk b/mk/bsd.own.mk
new file mode 100644
index 00000000000..fe3153716f2
--- /dev/null
+++ b/mk/bsd.own.mk
@@ -0,0 +1,130 @@
+#	$NetBSD: bsd.own.mk,v 1.1 1998/04/20 10:16:24 agc Exp $
+
+.if !defined(_BSD_OWN_MK_)
+_BSD_OWN_MK_=1
+
+.if defined(MAKECONF) && exists(${MAKECONF})
+.include "${MAKECONF}"
+.elif exists(/etc/mk.conf)
+.include "/etc/mk.conf"
+.endif
+
+# Defining `SKEY' causes support for S/key authentication to be compiled in.
+SKEY=		yes
+# Defining `KERBEROS' causes support for Kerberos authentication to be
+# compiled in.
+#KERBEROS=	yes
+# Defining 'KERBEROS5' causes support for Kerberos5 authentication to be
+# compiled in.
+#KERBEROS5=	yes
+
+# where the system object and source trees are kept; can be configurable
+# by the user in case they want them in ~/foosrc and ~/fooobj, for example
+BSDSRCDIR?=	/usr/src
+BSDOBJDIR?=	/usr/obj
+
+BINGRP?=	wheel
+BINOWN?=	root
+BINMODE?=	555
+NONBINMODE?=	444
+
+# Define MANZ to have the man pages compressed (gzip)
+#MANZ=		1
+
+MANDIR?=	/usr/share/man
+MANGRP?=	wheel
+MANOWN?=	root
+MANMODE?=	${NONBINMODE}
+MANINSTALL?=	maninstall catinstall
+
+LIBDIR?=	/usr/lib
+LINTLIBDIR?=	/usr/libdata/lint
+LIBGRP?=	${BINGRP}
+LIBOWN?=	${BINOWN}
+LIBMODE?=	${NONBINMODE}
+
+DOCDIR?=        /usr/share/doc
+DOCGRP?=	wheel
+DOCOWN?=	root
+DOCMODE?=       ${NONBINMODE}
+
+NLSDIR?=	/usr/share/nls
+NLSGRP?=	wheel
+NLSOWN?=	root
+NLSMODE?=	${NONBINMODE}
+
+KMODDIR?=	/usr/lkm
+KMODGRP?=	wheel
+KMODOWN?=	root
+KMODMODE?=	${NONBINMODE}
+
+COPY?=		-c
+STRIPFLAG?=	-s
+
+# Define SYS_INCLUDE to indicate whether you want symbolic links to the system
+# source (``symlinks''), or a separate copy (``copies''); (latter useful
+# in environments where it's not possible to keep /sys publicly readable)
+#SYS_INCLUDE= 	symlinks
+
+# don't try to generate PIC versions of libraries on machines
+# which don't support PIC.
+.if  (${MACHINE_ARCH} == "vax") || \
+    ((${MACHINE_ARCH} == "mips") && defined(STATIC_TOOLCHAIN)) || \
+    (${MACHINE_ARCH} == "powerpc")
+NOPIC=
+.endif
+
+# Data-driven table using make variables to control how 
+# toolchain-dependent targets and shared libraries are built
+# for different platforms and object formats.
+# OBJECT_FMT:		currently either "ELF" or "a.out".
+# SHLIB_TYPE:		"ELF" or "a.out" or "" to force static libraries.
+#
+.if (${MACHINE_ARCH} == "alpha") || \
+    (${MACHINE_ARCH} == "mips") || \
+    (${MACHINE_ARCH} == "powerpc")
+OBJECT_FMT?=ELF
+.else
+OBJECT_FMT?=a.out
+.endif
+
+
+# No lint, for now.
+
+# all machines on which we are okay should be added here until we can
+# get rid of the whole "NOLINT by default" thing.
+.if (${MACHINE} == "i386")
+NONOLINT=1
+.endif
+
+.if !defined(NONOLINT)
+NOLINT=
+.endif
+
+# Profiling and shared libraries don't work on PowerPC yet.
+.if (${MACHINE_ARCH} == "powerpc")
+NOPROFILE=
+NOSHLIB=
+.endif
+
+TARGETS+=	all clean cleandir depend includes install lint obj regress \
+		tags
+.PHONY:		all clean cleandir depend includes install lint obj regress \
+		tags beforedepend afterdepend beforeinstall afterinstall \
+		realinstall
+
+# set NEED_OWN_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
+subdir-install:	.NOTMAIN beforeinstall
+realinstall:	.NOTMAIN beforeinstall
+afterinstall:	.NOTMAIN subdir-install realinstall
+.endif
+.endif
+
+.endif		# _BSD_OWN_MK_
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 24745c1afbd..ad29b43c451 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,7 +1,7 @@
 #-*- mode: Fundamental; tab-width: 4; -*-
 # ex:ts=4
 #
-#	$NetBSD: bsd.pkg.mk,v 1.68 1998/04/20 08:24:58 frueauf Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.69 1998/04/20 10:16:24 agc Exp $
 #
 #	This file is derived from bsd.port.mk - 940820 Jordan K. Hubbard.
 #	This file is in the public domain.
@@ -552,7 +552,7 @@ MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
 MAKE_ENV+=	EXTRA_SYS_MK_INCLUDES="<bsd.own.mk>"
 .elif (${OPSYS} == "NetBSD")
 NEED_OWN_INSTALL_TARGET=	no
-.include <bsd.own.mk>
+.include "../../mk/bsd.own.mk"
 SHAREOWN = ${DOCOWN}
 SHAREGRP = ${DOCGRP}
 SHAREMODE = ${DOCMODE}