Explicitly depend on all packages used by this one. Also sort bl inclusion

lines and use pkgsrc intltool.

3 files changed, 22 insertions, 9 deletions

diff --git a/x11/gnome2-control-center/Makefile b/x11/gnome2-control-center/Makefile
index 32e3a17a098..365029a21d4 100644
--- a/x11/gnome2-control-center/Makefile
+++ b/x11/gnome2-control-center/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2004/02/14 00:24:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.28 2004/02/14 14:48:23 jmmv Exp $
 #
 
 DISTNAME=	control-center-2.4.0
@@ -52,13 +52,18 @@ post-install:
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../wm/metacity/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome2-control-center/buildlink2.mk b/x11/gnome2-control-center/buildlink2.mk
index 8587c55a4dd..e86c374a7da 100644
--- a/x11/gnome2-control-center/buildlink2.mk
+++ b/x11/gnome2-control-center/buildlink2.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink2.mk,v 1.11 2004/01/03 18:49:56 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.12 2004/02/14 14:48:23 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome2-control-center.
 #
@@ -25,14 +25,18 @@ BUILDLINK_FILES.gnome2-control-center+=	share/idl/GNOME_SettingsDaemon.idl
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libbonoboui/buildlink2.mk"
+.include "../../devel/libglade2/buildlink2.mk"
 .include "../../devel/libgnomeui/buildlink2.mk"
+.include "../../fonts/fontconfig/buildlink2.mk"
+.include "../../fonts/Xft2/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
 .include "../../sysutils/nautilus/buildlink2.mk"
+.include "../../textproc/libxml2/buildlink2.mk"
 .include "../../wm/metacity/buildlink2.mk"
-.include "../../x11/gtk2/buildlink2.mk"
 .include "../../x11/gnome-desktop/buildlink2.mk"
+.include "../../x11/gtk2/buildlink2.mk"
+.include "../../x11/startup-notification/buildlink2.mk"
 
 BUILDLINK_TARGETS+=	gnome2-control-center-buildlink
 
diff --git a/x11/gnome2-control-center/buildlink3.mk b/x11/gnome2-control-center/buildlink3.mk
index f360965cedb..915f3880b6b 100644
--- a/x11/gnome2-control-center/buildlink3.mk
+++ b/x11/gnome2-control-center/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.1 2004/02/11 07:11:28 xtraeme Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2004/02/14 14:48:23 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use gnome2-control-center.
 #
@@ -19,15 +19,19 @@ BUILDLINK_PKGSRCDIR.gnome2-control-center?=	../../x11/gnome2-control-center
 
 .include "../../audio/esound/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/GConf2/buildlink3.mk"
 .include "../../devel/libbonobo/buildlink3.mk"
-.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/libgnomeui/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
+.include "../../fonts/Xft2/buildlink3.mk"
 .include "../../sysutils/gnome-vfs2/buildlink3.mk"
 .include "../../sysutils/nautilus/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../wm/metacity/buildlink3.mk"
-.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/gnome-desktop/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 
 .endif # GNOME2_CONTROL_CENTER_BUILDLINK3_MK