Replaced the custom definitions with META_PACKAGE=yes.

29 files changed, 62 insertions, 257 deletions

diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile
index 5c050a8eb7a..230649f2269 100644
--- a/meta-pkgs/boost/Makefile
+++ b/meta-pkgs/boost/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/19 12:27:27 rillig Exp $
 #
 
 BOOST_PACKAGE=	meta-pkg
@@ -24,14 +24,6 @@ DEPENDS+=	boost-jam-${BOOST_DEPENDS_VERSION}:../../devel/boost-jam
 DEPENDS+=	boost-libs-${BOOST_DEPENDS_VERSION}:../../devel/boost-libs
 DEPENDS+=	boost-python-${BOOST_DEPENDS_VERSION}:../../devel/boost-python
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-patch:	# empty
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/courier/Makefile b/meta-pkgs/courier/Makefile
index 002416ca942..ccd4f1b0051 100644
--- a/meta-pkgs/courier/Makefile
+++ b/meta-pkgs/courier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2007/10/25 22:00:49 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2007/12/19 12:27:27 rillig Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 PKGREVISION=	1
@@ -38,12 +38,6 @@ DEPENDS+=	sqwebmail>=5.2.0:../../mail/sqwebmail
 #
 DEPENDS+=	courier-analog>=0.15:../../mail/courier-analog
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/fxtv-capture/Makefile b/meta-pkgs/fxtv-capture/Makefile
index 89f81f55088..78e3d24ef05 100644
--- a/meta-pkgs/fxtv-capture/Makefile
+++ b/meta-pkgs/fxtv-capture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2007/10/25 22:00:50 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2007/12/19 12:27:27 rillig Exp $
 #
 
 DISTNAME=	fxtv-capture-1.1
@@ -16,12 +16,6 @@ DEPENDS+=	fxtv>=1.03nb1:../../multimedia/fxtv
 DEPENDS+=	mpeg_encode-[0-9]*:../../multimedia/mpeg_encode
 DEPENDS+=	mjpegtools>=1.8.0nb1:../../multimedia/mjpegtools
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index 9d986fd687d..3a58e296874 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.45 2007/11/08 12:37:08 drochner Exp $
+# $NetBSD: Makefile,v 1.46 2007/12/19 12:27:27 rillig Exp $
 
 DISTNAME=	gnome-base-2.18.1
 CATEGORIES=	meta-pkgs x11 gnome
@@ -77,12 +77,6 @@ DEPENDS+=	vte>=0.16.1:../../x11/vte
 DEPENDS+=	gnome-terminal>=2.18.0:../../x11/gnome-terminal
 DEPENDS+=	gnome-session>=2.18.0:../../x11/gnome-session
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome-devel/Makefile b/meta-pkgs/gnome-devel/Makefile
index f8dbaf0b068..97225b13bf5 100644
--- a/meta-pkgs/gnome-devel/Makefile
+++ b/meta-pkgs/gnome-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2007/10/25 22:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2007/12/19 12:27:28 rillig Exp $
 
 DISTNAME=	gnome-devel-2.16.0
 CATEGORIES=	meta-pkgs devel gnome
@@ -21,12 +21,6 @@ DEPENDS+=	intltool>=0.35.0:../../textproc/intltool
 DEPENDS+=	libtool>=1.5.22:../../devel/libtool
 DEPENDS+=	pkg-config>=0.21:../../devel/pkg-config
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 68fbe8edb56..bbccc5fa959 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.72 2007/10/25 22:00:51 jlam Exp $
+# $NetBSD: Makefile,v 1.73 2007/12/19 12:27:27 rillig Exp $
 
 DISTNAME=	gnome-2.18.1
 PKGREVISION=	1
