[pkgsrc/trunk]: pkgsrc/devel Move common dependencies to Makefile.common.

[jmmv <jmmv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f03eab93d7ad
branches:  trunk
changeset: 500450:f03eab93d7ad
user:      jmmv <jmmv%pkgsrc.org@localhost>
date:      Sat Oct 08 17:15:48 2005 +0000

description:
Move common dependencies to Makefile.common.
Adjust dependencies for glib2 and GConf2 to match what's needed by GConf2
and GConf2-ui, respectively (hi drochner@!).  Bump their revisions to 1.

diffstat:

 devel/GConf2-ui/Makefile     |  8 +++-----
 devel/GConf2/Makefile        |  5 ++---
 devel/GConf2/Makefile.common |  7 ++++++-
 3 files changed, 11 insertions(+), 9 deletions(-)

diffs (69 lines):

diff -r 340222d31b0a -r f03eab93d7ad devel/GConf2-ui/Makefile
--- a/devel/GConf2-ui/Makefile  Sat Oct 08 16:51:50 2005 +0000
+++ b/devel/GConf2-ui/Makefile  Sat Oct 08 17:15:48 2005 +0000
@@ -1,11 +1,12 @@
-# $NetBSD: Makefile,v 1.20 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/10/08 17:15:48 jmmv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/GConf/GConf2-ui/}
+PKGREVISION=   1
 
-BUILDLINK_DEPENDS.GConf2+=     GConf2>=2.10.0
+BUILDLINK_DEPENDS.GConf2+=     GConf2>=2.12.0nb1
 
 CONFIGURE_ARGS+=       --enable-gtk
 
@@ -19,8 +20,5 @@
                ${PREFIX}/libexec
 
 .include "../../devel/GConf2/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../net/ORBit2/buildlink3.mk"
-.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 340222d31b0a -r f03eab93d7ad devel/GConf2/Makefile
--- a/devel/GConf2/Makefile     Sat Oct 08 16:51:50 2005 +0000
+++ b/devel/GConf2/Makefile     Sat Oct 08 17:15:48 2005 +0000
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.32 2004/10/26 20:57:53 jmmv Exp $
+# $NetBSD: Makefile,v 1.33 2005/10/08 17:15:48 jmmv Exp $
 #
 
 .include "../../devel/GConf2/Makefile.common"
 
 PKGNAME=       ${DISTNAME:S/GConf/GConf2/}
+PKGREVISION=   1
 
 USE_PKGINSTALL=        YES
 
@@ -27,8 +28,6 @@
        ${INSTALL_DATA_DIR} ${PREFIX}/share/gconf/schemas
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../devel/glib2/buildlink3.mk"
-.include "../../devel/popt/buildlink3.mk"
 .include "../../net/ORBit2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../textproc/xmlcatmgr/buildlink3.mk"
diff -r 340222d31b0a -r f03eab93d7ad devel/GConf2/Makefile.common
--- a/devel/GConf2/Makefile.common      Sat Oct 08 16:51:50 2005 +0000
+++ b/devel/GConf2/Makefile.common      Sat Oct 08 17:15:48 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2005/10/07 16:00:24 drochner Exp $
+# $NetBSD: Makefile.common,v 1.34 2005/10/08 17:15:48 jmmv Exp $
 #
 
 DISTNAME=              GConf-2.12.0
@@ -33,3 +33,8 @@
 CONFIGURE_ARGS+=       --with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=       --disable-gtk-doc
 CONFIGURE_ARGS+=       --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
+
+BUILDLINK_DEPENDS.glib2+=      glib2>=2.8.0
+
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"