24 files changed, 26 insertions, 26 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index e58414cef3c..a9aada29880 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1701 2005/06/23 12:12:11 wiz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1702 2005/06/23 18:41:57 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -400,7 +400,7 @@ LIBABISUFFIX?=
 TOUCH_FLAGS?=		-f
 
 # Figure out where the local mtree file is
-MTREE_FILE?=	${PKGSRCDIR}/mk/${OPSYS}.pkg.dist
+MTREE_FILE?=	${PKGSRCDIR}/mk/platform/${OPSYS}.pkg.dist
 MTREE_ARGS?=	-U -f ${MTREE_FILE} -d -e -p
 
 # Debugging levels for this file, dependent on PKG_DEBUG_LEVEL definition
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk
index f7cc027df56..6b64bfcd8ab 100644
--- a/mk/bsd.pkg.use.mk
+++ b/mk/bsd.pkg.use.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.use.mk,v 1.20 2005/06/14 20:14:50 jlam Exp $
+#	$NetBSD: bsd.pkg.use.mk,v 1.21 2005/06/23 18:41:57 jlam Exp $
 #
 # Turn USE_* macros into proper depedency logic.  Included near the top of
 # bsd.pkg.mk, after bsd.prefs.mk.
@@ -29,7 +29,7 @@ MAKE_FLAGS+=		CC=${CC:Q} CXX=${CXX:Q}
 .endif
 
 .if defined(USE_X11BASE)
-MTREE_FILE?=		${PKGSRCDIR}/mk/${OPSYS}.x11.dist
+MTREE_FILE?=		${PKGSRCDIR}/mk/platform/${OPSYS}.x11.dist
 .  include "../../mk/x11.buildlink3.mk"
 .endif
 
diff --git a/mk/AIX.pkg.dist b/mk/platform/AIX.pkg.dist
index 214262b0b9f..f20771f21f2 100644
--- a/mk/AIX.pkg.dist
+++ b/mk/platform/AIX.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: AIX.pkg.dist,v 1.34 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: AIX.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
diff --git a/mk/BSDOS.pkg.dist b/mk/platform/BSDOS.pkg.dist
index 062fe07107b..8b8497bb50b 100644
--- a/mk/BSDOS.pkg.dist
+++ b/mk/platform/BSDOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: BSDOS.pkg.dist,v 1.34 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: BSDOS.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/Darwin.pkg.dist b/mk/platform/Darwin.pkg.dist
index 41a383200d4..0c5c445940b 100644
--- a/mk/Darwin.pkg.dist
+++ b/mk/platform/Darwin.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Darwin.pkg.dist,v 1.69 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: Darwin.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/Darwin.x11.dist b/mk/platform/Darwin.x11.dist
index e343ddae02e..94a07327627 100644
--- a/mk/Darwin.x11.dist
+++ b/mk/platform/Darwin.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: Darwin.x11.dist,v 1.34 2005/01/04 09:01:44 jmmv Exp $
+#     $NetBSD: Darwin.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/DragonFly.pkg.dist b/mk/platform/DragonFly.pkg.dist
index 8c5de9e2387..28fe9c3ceca 100644
--- a/mk/DragonFly.pkg.dist
+++ b/mk/platform/DragonFly.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: DragonFly.pkg.dist,v 1.10 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: DragonFly.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/DragonFly.x11.dist b/mk/platform/DragonFly.x11.dist
index fbf3cf4b522..806ddaafcae 100644
--- a/mk/DragonFly.x11.dist
+++ b/mk/platform/DragonFly.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: DragonFly.x11.dist,v 1.2 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: DragonFly.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/FreeBSD.pkg.dist b/mk/platform/FreeBSD.pkg.dist
index 0f5eac77de2..f20ec1cdbf9 100644
--- a/mk/FreeBSD.pkg.dist
+++ b/mk/platform/FreeBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: FreeBSD.pkg.dist,v 1.60 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: FreeBSD.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/FreeBSD.x11.dist b/mk/platform/FreeBSD.x11.dist
index 1bab0d95d52..c6fef987e0a 100644
--- a/mk/FreeBSD.x11.dist
+++ b/mk/platform/FreeBSD.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: FreeBSD.x11.dist,v 1.10 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: FreeBSD.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/IRIX.pkg.dist b/mk/platform/IRIX.pkg.dist
index 9b1ba95c334..12fc6b6bf3e 100644
--- a/mk/IRIX.pkg.dist
+++ b/mk/platform/IRIX.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: IRIX.pkg.dist,v 1.59 2005/05/19 16:45:33 jmmv Exp $
+# $NetBSD: IRIX.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
diff --git a/mk/IRIX.x11.dist b/mk/platform/IRIX.x11.dist
index e46866b1a84..9478ba6628a 100644
--- a/mk/IRIX.x11.dist
+++ b/mk/platform/IRIX.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: IRIX.x11.dist,v 1.14 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: IRIX.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/Interix.pkg.dist b/mk/platform/Interix.pkg.dist
index 4410da1dba5..fec170f52de 100644
--- a/mk/Interix.pkg.dist
+++ b/mk/platform/Interix.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Interix.pkg.dist,v 1.24 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: Interix.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uid=197108 gid=131616 mode=0775
diff --git a/mk/Interix.x11.dist b/mk/platform/Interix.x11.dist
index 3511808ffd8..b2f1a503308 100644
--- a/mk/Interix.x11.dist
+++ b/mk/platform/Interix.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: Interix.x11.dist,v 1.5 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: Interix.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/Linux.pkg.dist b/mk/platform/Linux.pkg.dist
index 12dd7c42654..8288a5de807 100644
--- a/mk/Linux.pkg.dist
+++ b/mk/platform/Linux.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: Linux.pkg.dist,v 1.76 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: Linux.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
diff --git a/mk/Linux.x11.dist b/mk/platform/Linux.x11.dist
index d7d79ed08a9..b7981f481d8 100644
--- a/mk/Linux.x11.dist
+++ b/mk/platform/Linux.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: Linux.x11.dist,v 1.40 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: Linux.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/NetBSD.pkg.dist b/mk/platform/NetBSD.pkg.dist
index 190bec780ea..58ad516fc3d 100644
--- a/mk/NetBSD.pkg.dist
+++ b/mk/platform/NetBSD.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: NetBSD.pkg.dist,v 1.87 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: NetBSD.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/NetBSD.x11.dist b/mk/platform/NetBSD.x11.dist
index f5c4bd95e8e..56464c6ba42 100644
--- a/mk/NetBSD.x11.dist
+++ b/mk/platform/NetBSD.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: NetBSD.x11.dist,v 1.41 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: NetBSD.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/OSF1.pkg.dist b/mk/platform/OSF1.pkg.dist
index 0a3bfd19957..ec0c5a27ab9 100644
--- a/mk/OSF1.pkg.dist
+++ b/mk/platform/OSF1.pkg.dist
@@ -1,4 +1,4 @@
-# $NetBSD: OSF1.pkg.dist,v 1.10 2005/05/19 16:45:33 jmmv Exp $
+# $NetBSD: OSF1.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=system mode=0755
diff --git a/mk/OpenBSD.pkg.dist b/mk/platform/OpenBSD.pkg.dist
index 05cf3be1dd8..33af60e1cb5 100644
--- a/mk/OpenBSD.pkg.dist
+++ b/mk/platform/OpenBSD.pkg.dist
@@ -1,4 +1,4 @@
-#	$NetBSD: OpenBSD.pkg.dist,v 1.59 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: OpenBSD.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=wheel mode=0755
diff --git a/mk/OpenBSD.x11.dist b/mk/platform/OpenBSD.x11.dist
index f0fe8a98aea..7938e9e83e1 100644
--- a/mk/OpenBSD.x11.dist
+++ b/mk/platform/OpenBSD.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: OpenBSD.x11.dist,v 1.28 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: OpenBSD.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #  	OpenBSD: BSD.x11.dist,v 1.4 2002/06/09 06:15:15 todd Exp 
 #	FreeBSD: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 