@@ -70,12 +70,6 @@ DEPENDS+=	gnome-vfs-monikers>=2.15.3:../../sysutils/gnome-vfs-monikers
 #DEPENDS+=	orca-1.0.0.tar.bz2
 #DEPENDS+=	tomboy-0.4.0.tar.bz2
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnuradio/Makefile b/meta-pkgs/gnuradio/Makefile
index c93eb53a116..e51cffd5bf2 100644
--- a/meta-pkgs/gnuradio/Makefile
+++ b/meta-pkgs/gnuradio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2007/10/25 22:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2007/12/19 12:27:28 rillig Exp $
 
 .include	"../../meta-pkgs/gnuradio/Makefile.version"
 
@@ -33,12 +33,6 @@ DEPENDS+=	gnuradio-radio-astronomy-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-radi
 .endif
 DEPENDS+=	gnuradio-howto-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-howto
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnustep/Makefile b/meta-pkgs/gnustep/Makefile
index 14b24b7aba1..3f23950ebe2 100644
--- a/meta-pkgs/gnustep/Makefile
+++ b/meta-pkgs/gnustep/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2007/10/25 22:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2007/12/19 12:27:28 rillig Exp $
 
 DISTNAME=	gnustep-1.11.2
 PKGREVISION=	3
 CATEGORIES=	meta-pkgs x11 gnustep
 MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://www.gnustep.org/
@@ -22,13 +21,7 @@ DEPENDS+=	ProjectCenter>=0.4.3:../../devel/ProjectCenter
 DEPENDS+=	Renaissance>=0.8.0:../../devel/Renaissance
 DEPENDS+=	gworkspace>=0.7.1:../../sysutils/gworkspace
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-EXTRACT_ONLY=	# empty
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../x11/gnustep-back/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gtk2-extras/Makefile b/meta-pkgs/gtk2-extras/Makefile
index d4d9d2c19bc..4fe59e12cd7 100644
--- a/meta-pkgs/gtk2-extras/Makefile
+++ b/meta-pkgs/gtk2-extras/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2007/10/25 22:00:52 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2007/12/19 12:27:28 rillig Exp $
 
 DISTNAME=	gtk2-extras-2.8.0
 PKGREVISION=	4
 CATEGORIES=	meta-pkgs x11 gnome
 MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gtk.org/
@@ -15,12 +14,6 @@ DEPENDS+=	gtk2-engines>=2.6.0:../../x11/gtk2-engines
 DEPENDS+=	librsvg>=2.12.6:../../graphics/librsvg
 DEPENDS+=	swfdec-gtk2>=0.2.1nb1:../../multimedia/swfdec-gtk2
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/kde3/Makefile b/meta-pkgs/kde3/Makefile
index a784969f8d3..15b9b37598b 100644
--- a/meta-pkgs/kde3/Makefile
+++ b/meta-pkgs/kde3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2007/10/25 22:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.59 2007/12/19 12:27:28 rillig Exp $
 
 DISTNAME=	kde-3.5.8
 CATEGORIES=	meta-pkgs x11 kde
@@ -24,12 +24,6 @@ DEPENDS+=	kdetoys-3.5.8{,nb[0-9]*}:../../games/kdetoys3
 DEPENDS+=	kdeutils-3.5.8{,nb[0-9]*}:../../misc/kdeutils3
 DEPENDS+=	kdewebdev-3.5.8{,nb[0-9]*}:../../www/kdewebdev3
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/matchbox/Makefile b/meta-pkgs/matchbox/Makefile
index f99d371036d..43fe49a8116 100644
--- a/meta-pkgs/matchbox/Makefile
+++ b/meta-pkgs/matchbox/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/10/25 22:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2007/12/19 12:27:29 rillig Exp $
 #
 
 DISTNAME=	matchbox-0.9.5
