* If PLIST_SRC is explicitly set to an empty value in a package Makefile,

  then automatically generate a PLIST that says "${PKGNAME} has no files".

* If PLIST_SRC and GENERATE_PLIST are not set in a package Makefile,
  and no PLIST files exist, then fail during the package build with
  PKG_FAIL_REASON.

* Remove "intentionally empty" PLISTs again.

Now, the easy way to say that a package installs no files is to just
add the following to the package Makefile:

	PLIST_SRC=	# empty

56 files changed, 61 insertions, 113 deletions

diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile
index cbb6e2538e2..5c050a8eb7a 100644
--- a/meta-pkgs/boost/Makefile
+++ b/meta-pkgs/boost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/06/02 17:52:16 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:49 jlam Exp $
 #
 
 BOOST_PACKAGE=	meta-pkg
@@ -28,7 +28,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-patch:	# empty
 
diff --git a/meta-pkgs/boost/PLIST b/meta-pkgs/boost/PLIST
deleted file mode 100644
index 93fce6c50a8..00000000000
--- a/meta-pkgs/boost/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:51 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/courier/Makefile b/meta-pkgs/courier/Makefile
index 9d9cd1ce033..002416ca942 100644
--- a/meta-pkgs/courier/Makefile
+++ b/meta-pkgs/courier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/10/17 13:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/10/25 22:00:49 jlam Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGREVISION=	1
@@ -42,6 +42,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/courier/PLIST b/meta-pkgs/courier/PLIST
deleted file mode 100644
index 93fce6c50a8..00000000000
--- a/meta-pkgs/courier/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:51 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/fxtv-capture/Makefile b/meta-pkgs/fxtv-capture/Makefile
index b01b941416d..89f81f55088 100644
--- a/meta-pkgs/fxtv-capture/Makefile
+++ b/meta-pkgs/fxtv-capture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/06/15 13:31:29 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2007/10/25 22:00:50 jlam Exp $
 #
 
 DISTNAME=	fxtv-capture-1.1
@@ -20,7 +20,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/fxtv-capture/PLIST b/meta-pkgs/fxtv-capture/PLIST
deleted file mode 100644
index 93fce6c50a8..00000000000
--- a/meta-pkgs/fxtv-capture/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:51 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index a5493d67742..1194571ae02 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2007/09/21 13:03:59 wiz Exp $
+# $NetBSD: Makefile,v 1.44 2007/10/25 22:00:50 jlam Exp $
 
 DISTNAME=	gnome-base-2.18.1
 CATEGORIES=	meta-pkgs x11 gnome
@@ -82,7 +82,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/gnome-base/PLIST b/meta-pkgs/gnome-base/PLIST
deleted file mode 100644
index 93fce6c50a8..00000000000
--- a/meta-pkgs/gnome-base/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:51 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/gnome-devel/Makefile b/meta-pkgs/gnome-devel/Makefile
index a5fe80e28ae..f8dbaf0b068 100644
--- a/meta-pkgs/gnome-devel/Makefile
+++ b/meta-pkgs/gnome-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2006/09/15 15:25:27 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2007/10/25 22:00:51 jlam Exp $
 
 DISTNAME=	gnome-devel-2.16.0
 CATEGORIES=	meta-pkgs devel gnome
@@ -22,9 +22,10 @@ DEPENDS+=	libtool>=1.5.22:../../devel/libtool
 DEPENDS+=	pkg-config>=0.21:../../devel/pkg-config
 
 EXTRACT_ONLY=	# empty
-NO_BUILD=	yes
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
+NO_BUILD=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/gnome-devel/PLIST b/meta-pkgs/gnome-devel/PLIST
deleted file mode 100644
index 93fce6c50a8..00000000000
--- a/meta-pkgs/gnome-devel/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:51 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 0d8253084c4..68fbe8edb56 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2007/09/22 06:42:52 wiz Exp $
+# $NetBSD: Makefile,v 1.72 2007/10/25 22:00:51 jlam Exp $
 
 DISTNAME=	gnome-2.18.1
 PKGREVISION=	1