diff --git a/mk/SunOS.pkg.dist b/mk/platform/SunOS.pkg.dist
index a9712bf5f7f..899ed4689f4 100644
--- a/mk/SunOS.pkg.dist
+++ b/mk/platform/SunOS.pkg.dist
@@ -1,5 +1,5 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
-#	$NetBSD: SunOS.pkg.dist,v 1.81 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: SunOS.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755
diff --git a/mk/SunOS.x11.dist b/mk/platform/SunOS.x11.dist
index 90934abdeea..d98cabfaf8a 100644
--- a/mk/SunOS.x11.dist
+++ b/mk/platform/SunOS.x11.dist
@@ -1,4 +1,4 @@
-#     $NetBSD: SunOS.x11.dist,v 1.41 2005/01/04 09:01:45 jmmv Exp $
+#     $NetBSD: SunOS.x11.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #     FreeBSD Id: BSD.x11.dist,v 1.2 1997/06/10 07:55:10 asami Exp
 #
 
diff --git a/mk/UnixWare.pkg.dist b/mk/platform/UnixWare.pkg.dist
index 87f52a878bc..d97fe01784f 100644
--- a/mk/UnixWare.pkg.dist
+++ b/mk/platform/UnixWare.pkg.dist
@@ -1,6 +1,6 @@
 #     Id: BSD.local.dist,v 1.30 1997/08/01 13:16:39 phk Exp 
 #	NetBSD: SunOS.pkg.dist,v 1.64 2004/04/01 12:19:09 jmmv Exp
-#	$NetBSD: UnixWare.pkg.dist,v 1.18 2005/05/19 16:45:33 jmmv Exp $
+#	$NetBSD: UnixWare.pkg.dist,v 1.1 2005/06/23 18:41:57 jlam Exp $
 #
 
 /set type=dir uname=root gname=sys mode=0755