@@ -20,12 +20,6 @@ DEPENDS+=	matchbox-panel-[0-9]*:../../x11/matchbox-panel
 DEPENDS+=	matchbox-panel-manager-[0-9]*:../../x11/matchbox-panel-manager
 DEPENDS+=	matchbox-themes-extra-[0-9]*:../../x11/matchbox-themes-extra
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/modular-xorg-apps/Makefile b/meta-pkgs/modular-xorg-apps/Makefile
index fa818304c6f..65119e3f306 100644
--- a/meta-pkgs/modular-xorg-apps/Makefile
+++ b/meta-pkgs/modular-xorg-apps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:53 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/19 12:27:29 rillig Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-apps-1.4
@@ -62,11 +62,6 @@ DEPENDS+=	xwininfo-[0-9]*:../../x11/xwininfo
 DEPENDS+=	xwd-[0-9]*:../../x11/xwd
 DEPENDS+=	xwud-[0-9]*:../../x11/xwud
 
-NO_CHECKSUM=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-PLIST_SRC=		# empty (meta-package)
-
-do-install:
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/modular-xorg-drivers/Makefile b/meta-pkgs/modular-xorg-drivers/Makefile
index a845de86839..7c80bf3d3f8 100644
--- a/meta-pkgs/modular-xorg-drivers/Makefile
+++ b/meta-pkgs/modular-xorg-drivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2007/10/25 22:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2007/12/19 12:27:29 rillig Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-drivers-1.1
@@ -11,15 +11,6 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg driver meta-package
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
-NO_CHECKSUM=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-PLIST_SRC=		# empty (meta-package)
-
-do-install:
-
 .include "../../mk/bsd.prefs.mk"
 
 DEPENDS+=	xf86-input-keyboard-[0-9]*:../../x11/xf86-input-keyboard
@@ -59,4 +50,6 @@ DEPENDS+=	xf86-video-vmware-[0-9]*:../../x11/xf86-video-vmware
 DEPENDS+=	xf86-video-wsfb-[0-9]*:../../x11/xf86-video-wsfb
 .endif
 
+META_PACKAGE=	yes
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/modular-xorg-fonts/Makefile b/meta-pkgs/modular-xorg-fonts/Makefile
index 8a31d12f984..d0ff619e189 100644
--- a/meta-pkgs/modular-xorg-fonts/Makefile
+++ b/meta-pkgs/modular-xorg-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/10/25 22:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/19 12:27:29 rillig Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-fonts-1.0
@@ -10,8 +10,6 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg font meta-package
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 DEPENDS+=	font-adobe-100dpi-[0-9]*:../../fonts/font-adobe-100dpi
 DEPENDS+=	font-adobe-75dpi-[0-9]*:../../fonts/font-adobe-75dpi
 DEPENDS+=	font-adobe-utopia-100dpi-[0-9]*:../../fonts/font-adobe-utopia-100dpi
@@ -37,11 +35,6 @@ 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_CHECKSUM=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-PLIST_SRC=		# empty (meta-package)
-
-do-install:
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/modular-xorg-libs/Makefile b/meta-pkgs/modular-xorg-libs/Makefile
index ae679b753d5..13ada883b65 100644
--- a/meta-pkgs/modular-xorg-libs/Makefile
+++ b/meta-pkgs/modular-xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2007/10/25 22:00:54 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/19 12:27:29 rillig Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-libs-1.0
@@ -10,8 +10,6 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg library meta-package
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 .include "../../x11/libFS/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
@@ -49,11 +47,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libxkbui/buildlink3.mk"
 
-NO_CHECKSUM=		yes
-NO_CONFIGURE=		yes
-NO_BUILD=		yes
-PLIST_SRC=		# empty (meta-package)
-
-do-install:
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/netbsd-doc-print/Makefile b/meta-pkgs/netbsd-doc-print/Makefile
index 5057b338823..f9741890318 100644
--- a/meta-pkgs/netbsd-doc-print/Makefile
+++ b/meta-pkgs/netbsd-doc-print/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/10/25 22:00:55 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2007/12/19 12:27:29 rillig Exp $
 #
 
 DISTNAME=	netbsd-doc-print-1.2
