Reorganize some of the files under pkgsrc/mk:

    (1) defs.${OPSYS}.mk --> platform/${OPSYS}.mk.

The "platform" subdirectory is where all of the ${OPSYS}-specific
infrastructure logic should reside.

    (2) bsd.pkg.defaults.mk --> defaults/mk.conf
        bsd.pkg.obsolete.mk --> defaults/obsolete.mk

Renaming bsd.pkg.defaults.mk to defaults/mk.conf is to mimic the way
that NetBSD has /etc/rc.conf as well as /etc/defaults/rc.conf, where
the latter is a full list of user-settable variables, and the two
files share the same name to reinforce the fact /etc/defaults/rc.conf
can be directly copied in place as /etc/rc.conf.  This is the same
relationship shared by defaults/mk.conf and /etc/mk.conf.

16 files changed, 33 insertions, 33 deletions

diff --git a/mk/bsd.pkg.install.mk b/mk/bsd.pkg.install.mk
index 32d2f31516f..a7675000e28 100644
--- a/mk/bsd.pkg.install.mk
+++ b/mk/bsd.pkg.install.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.install.mk,v 1.62 2004/07/10 20:54:44 wiz Exp $
+# $NetBSD: bsd.pkg.install.mk,v 1.63 2004/10/06 20:51:47 jlam Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk to use the common
 # INSTALL/DEINSTALL scripts.  To use this Makefile fragment, simply:
@@ -105,7 +105,7 @@ FILES_SUBST+=		PKG_USER_SHELL=${_PKG_USER_SHELL}
 FILES_SUBST+=		PKG_GROUPS=${PKG_GROUPS:Q}
 
 # Interix is very Special in that users are groups cannot have the
-# same name.  defs.Interix.mk tries to work around this by overriding
+# same name.  Interix.mk tries to work around this by overriding
 # some specific package defaults.  If we get here and there's still a
 # conflict, add a breakage indicator to make sure the package won't
 # compile without changing something.
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 46275cd6ec9..5dd150dc60b 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.168 2004/09/27 12:05:53 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.169 2004/10/06 20:51:47 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -222,8 +222,8 @@ PKGSRC_TOPDIR=	${.CURDIR}
 .endif
 
 # include the defaults file
-.if exists(${PKGSRC_TOPDIR}/mk/bsd.pkg.defaults.mk)
-.  include "${PKGSRC_TOPDIR}/mk/bsd.pkg.defaults.mk"
+.if exists(${PKGSRC_TOPDIR}/mk/defaults/mk.conf)
+.  include "${PKGSRC_TOPDIR}/mk/defaults/mk.conf"
 .endif
 
 .if ${OPSYS} == "NetBSD"
@@ -257,10 +257,10 @@ SHAREMODE?=		${DOCMODE}
 
 # Load the OS-specific definitions for program variables.  Default to loading
 # the NetBSD ones if an OS-specific file doesn't exist.