@@ -74,7 +74,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/gnome/PLIST b/meta-pkgs/gnome/PLIST
deleted file mode 100644
index 1529d74af19..00000000000
--- a/meta-pkgs/gnome/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/gnuradio/Makefile b/meta-pkgs/gnuradio/Makefile
index c04b561cab3..c93eb53a116 100644
--- a/meta-pkgs/gnuradio/Makefile
+++ b/meta-pkgs/gnuradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2007/08/08 02:55:13 wulf Exp $
+# $NetBSD: Makefile,v 1.10 2007/10/25 22:00:52 jlam Exp $
 
 .include	"../../meta-pkgs/gnuradio/Makefile.version"
 
@@ -37,7 +37,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/gnuradio/PLIST b/meta-pkgs/gnuradio/PLIST
deleted file mode 100644
index 1529d74af19..00000000000
--- a/meta-pkgs/gnuradio/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/gnustep/Makefile b/meta-pkgs/gnustep/Makefile
index 80d7353d9e4..14b24b7aba1 100644
--- a/meta-pkgs/gnustep/Makefile
+++ b/meta-pkgs/gnustep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2007/09/21 13:03:59 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2007/10/25 22:00:52 jlam Exp $
 
 DISTNAME=	gnustep-1.11.2
 PKGREVISION=	3
@@ -25,8 +25,8 @@ DEPENDS+=	gworkspace>=0.7.1:../../sysutils/gworkspace
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
 EXTRACT_ONLY=	# empty
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/gnustep/PLIST b/meta-pkgs/gnustep/PLIST
deleted file mode 100644
index 1529d74af19..00000000000
--- a/meta-pkgs/gnustep/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/gtk2-extras/Makefile b/meta-pkgs/gtk2-extras/Makefile
index 7b701213526..d4d9d2c19bc 100644
--- a/meta-pkgs/gtk2-extras/Makefile
+++ b/meta-pkgs/gtk2-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2007/09/20 22:52:11 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2007/10/25 22:00:52 jlam Exp $
 
 DISTNAME=	gtk2-extras-2.8.0
 PKGREVISION=	4
@@ -19,7 +19,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/gtk2-extras/PLIST b/meta-pkgs/gtk2-extras/PLIST
deleted file mode 100644
index 1529d74af19..00000000000
--- a/meta-pkgs/gtk2-extras/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/kde3/Makefile b/meta-pkgs/kde3/Makefile
index ecaf0e02f6e..a784969f8d3 100644
--- a/meta-pkgs/kde3/Makefile
+++ b/meta-pkgs/kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2007/10/20 10:34:50 markd Exp $
+# $NetBSD: Makefile,v 1.58 2007/10/25 22:00:53 jlam Exp $
 
 DISTNAME=	kde-3.5.8
 CATEGORIES=	meta-pkgs x11 kde
@@ -28,7 +28,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/kde3/PLIST b/meta-pkgs/kde3/PLIST
deleted file mode 100644
index 1529d74af19..00000000000
--- a/meta-pkgs/kde3/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/matchbox/Makefile b/meta-pkgs/matchbox/Makefile
index f3c400b5fca..f99d371036d 100644
--- a/meta-pkgs/matchbox/Makefile
+++ b/meta-pkgs/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/03/04 21:30:09 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/10/25 22:00:53 jlam Exp $
 #
 
 DISTNAME=	matchbox-0.9.5
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/matchbox/PLIST b/meta-pkgs/matchbox/PLIST
deleted file mode 100644
index 1529d74af19..00000000000
--- a/meta-pkgs/matchbox/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:52 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/modular-xorg-apps/Makefile b/meta-pkgs/modular-xorg-apps/Makefile
index c484677b8af..fa818304c6f 100644
--- a/meta-pkgs/modular-xorg-apps/Makefile
+++ b/meta-pkgs/modular-xorg-apps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/09/14 00:30:11 simonb Exp $
+# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:53 jlam Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-apps-1.4
@@ -62,10 +62,10 @@ DEPENDS+=	xwininfo-[0-9]*:../../x11/xwininfo
 DEPENDS+=	xwd-[0-9]*:../../x11/xwd
 DEPENDS+=	xwud-[0-9]*:../../x11/xwud
 
-NO_BUILD=		yes
 NO_CHECKSUM=		yes
-NO_MTREE=		yes
 NO_CONFIGURE=		yes
+NO_BUILD=		yes
+PLIST_SRC=		# empty (meta-package)
 
 do-install:
 