@@ -10,20 +10,12 @@ DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Meta-package including all packages to convert SGML->PDF/PS
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 DEPENDS+=	tex-jadetex>=2.20nb1:../../print/tex-jadetex
 DEPENDS+=	openjade-[0-9]*:../../textproc/openjade
 DEPENDS+=	netbsd-doc>=1.2:../../meta-pkgs/netbsd-doc
-
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
 USE_TOOLS+=	gs:run
 
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../textproc/opensp/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/netbsd-doc/Makefile b/meta-pkgs/netbsd-doc/Makefile
index 25692fc0727..e2ced0d9d7b 100644
--- a/meta-pkgs/netbsd-doc/Makefile
+++ b/meta-pkgs/netbsd-doc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2007/10/25 22:00:55 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2007/12/19 12:27:29 rillig Exp $
 #
 
 DISTNAME=	netbsd-doc-1.2
@@ -10,8 +10,6 @@ DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Meta-package including all packages to convert SGML->HTML
 
-PKG_DESTDIR_SUPPORT=	user-destdir
-
 DEPENDS+=	opensp>=1.4:../../textproc/opensp
 DEPENDS+=	jade>=1.2.1nb3:../../textproc/jade
 DEPENDS+=	docbook>=4.0:../../textproc/docbook
@@ -21,12 +19,6 @@ DEPENDS+=	dsssl-docbook-modular>=1.54:../../textproc/dsssl-docbook-modular
 DEPENDS+=	html>=4.0:../../textproc/html
 DEPENDS+=	tidy>=20031002:../../www/tidy
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/netbsd-www/Makefile b/meta-pkgs/netbsd-www/Makefile
index 03146c99423..b5b6a651d9d 100644
--- a/meta-pkgs/netbsd-www/Makefile
+++ b/meta-pkgs/netbsd-www/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2007/10/25 22:00:56 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2007/12/19 12:27:29 rillig Exp $
 #
 
 DISTNAME=	netbsd-www-1.4
@@ -23,14 +23,8 @@ DEPENDS+=	xplanet>=1.2.0nb3:../../x11/xplanet
 DEPENDS+=	opensp>=1.1:../../textproc/opensp
 DEPENDS+=	psutils>=1.17:../../print/psutils
 DEPENDS+=	w3m>=0.4:../../www/w3m
-
 USE_TOOLS+=	perl:run
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
 
-do-install:
-	@${DO_NADA}
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/php4-extensions/Makefile b/meta-pkgs/php4-extensions/Makefile
index 3ce55d7b831..3a1d61ccbd3 100644
--- a/meta-pkgs/php4-extensions/Makefile
+++ b/meta-pkgs/php4-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2007/10/25 22:00:56 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/12/19 12:27:30 rillig Exp $
 
 DISTNAME=	php-extensions-4.4
 PKGREVISION=	9
@@ -61,14 +61,7 @@ DEPENDS+=	php4-apc-4.4.*:../../www/php4-apc
 DEPENDS+=	php4-domxml-4.4.*:../../textproc/php4-domxml
 DEPENDS+=	php4-xslt-4.4.*:../../textproc/php4-xslt
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
-
-.include "../../mk/apachever.mk"
+META_PACKAGE=	yes
 
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/php5-extensions/Makefile b/meta-pkgs/php5-extensions/Makefile
index 3929a1897ac..63a70339c09 100644
--- a/meta-pkgs/php5-extensions/Makefile
+++ b/meta-pkgs/php5-extensions/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2006/11/06 22:06:35 jdolecek Exp $
+# $NetBSD: Makefile,v 1.21 2007/12/19 12:27:30 rillig Exp $
 
 DISTNAME=	php-extensions-5.2
 #PKGREVISION=	1
@@ -70,14 +70,7 @@ DEPENDS+=	php5-pdo_mysql-5.2.*:../../databases/php-pdo_mysql
 DEPENDS+=	php5-pdo_pgsql-5.2.*:../../databases/php-pdo_pgsql
 DEPENDS+=	php5-pdo_sqlite-5.2.*:../../databases/php-pdo_sqlite
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-NO_MTREE=	yes
+META_PACKAGE=	yes
 
