Make sure that meta packages set META_PACKAGE before including

bsd.prefs.mk. Reported by Steven M. Bellovin for xorg packages.

16 files changed, 46 insertions, 50 deletions

diff --git a/meta-pkgs/boost/Makefile b/meta-pkgs/boost/Makefile
index df015ea954a..ae54b4ab873 100644
--- a/meta-pkgs/boost/Makefile
+++ b/meta-pkgs/boost/Makefile
@@ -1,11 +1,11 @@
-# $NetBSD: Makefile,v 1.10 2008/02/05 22:34:47 heinz Exp $
+# $NetBSD: Makefile,v 1.11 2008/06/15 09:51:59 joerg Exp $
 #
 
 BOOST_PACKAGE=	meta-pkg
 BOOST_COMMENT=	(meta package)
 PKGREVISION=	3
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+META_PACKAGE=	yes
 
 .include "Makefile.common"
 
@@ -26,6 +26,4 @@ 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
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/compiz-fusion/Makefile b/meta-pkgs/compiz-fusion/Makefile
index 1e2eda56392..7ee7c1f21b6 100644
--- a/meta-pkgs/compiz-fusion/Makefile
+++ b/meta-pkgs/compiz-fusion/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/05/12 13:23:50 jmcneill Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	compiz-fusion-0.6
 CATEGORIES=	meta-pkgs x11 gnome
@@ -9,12 +9,12 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.compiz-fusion.org/
 COMMENT=	Meta-package for compiz fusion
 
+META_PACKAGE=	yes
+
 DEPENDS+=	compiz>=0.6.2:../../wm/compiz
 DEPENDS+=	compiz-fusion-plugins-main>=0.6.0nb1:../../wm/compiz-fusion-plugins-main
 DEPENDS+=	compiz-fusion-plugins-extra>=0.6.0:../../wm/compiz-fusion-plugins-extra
 DEPENDS+=	ccsm>=0.6.0:../../wm/ccsm
 DEPENDS+=	gnome-session>=2.22.1.1nb2:../../x11/gnome-session
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/courier/Makefile b/meta-pkgs/courier/Makefile
index ed5b310c651..2d1287843aa 100644
--- a/meta-pkgs/courier/Makefile
+++ b/meta-pkgs/courier/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2008/02/19 18:45:37 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	courier-${COURIER_VERSION}
 CATEGORIES=	meta-pkgs mail
@@ -9,6 +9,8 @@ MAINTAINER=	jlam@pkgsrc.org
 HOMEPAGE=	http://www.courier-mta.org/
 COMMENT=	Meta-package for the Courier mail server suite
 
+META_PACKAGE=	yes
+
 # COURIER_VERSION should match the variable of the same name found in
 # pkgsrc/mail/courier-mta/Makefile.common.
 #
@@ -37,6 +39,4 @@ DEPENDS+=	sqwebmail>=5.2.0nb2:../../mail/sqwebmail
 #
 DEPENDS+=	courier-analog>=0.15:../../mail/courier-analog
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/fxtv-capture/Makefile b/meta-pkgs/fxtv-capture/Makefile
index 78e3d24ef05..19a072d360f 100644
--- a/meta-pkgs/fxtv-capture/Makefile
+++ b/meta-pkgs/fxtv-capture/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2007/12/19 12:27:27 rillig Exp $
+# $NetBSD: Makefile,v 1.15 2008/06/15 09:51:59 joerg Exp $
 #
 
 DISTNAME=	fxtv-capture-1.1
@@ -10,12 +10,12 @@ DISTFILES=	# empty
 MAINTAINER=	pkgsrc-users@NetBSD.org
 COMMENT=	Meta-package including all packages to capture video with bktr(4)
 
+META_PACKAGE=	yes
+
 DEPENDS+=	sox>=12.17.1:../../audio/sox
 DEPENDS+=	mpegaudio>=3.9:../../audio/mpegaudio
 DEPENDS+=	fxtv>=1.03nb1:../../multimedia/fxtv
 DEPENDS+=	mpeg_encode-[0-9]*:../../multimedia/mpeg_encode
 DEPENDS+=	mjpegtools>=1.8.0nb1:../../multimedia/mjpegtools
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome-base/Makefile b/meta-pkgs/gnome-base/Makefile
index e513758b666..513d2a81fb4 100644
--- a/meta-pkgs/gnome-base/Makefile
+++ b/meta-pkgs/gnome-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2008/04/30 13:38:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.49 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	gnome-base-2.18.1
 CATEGORIES=	meta-pkgs x11 gnome
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for basic components of the GNOME desktop
 