diff --git a/meta-pkgs/modular-xorg-apps/PLIST b/meta-pkgs/modular-xorg-apps/PLIST
deleted file mode 100644
index 8ff1b2a0eda..00000000000
--- a/meta-pkgs/modular-xorg-apps/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:53 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/modular-xorg-drivers/Makefile b/meta-pkgs/modular-xorg-drivers/Makefile
index 9d27809368a..a845de86839 100644
--- a/meta-pkgs/modular-xorg-drivers/Makefile
+++ b/meta-pkgs/modular-xorg-drivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/09/10 04:06:45 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2007/10/25 22:00:54 jlam Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-drivers-1.1
@@ -13,10 +13,10 @@ COMMENT=	Modular Xorg driver meta-package
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-NO_BUILD=		yes
 NO_CHECKSUM=		yes
-NO_MTREE=		yes
 NO_CONFIGURE=		yes
+NO_BUILD=		yes
+PLIST_SRC=		# empty (meta-package)
 
 do-install:
 
diff --git a/meta-pkgs/modular-xorg-drivers/PLIST b/meta-pkgs/modular-xorg-drivers/PLIST
deleted file mode 100644
index 8ff1b2a0eda..00000000000
--- a/meta-pkgs/modular-xorg-drivers/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:53 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/modular-xorg-fonts/Makefile b/meta-pkgs/modular-xorg-fonts/Makefile
index 8bc020bf56b..8a31d12f984 100644
--- a/meta-pkgs/modular-xorg-fonts/Makefile
+++ b/meta-pkgs/modular-xorg-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/03/24 22:42:50 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/10/25 22:00:54 jlam Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-fonts-1.0
@@ -37,10 +37,10 @@ DEPENDS+=	font-misc-misc-[0-9]*:../../fonts/font-misc-misc
 DEPENDS+=	font-mutt-misc-[0-9]*:../../fonts/font-mutt-misc
 DEPENDS+=	vera-ttf-[0-9]*:../../fonts/vera-ttf
 
-NO_BUILD=		yes
 NO_CHECKSUM=		yes
-NO_MTREE=		yes
 NO_CONFIGURE=		yes
+NO_BUILD=		yes
+PLIST_SRC=		# empty (meta-package)
 
 do-install:
 
diff --git a/meta-pkgs/modular-xorg-fonts/PLIST b/meta-pkgs/modular-xorg-fonts/PLIST
deleted file mode 100644
index 8ff1b2a0eda..00000000000
--- a/meta-pkgs/modular-xorg-fonts/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:53 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/modular-xorg-libs/Makefile b/meta-pkgs/modular-xorg-libs/Makefile
index d8177d9d602..ae679b753d5 100644
--- a/meta-pkgs/modular-xorg-libs/Makefile
+++ b/meta-pkgs/modular-xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2007/08/16 01:45:24 joerg Exp $
+# $NetBSD: Makefile,v 1.2 2007/10/25 22:00:54 jlam Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-libs-1.0
@@ -49,10 +49,10 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libxkbui/buildlink3.mk"
 
-NO_BUILD=		yes
 NO_CHECKSUM=		yes
-NO_MTREE=		yes
 NO_CONFIGURE=		yes
+NO_BUILD=		yes
+PLIST_SRC=		# empty (meta-package)
 
 do-install:
 
diff --git a/meta-pkgs/modular-xorg-libs/PLIST b/meta-pkgs/modular-xorg-libs/PLIST
deleted file mode 100644
index 8ff1b2a0eda..00000000000
--- a/meta-pkgs/modular-xorg-libs/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:53 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/netbsd-doc-print/Makefile b/meta-pkgs/netbsd-doc-print/Makefile
index 2ae56842583..5057b338823 100644
--- a/meta-pkgs/netbsd-doc-print/Makefile
+++ b/meta-pkgs/netbsd-doc-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/10/23 21:40:08 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2007/10/25 22:00:55 jlam Exp $
 #
 
 DISTNAME=	netbsd-doc-print-1.2
@@ -20,7 +20,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 USE_TOOLS+=	gs:run
 
 do-install:	# empty