-do-install:	# empty
-
-
-.include "../../mk/apachever.mk"
+.include "../../mk/apache.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/pkg_developer/Makefile b/meta-pkgs/pkg_developer/Makefile
index f7ef52cb625..b6af5801fd4 100644
--- a/meta-pkgs/pkg_developer/Makefile
+++ b/meta-pkgs/pkg_developer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2007/10/25 22:00:56 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2007/12/19 12:27:30 rillig Exp $
 #
 
 DISTNAME=	pkg_developer-1.1
@@ -21,12 +21,6 @@ DEPENDS+=	revbump>=1.8:../../pkgtools/revbump
 DEPENDS+=	url2pkg>=1.34:../../pkgtools/url2pkg
 DEPENDS+=	verifypc>=1.3:../../pkgtools/verifypc
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/pkgsrc-guide-tools/Makefile b/meta-pkgs/pkgsrc-guide-tools/Makefile
index 53af78d7c64..1fb931d8f43 100644
--- a/meta-pkgs/pkgsrc-guide-tools/Makefile
+++ b/meta-pkgs/pkgsrc-guide-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2007/10/25 22:00:57 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2007/12/19 12:27:30 rillig Exp $
 #
 
 DISTNAME=	pkgsrc-guide-tools-1.0
@@ -14,12 +14,6 @@ _GUIDE_DEPTYPE=	run
 
 .include "../../doc/guide/Makefile.common"
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:
-	@${DO_NADA}
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/ruby-gnome2/Makefile b/meta-pkgs/ruby-gnome2/Makefile
index 3e13ea4bed2..7b0a9d41fbb 100644
--- a/meta-pkgs/ruby-gnome2/Makefile
+++ b/meta-pkgs/ruby-gnome2/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:57 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/19 12:27:30 rillig Exp $
 #
 
 PKGNAME=	${RUBY_PKGPREFIX}-gnome2-${VERSION}
 PKGREVISION=	2
 COMMENT=	Set of Ruby language bindings for GNOME2
-DISTFILES=	# empty
 CATEGORIES=	meta-pkgs gnome
 
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-atk>=${VERSION}:../../devel/ruby-gnome2-atk
@@ -20,13 +19,7 @@ DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-pango>=${VERSION}:../../devel/ruby-gnome2-pan
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-poppler>=${VERSION}:../../print/ruby-gnome2-poppler
 DEPENDS+=	${RUBY_PKGPREFIX}-gnome2-rsvg>=${VERSION}:../../graphics/ruby-gnome2-rsvg
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../lang/ruby/rubyversion.mk"
-.include "${.CURDIR}/Makefile.common"
+.include "Makefile.common"
diff --git a/meta-pkgs/suse100/Makefile b/meta-pkgs/suse100/Makefile
index a73435d076e..8157a655432 100644
--- a/meta-pkgs/suse100/Makefile
+++ b/meta-pkgs/suse100/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.9 2007/10/25 22:00:57 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2007/12/19 12:27:30 rillig Exp $
 
 DISTNAME=	suse-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	emulators meta-pkgs
 MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	SUSE-based Linux binary emulation environment
@@ -14,12 +13,7 @@ EMUL_MODULES.linux=	aspell base compat cups expat fontconfig	\
 			motif openssl png slang tiff vmware x11 xml2
 EMUL_PKG_FMT=		plain
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../emulators/suse100_linux/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/suse9/Makefile b/meta-pkgs/suse9/Makefile
index ead861f9800..16eebe3458c 100644
--- a/meta-pkgs/suse9/Makefile
+++ b/meta-pkgs/suse9/Makefile
@@ -1,22 +1,16 @@
-# $NetBSD: Makefile,v 1.8 2007/10/25 22:00:58 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2007/12/19 12:27:30 rillig Exp $
 
 DISTNAME=	suse-${SUSE_VERSION}
 PKGREVISION=	4
 CATEGORIES=	meta-pkgs emulators
 MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	jdolecek@NetBSD.org
 COMMENT=	SUSE-based Linux binary emulation environment
 
 .include "../../emulators/suse91_linux/Makefile.common"
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 EMUL_MODULES.linux=	aspell base compat expat fontconfig freetype2	\
 			gdk-pixbuf glx gtk gtk2 jpeg locale motif png	\