+META_PACKAGE=	yes
+
 # The dependencies listed here are in an order such as a package in a line
 # can be installed if all the packages listed above it are installed.
 #
@@ -78,6 +80,4 @@ 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
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome-devel/Makefile b/meta-pkgs/gnome-devel/Makefile
index 7c49bea86fe..4700cdd6670 100644
--- a/meta-pkgs/gnome-devel/Makefile
+++ b/meta-pkgs/gnome-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2008/04/30 13:38:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.29 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	gnome-devel-2.16.0
 CATEGORIES=	meta-pkgs devel gnome
@@ -9,6 +9,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for development utilities used in the GNOME desktop
 
+META_PACKAGE=	yes
+
 DEPENDS+=	autoconf>=2.60:../../devel/autoconf
 DEPENDS+=	autoconf213>=2.13nb1:../../devel/autoconf213
 DEPENDS+=	automake>=1.9.6:../../devel/automake
@@ -21,6 +23,4 @@ DEPENDS+=	intltool>=0.35.0:../../textproc/intltool
 DEPENDS+=	libtool>=1.5.22:../../devel/libtool
 DEPENDS+=	pkg-config>=0.21:../../devel/pkg-config
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome-platform/Makefile b/meta-pkgs/gnome-platform/Makefile
index 00036c71bde..ebfad20de86 100644
--- a/meta-pkgs/gnome-platform/Makefile
+++ b/meta-pkgs/gnome-platform/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2008/05/29 10:48:59 drochner Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	gnome-platform-2.22.2
 CATEGORIES=	meta-pkgs x11 gnome
@@ -8,6 +8,8 @@ MAINTAINER=	drochner@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for core platform libraries of the GNOME desktop
 
+META_PACKAGE=	yes
+
 DEPENDS+=	GConf>=2.22.0:../../devel/GConf
 DEPENDS+=	ORBit2>=2.14.12:../../net/ORBit2
 DEPENDS+=	at-spi>=1.22.1:../../devel/at-spi
@@ -36,6 +38,4 @@ DEPENDS+=	pango>=1.20.3:../../devel/pango
 # by libgnomeui. List it here to avoid circular dependency.
 DEPENDS+=	gnome-keyring>=2.22.2:../../security/gnome-keyring
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnome/Makefile b/meta-pkgs/gnome/Makefile
index 8b3fb741ef9..9973e707cdc 100644
--- a/meta-pkgs/gnome/Makefile
+++ b/meta-pkgs/gnome/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2008/04/30 13:38:15 jmmv Exp $
+# $NetBSD: Makefile,v 1.75 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	gnome-2.18.1
 PKGREVISION=	1
@@ -10,6 +10,8 @@ MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Meta-package for the GNU Network Object Model Environment
 
+META_PACKAGE=	yes
+
 .include "../../lang/python/pyversion.mk"
 
 # The dependencies listed here are in an order such as a package in a line
@@ -70,6 +72,4 @@ 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
 
-META_PACKAGE=	yes
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/gnuradio/Makefile b/meta-pkgs/gnuradio/Makefile
index e51cffd5bf2..bfe04df94e7 100644
--- a/meta-pkgs/gnuradio/Makefile
+++ b/meta-pkgs/gnuradio/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2007/12/19 12:27:28 rillig Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/15 09:51:59 joerg Exp $
+
+META_PACKAGE=	yes
 
 .include	"../../meta-pkgs/gnuradio/Makefile.version"
 
@@ -33,6 +35,4 @@ DEPENDS+=	gnuradio-radio-astronomy-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-radi
 .endif
 DEPENDS+=	gnuradio-howto-${VERSION}{,nb[0-9]*}:../../ham/gnuradio-howto
 
-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 ca8ed27a6f4..15da24a0a65 100644
--- a/meta-pkgs/modular-xorg-apps/Makefile
+++ b/meta-pkgs/modular-xorg-apps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:21 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-apps-1.5
@@ -10,7 +10,7 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg application meta-package
 
-PKG_DESTDIR_SUPPORT=	user-destdir
+META_PACKAGE=	yes
 
 DEPENDS+=	xbiff-[0-9]*:../../mail/xbiff
 DEPENDS+=	twm-[0-9]*:../../wm/twm
@@ -63,6 +63,4 @@ DEPENDS+=	xwininfo-[0-9]*:../../x11/xwininfo
 DEPENDS+=	xwd-[0-9]*:../../x11/xwd
 DEPENDS+=	xwud-[0-9]*:../../x11/xwud
 