diff --git a/meta-pkgs/netbsd-doc-print/PLIST b/meta-pkgs/netbsd-doc-print/PLIST
deleted file mode 100644
index 0b7f8f742dd..00000000000
--- a/meta-pkgs/netbsd-doc-print/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:54 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/netbsd-doc/Makefile b/meta-pkgs/netbsd-doc/Makefile
index dc89d962f9c..25692fc0727 100644
--- a/meta-pkgs/netbsd-doc/Makefile
+++ b/meta-pkgs/netbsd-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2007/10/23 21:32:08 heinz Exp $
+# $NetBSD: Makefile,v 1.16 2007/10/25 22:00:55 jlam Exp $
 #
 
 DISTNAME=	netbsd-doc-1.2
@@ -25,7 +25,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/netbsd-doc/PLIST b/meta-pkgs/netbsd-doc/PLIST
deleted file mode 100644
index 0b7f8f742dd..00000000000
--- a/meta-pkgs/netbsd-doc/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:54 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/netbsd-www/Makefile b/meta-pkgs/netbsd-www/Makefile
index 05184443754..03146c99423 100644
--- a/meta-pkgs/netbsd-www/Makefile
+++ b/meta-pkgs/netbsd-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/10/23 20:19:57 heinz Exp $
+# $NetBSD: Makefile,v 1.22 2007/10/25 22:00:56 jlam Exp $
 #
 
 DISTNAME=	netbsd-www-1.4
@@ -28,7 +28,7 @@ USE_TOOLS+=	perl:run
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:
 	@${DO_NADA}
diff --git a/meta-pkgs/netbsd-www/PLIST b/meta-pkgs/netbsd-www/PLIST
deleted file mode 100644
index 0b7f8f742dd..00000000000
--- a/meta-pkgs/netbsd-www/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:54 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/php4-extensions/Makefile b/meta-pkgs/php4-extensions/Makefile
index b95fe499c30..3ce55d7b831 100644
--- a/meta-pkgs/php4-extensions/Makefile
+++ b/meta-pkgs/php4-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/11/06 21:36:49 jdolecek Exp $
+# $NetBSD: Makefile,v 1.21 2007/10/25 22:00:56 jlam Exp $
 
 DISTNAME=	php-extensions-4.4
 PKGREVISION=	9
@@ -65,7 +65,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/php4-extensions/PLIST b/meta-pkgs/php4-extensions/PLIST
deleted file mode 100644
index 0b7f8f742dd..00000000000
--- a/meta-pkgs/php4-extensions/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:54 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/pkg_developer/Makefile b/meta-pkgs/pkg_developer/Makefile
index 82ca6e342d2..f7ef52cb625 100644
--- a/meta-pkgs/pkg_developer/Makefile
+++ b/meta-pkgs/pkg_developer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2006/10/14 11:57:51 adrianp Exp $
+# $NetBSD: Makefile,v 1.3 2007/10/25 22:00:56 jlam Exp $
 #
 
 DISTNAME=	pkg_developer-1.1
@@ -25,7 +25,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/pkg_developer/PLIST b/meta-pkgs/pkg_developer/PLIST
deleted file mode 100644
index 0b7f8f742dd..00000000000
--- a/meta-pkgs/pkg_developer/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:54 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/pkgsrc-guide-tools/Makefile b/meta-pkgs/pkgsrc-guide-tools/Makefile
index e017ddf4e03..53af78d7c64 100644
--- a/meta-pkgs/pkgsrc-guide-tools/Makefile
+++ b/meta-pkgs/pkgsrc-guide-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/03/19 16:40:27 tv Exp $
+# $NetBSD: Makefile,v 1.4 2007/10/25 22:00:57 jlam Exp $
 #
 
 DISTNAME=	pkgsrc-guide-tools-1.0
@@ -17,7 +17,7 @@ _GUIDE_DEPTYPE=	run
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:
 	@${DO_NADA}
diff --git a/meta-pkgs/pkgsrc-guide-tools/PLIST b/meta-pkgs/pkgsrc-guide-tools/PLIST
deleted file mode 100644
index e8671810f41..00000000000
--- a/meta-pkgs/pkgsrc-guide-tools/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:55 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index b445ea9f899..3e13ea4bed2 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/05/27 02:02:51 obache Exp $
+# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:57 jlam Exp $
 #
 
 PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