diff --git a/meta-pkgs/web-server/Makefile b/meta-pkgs/web-server/Makefile
index 3188b226e4e..acdd02329af 100644
--- a/meta-pkgs/web-server/Makefile
+++ b/meta-pkgs/web-server/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2007/10/25 22:00:58 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/12/19 12:27:30 rillig Exp $
 #
 
 DISTNAME=	web-server-1.1
 PKGREVISION=	3
 CATEGORIES=	meta-pkgs www
 MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Provides some useful tools for a web server
@@ -14,12 +13,6 @@ DEPENDS+=	apache-1.3.*:../../www/apache
 DEPENDS+=	lynx>=2.8.2:../../www/lynx
 DEPENDS+=	glimpse>=4.1:../../textproc/glimpse
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/windowmaker-desktop/Makefile b/meta-pkgs/windowmaker-desktop/Makefile
index c963981ad63..c905385ce71 100644
--- a/meta-pkgs/windowmaker-desktop/Makefile
+++ b/meta-pkgs/windowmaker-desktop/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.21 2007/10/25 22:00:58 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2007/12/19 12:27:30 rillig Exp $
 #
 
 DISTNAME=	windowmaker-desktop-1.2
 PKGREVISION=	2
 CATEGORIES=	meta-pkgs x11 windowmaker
 MASTER_SITES=	# empty
-DISTFILES=	# empty
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.windowmaker.info/
@@ -26,12 +25,6 @@ DEPENDS+=	wmweather-[0-9]*:../../x11/wmweather
 DEPENDS+=	wmMoonClock-[0-9]*:../../time/wmmoonclock
 DEPENDS+=	wmmixer-[0-9]*:../../audio/wmmixer
 
-EXTRACT_ONLY=	# empty
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-
-do-install:	# empty
+META_PACKAGE=	yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 4969a9d0a63..3757a83e286 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,21 +1,12 @@
-# $NetBSD: Makefile,v 1.28 2007/12/07 19:43:21 martti Exp $
+# $NetBSD: Makefile,v 1.29 2007/12/19 12:27:31 rillig Exp $
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
 DISTNAME=	xfce4-extras-${XFCE4_VERSION}
-DISTFILES=	# empty
-#PKGREVISION=	1
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce extras
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-WRKSRC=		${WRKDIR}
-
-do-install:
-	@${DO_NADA}
+META_PACKAGE=	yes
 
 # Xfce
 .include "../../meta-pkgs/xfce4/buildlink3.mk"
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 66ce816af97..6354bcd1ce0 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,21 +1,12 @@
-# $NetBSD: Makefile,v 1.29 2007/12/07 19:43:21 martti Exp $
+# $NetBSD: Makefile,v 1.30 2007/12/19 12:27:31 rillig Exp $
 
 .include "Makefile.common"
 
 DISTNAME=	xfce4-${XFCE4_VERSION}
-DISTFILES=	# empty
-#PKGREVISION=	1
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce
 
-NO_CHECKSUM=	yes
-NO_CONFIGURE=	yes
-NO_BUILD=	yes
-PLIST_SRC=	# empty (meta-package)
-WRKSRC=		${WRKDIR}
-
-do-install:
-	@${DO_NADA}
+META_PACKAGE=	yes
 
 .include "../../audio/xfce4-mixer/buildlink3.mk"
 .include "../../editors/xfce4-mousepad/buildlink3.mk"