-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 64ce6a80f24..f620918e721 100644
--- a/meta-pkgs/modular-xorg-drivers/Makefile
+++ b/meta-pkgs/modular-xorg-drivers/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2008/05/24 21:45:21 tnn Exp $
+# $NetBSD: Makefile,v 1.12 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-drivers-1.2
@@ -10,6 +10,8 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg driver meta-package
 
+META_PACKAGE=	yes
+
 .include "../../mk/bsd.prefs.mk"
 
 DEPENDS+=	xf86-input-keyboard-[0-9]*:../../x11/xf86-input-keyboard
@@ -55,6 +57,4 @@ 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 776feef4cc0..196382ef101 100644
--- a/meta-pkgs/modular-xorg-fonts/Makefile
+++ b/meta-pkgs/modular-xorg-fonts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:22 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-fonts-1.0
@@ -10,6 +10,8 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg font meta-package
 
+META_PACKAGE=	yes
+
 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
@@ -35,6 +37,4 @@ 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
 
-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 133f8a3e04e..e026d80764e 100644
--- a/meta-pkgs/modular-xorg-libs/Makefile
+++ b/meta-pkgs/modular-xorg-libs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2008/05/24 21:45:22 tnn Exp $
+# $NetBSD: Makefile,v 1.5 2008/06/15 09:51:59 joerg Exp $
 
 DISTNAME=	# empty
 PKGNAME=	modular-xorg-libs-1.0
@@ -10,6 +10,8 @@ MAINTAINER=	joerg@NetBSD.org
 HOMEPAGE=	http://xorg.freedesktop.org/
 COMMENT=	Modular Xorg library meta-package
 
+META_PACKAGE=	yes
+
 .include "../../x11/libFS/buildlink3.mk"
 .include "../../x11/libICE/buildlink3.mk"
 .include "../../x11/libSM/buildlink3.mk"
@@ -47,6 +49,4 @@ COMMENT=	Modular Xorg library meta-package
 .include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/libxkbui/buildlink3.mk"
 
-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 1fb931d8f43..b735ce2d027 100644
--- a/meta-pkgs/pkgsrc-guide-tools/Makefile
+++ b/meta-pkgs/pkgsrc-guide-tools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2007/12/19 12:27:30 rillig Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/15 09:51:59 joerg Exp $
 #
 
 DISTNAME=	pkgsrc-guide-tools-1.0
@@ -12,8 +12,8 @@ COMMENT=	Packages required to build the pkgsrc Guide
 
 _GUIDE_DEPTYPE=	run
 
-.include "../../doc/guide/Makefile.common"
-
 META_PACKAGE=	yes
 
+.include "../../doc/guide/Makefile.common"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/meta-pkgs/xfce4-extras/Makefile b/meta-pkgs/xfce4-extras/Makefile
index 407dab820d1..4f6e4625516 100644
--- a/meta-pkgs/xfce4-extras/Makefile
+++ b/meta-pkgs/xfce4-extras/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.30 2008/01/18 05:08:32 tnn Exp $
+# $NetBSD: Makefile,v 1.31 2008/06/15 09:51:59 joerg Exp $
+
+META_PACKAGE=	yes
 
 .include "../../meta-pkgs/xfce4/Makefile.common"
 
@@ -7,8 +9,6 @@ PKGREVISION=	1
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce extras
 
-META_PACKAGE=	yes
-
 # Xfce
 .include "../../meta-pkgs/xfce4/buildlink3.mk"
 
diff --git a/meta-pkgs/xfce4/Makefile b/meta-pkgs/xfce4/Makefile
index 729d9afd373..65605339022 100644
--- a/meta-pkgs/xfce4/Makefile
+++ b/meta-pkgs/xfce4/Makefile
@@ -1,4 +1,6 @@
-# $NetBSD: Makefile,v 1.31 2008/01/18 05:08:32 tnn Exp $
+# $NetBSD: Makefile,v 1.32 2008/06/15 09:51:59 joerg Exp $
+
+META_PACKAGE=	yes
 
 .include "Makefile.common"
 
@@ -7,8 +9,6 @@ PKGREVISION=	1
 CATEGORIES=	meta-pkgs
 COMMENT=	Xfce
 
-META_PACKAGE=	yes
-
 .include "../../audio/xfce4-mixer/buildlink3.mk"
 .include "../../editors/xfce4-mousepad/buildlink3.mk"
 .include "../../graphics/xfce4-icon-theme/buildlink3.mk"