@@ -24,7 +24,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/ruby-gnome2/PLIST b/meta-pkgs/ruby-gnome2/PLIST
deleted file mode 100644
index e8671810f41..00000000000
--- a/meta-pkgs/ruby-gnome2/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:55 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/suse100/Makefile b/meta-pkgs/suse100/Makefile
index e362687cf96..a73435d076e 100644
--- a/meta-pkgs/suse100/Makefile
+++ b/meta-pkgs/suse100/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/07/29 05:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/10/25 22:00:57 jlam Exp $
 
 DISTNAME=	suse-${SUSE_VERSION}
 PKGREVISION=	4
@@ -17,6 +17,7 @@ EMUL_PKG_FMT=		plain
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/suse100/PLIST b/meta-pkgs/suse100/PLIST
deleted file mode 100644
index e8671810f41..00000000000
--- a/meta-pkgs/suse100/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:55 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/suse9/Makefile b/meta-pkgs/suse9/Makefile
index 14cafaa65a8..ead861f9800 100644
--- a/meta-pkgs/suse9/Makefile
+++ b/meta-pkgs/suse9/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2007/07/29 05:19:35 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:58 jlam Exp $
 
 DISTNAME=	suse-${SUSE_VERSION}
 PKGREVISION=	4
@@ -14,6 +14,7 @@ COMMENT=	SUSE-based Linux binary emulation environment
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/suse9/PLIST b/meta-pkgs/suse9/PLIST
deleted file mode 100644
index e8671810f41..00000000000
--- a/meta-pkgs/suse9/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:55 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/web-server/Makefile b/meta-pkgs/web-server/Makefile
index 0109387ebb1..3188b226e4e 100644
--- a/meta-pkgs/web-server/Makefile
+++ b/meta-pkgs/web-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/03/04 21:30:09 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2007/10/25 22:00:58 jlam Exp $
 #
 
 DISTNAME=	web-server-1.1
@@ -18,7 +18,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/web-server/PLIST b/meta-pkgs/web-server/PLIST
deleted file mode 100644
index e8671810f41..00000000000
--- a/meta-pkgs/web-server/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:55 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/windowmaker-desktop/Makefile b/meta-pkgs/windowmaker-desktop/Makefile
index 3f5fcb5d755..c963981ad63 100644
--- a/meta-pkgs/windowmaker-desktop/Makefile
+++ b/meta-pkgs/windowmaker-desktop/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/05/30 19:49:24 reed Exp $
+# $NetBSD: Makefile,v 1.21 2007/10/25 22:00:58 jlam Exp $
 #
 
 DISTNAME=	windowmaker-desktop-1.2
@@ -30,7 +30,7 @@ EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 
 do-install:	# empty
 
diff --git a/meta-pkgs/windowmaker-desktop/PLIST b/meta-pkgs/windowmaker-desktop/PLIST
deleted file mode 100644
index 4255d0c6272..00000000000
--- a/meta-pkgs/windowmaker-desktop/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.3 2007/10/25 17:49:56 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index b01e249d8fb..916de905347 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/09/21 13:03:59 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2007/10/25 22:00:59 jlam Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -11,7 +11,7 @@ COMMENT=	Xfce extras
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 WRKSRC=		${WRKDIR}
 
 do-install:
diff --git a/meta-pkgs/xfce4-extras/PLIST b/meta-pkgs/xfce4-extras/PLIST
deleted file mode 100644
index f9c59e0a03b..00000000000
--- a/meta-pkgs/xfce4-extras/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/10/25 17:49:56 jlam Exp $
-@comment this plist intentionally left empty
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 94d27f571b8..b8039dd7d48 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2007/09/21 13:03:59 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2007/10/25 22:00:59 jlam Exp $
 
 .include "Makefile.common"
 
@@ -11,7 +11,7 @@ COMMENT=	Xfce
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-NO_MTREE=	yes
+PLIST_SRC=	# empty (meta-package)
 WRKSRC=		${WRKDIR}
 
 do-install:
diff --git a/meta-pkgs/xfce4/PLIST b/meta-pkgs/xfce4/PLIST
deleted file mode 100644
index f9c59e0a03b..00000000000
--- a/meta-pkgs/xfce4/PLIST
+++ /dev/null
@@ -1,2 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2007/10/25 17:49:56 jlam Exp $
-@comment this plist intentionally left empty