-.if exists(${PKGSRC_TOPDIR}/mk/defs.${OPSYS}.mk)
-.  include "${PKGSRC_TOPDIR}/mk/defs.${OPSYS}.mk"
-.elif exists(${PKGSRC_TOPDIR}/mk/defs.NetBSD.mk)
-.  include "${PKGSRC_TOPDIR}/mk/defs.NetBSD.mk"
+.if exists(${PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk)
+.  include "${PKGSRC_TOPDIR}/mk/platform/${OPSYS}.mk"
+.elif exists(${PKGSRC_TOPDIR}/mk/platform/NetBSD.mk)
+.  include "${PKGSRC_TOPDIR}/mk/platform/NetBSD.mk"
 .endif
 
 PKGDIRMODE?=		755
diff --git a/mk/bsd.pkg.defaults.mk b/mk/defaults/mk.conf
index 05e1d7f12aa..cd4e06b3e5c 100644
--- a/mk/bsd.pkg.defaults.mk
+++ b/mk/defaults/mk.conf
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.defaults.mk,v 1.286 2004/10/06 19:47:01 tv Exp $
+# $NetBSD: mk.conf,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 
 # A file providing defaults for pkgsrc and the packages collection.
@@ -858,7 +858,7 @@ DEFANG_SPOOLDIR?=	${VARBASE}/spool/MIMEDefang
 # Used to provide a default setting for the serial device for
 # various packages which communicate over the serial port.
 # Possible:  /dev/your_favorite_serial_device
-# Default: defaults for various machine_archs are set in mk/defs.${OPSYS}.mk
+# Default: defaults for various machine_archs are set in mk/platform/${OPSYS}.mk
 
 DELIVER_SUID?=	NO
 # Used to decide if deliver should be installed suid root.
@@ -1490,7 +1490,7 @@ MAJORDOMO_USER?= majordom
 # Possible: any valid flag for makeinfo(1)
 # Default: may set info files size for consistency across platforms and
 # makeinfo version, also various machine_archs arguments may be set in
-# mk/defs.${OPSYS}.mk with the _OPSYS_MAKEINFO_ARGS variable.
+# mk/platform/${OPSYS}.mk with the _OPSYS_MAKEINFO_ARGS variable.
 
 #MOZILLA_USE_LINUX=
 # Used by mozilla binary packages to prefer the use of Linux
@@ -1919,7 +1919,7 @@ SUN_JRE15_USE_JCE?= NO
 SSH_RSHPATH?= ${RSH}
 # Used in ssh to specify standard rsh path
 # Possible: path to rsh binary
-# Default: platform dependent; ${RSH} set in defs.${OPSYS}.mk
+# Default: platform dependent; ${RSH} set in mk/platform/${OPSYS}.mk
 
 SSH_SUID?= NO
 # Used in ssh to enable setuid installation of "ssh" binary.
@@ -2335,10 +2335,10 @@ XEN12_USE_COM2?=	NO
 #MASTER_SITE_LOCAL=	\
 #	ftp://ftp.fr.NetBSD.org/pub/NetBSD/packages/distfiles/LOCAL_PORTS/
 
-.if exists(${.CURDIR}/../../mk/bsd.pkg.obsolete.mk)
-.include "${.CURDIR}/../../mk/bsd.pkg.obsolete.mk"
-.elif exists(${.CURDIR}/../mk/bsd.pkg.obsolete.mk)
-.include "${.CURDIR}/../mk/bsd.pkg.obsolete.mk"
-.elif exists(${.CURDIR}/mk/bsd.pkg.obsolete.mk)
-.include "${.CURDIR}/mk/bsd.pkg.obsolete.mk"
+.if exists(${.CURDIR}/../../mk/defaults/obsolete.mk)
+.include "${.CURDIR}/../../mk/defaults/obsolete.mk"
+.elif exists(${.CURDIR}/../mk/defaults/obsolete.mk)
+.include "${.CURDIR}/../mk/defaults/obsolete.mk"
+.elif exists(${.CURDIR}/mk/defaults/obsolete.mk)
+.include "${.CURDIR}/mk/defaults/obsolete.mk"
 .endif
diff --git a/mk/bsd.pkg.obsolete.mk b/mk/defaults/obsolete.mk
index 4c3af7ddf74..b6cc21dd4fb 100644
--- a/mk/bsd.pkg.obsolete.mk
+++ b/mk/defaults/obsolete.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.obsolete.mk,v 1.17 2004/08/22 19:10:26 jlam Exp $
+# $NetBSD: obsolete.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # This file holds make(1) logic to allow obsolete or deprecated variables
 # still to be used.  These may eventually disappear over time as the contents
diff --git a/mk/defs.AIX.mk b/mk/platform/AIX.mk
index 15d00437fdf..72370486f59 100644
--- a/mk/defs.AIX.mk
+++ b/mk/platform/AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.12 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: AIX.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
diff --git a/mk/defs.BSDOS.mk b/mk/platform/BSDOS.mk
index 4de52cbf157..00bd7356165 100644
--- a/mk/defs.BSDOS.mk
+++ b/mk/platform/BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.13 2004/09/27 14:42:09 tv Exp $
+# $NetBSD: BSDOS.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
diff --git a/mk/defs.Darwin.mk b/mk/platform/Darwin.mk
index 4d55b38558e..74ef0223bed 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/platform/Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.82 2004/10/06 09:49:53 grant Exp $
+# $NetBSD: Darwin.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
diff --git a/mk/defs.FreeBSD.mk b/mk/platform/FreeBSD.mk
index ffedd8f9687..f529a3861a4 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/platform/FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.43 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: FreeBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
diff --git a/mk/defs.IRIX.mk b/mk/platform/IRIX.mk
index 667e7c6b20e..f6a446b3b57 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/platform/IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.57 2004/09/27 14:42:09 tv Exp $
+# $NetBSD: IRIX.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
diff --git a/mk/defs.Interix.mk b/mk/platform/Interix.mk
index e6295144976..587ac960a6b 100644
--- a/mk/defs.Interix.mk
+++ b/mk/platform/Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Interix.mk,v 1.29 2004/10/03 00:13:01 tv Exp $
+# $NetBSD: Interix.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
diff --git a/mk/defs.Linux.mk b/mk/platform/Linux.mk
index c7d49f694f5..390ecb6349a 100644
--- a/mk/defs.Linux.mk
+++ b/mk/platform/Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.76 2004/09/13 12:09:22 martti Exp $
+# $NetBSD: Linux.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
diff --git a/mk/defs.NetBSD.mk b/mk/platform/NetBSD.mk
index 36f31b94bfa..041d197816b 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/platform/NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.69 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: NetBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
diff --git a/mk/defs.OpenBSD.mk b/mk/platform/OpenBSD.mk
index 88feea39312..fd8b1915055 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/platform/OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.37 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: OpenBSD.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
diff --git a/mk/defs.SunOS.mk b/mk/platform/SunOS.mk
index 1b45a2ddb28..7ec8b9b22cb 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/platform/SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.89 2004/08/27 06:29:09 jlam Exp $
+# $NetBSD: SunOS.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
diff --git a/mk/defs.UnixWare.mk b/mk/platform/UnixWare.mk
index 08c8ab5a9da..b28b52d6560 100644
--- a/mk/defs.UnixWare.mk
+++ b/mk/platform/UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.UnixWare.mk,v 1.8 2004/09/21 15:01:40 jlam Exp $
+# $NetBSD: UnixWare.mk,v 1.1 2004/10/06 20:51:47 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
diff --git a/mk/tools.mk b/mk/tools.mk
index d132fd9dc53..3e293b2a865 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -1,4 +1,4 @@
-# $NetBSD: tools.mk,v 1.38 2004/08/23 09:33:25 seb Exp $
+# $NetBSD: tools.mk,v 1.39 2004/10/06 20:51:47 jlam Exp $
 #
 # This Makefile creates a ${TOOLS_DIR} directory and populates the bin
 # subdir with tools that hide the ones outside of ${TOOLS_DIR}.
@@ -148,7 +148,7 @@ _TOOLS_OPSYS_HAS_GNU.yacc+=	Linux-*-*
 
 # These platforms have GNUish versions of the tools available in the base
 # system, which we already define as ${AWK}, ${SED}, etc. (refer to
-# defs.*.mk for the definitions), so no need to pull in the pkgsrc
+# mk/platform/*.mk for the definitions), so no need to pull in the pkgsrc
 # versions; we will use these instead.
 #
 _TOOLS_REPLACE_OPSYS.awk+=	SunOS-*-*