[pkgsrc/trunk]: pkgsrc BUILD_DEPEND on gtk-doc (by including its buildlink3.m...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/dcda3a490d46
branches:  trunk
changeset: 559624:dcda3a490d46
user:      wiz <wiz%pkgsrc.org@localhost>
date:      Tue May 26 16:55:23 2009 +0000

description:
BUILD_DEPEND on gtk-doc (by including its buildlink3.mk file) to
get gtkdoc-rebase.

Addresses PR 41475 by John D. Baker.

diffstat:

 devel/GConf/Makefile.common |   4 ++--
 devel/atk/Makefile          |   9 +++------
 devel/glib2/Makefile        |   3 ++-
 devel/pango/Makefile        |  13 +++++--------
 net/ORBit2/Makefile         |   6 ++----
 5 files changed, 14 insertions(+), 21 deletions(-)

diffs (128 lines):

diff -r f224fc213845 -r dcda3a490d46 devel/GConf/Makefile.common
--- a/devel/GConf/Makefile.common       Tue May 26 16:47:31 2009 +0000
+++ b/devel/GConf/Makefile.common       Tue May 26 16:55:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.8 2009/05/19 08:59:07 wiz Exp $
+# $NetBSD: Makefile.common,v 1.9 2009/05/26 16:55:23 wiz Exp $
 #
 # used by devel/GConf/Makefile
 # used by devel/GConf-ui/Makefile
@@ -38,5 +38,5 @@
 CONFIGURE_ARGS+=       --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.10.0
-
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
diff -r f224fc213845 -r dcda3a490d46 devel/atk/Makefile
--- a/devel/atk/Makefile        Tue May 26 16:47:31 2009 +0000
+++ b/devel/atk/Makefile        Tue May 26 16:55:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2009/03/16 22:25:39 jmcneill Exp $
+# $NetBSD: Makefile,v 1.67 2009/05/26 16:55:23 wiz Exp $
 #
 
 DISTNAME=              atk-1.26.0
@@ -20,14 +20,9 @@
 USE_LIBTOOL=           yes
 PKGCONFIG_OVERRIDE=    atk.pc.in
 
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=                F77=${FALSE:Q}
-
 # glib-mkenums overflows a 2048kb stack on atkobject.h
 UNLIMIT_RESOURCES=     stacksize
 
-BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.5.7
-
 SUBST_CLASSES+=                loc
 SUBST_STAGE.loc=       pre-configure
 SUBST_MESSAGE.loc=     Fixing invalid use of AM_GLIB_DEFINE_LOCALEDIR.
@@ -35,6 +30,8 @@
 SUBST_SED.loc=         -e 's,^\(\#define ATK_LOCALEDIR\).*,\1 "${PREFIX}/${PKGLOCALEDIR}/locale",'
 
 .include "../../devel/gettext-lib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.5.7
 .include "../../devel/glib2/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff -r f224fc213845 -r dcda3a490d46 devel/glib2/Makefile
--- a/devel/glib2/Makefile      Tue May 26 16:47:31 2009 +0000
+++ b/devel/glib2/Makefile      Tue May 26 16:55:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.159 2009/05/20 11:09:02 wiz Exp $
+# $NetBSD: Makefile,v 1.160 2009/05/26 16:55:23 wiz Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -107,4 +107,5 @@
 BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1
 .include "../../devel/pcre/buildlink3.mk"
 
+.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f224fc213845 -r dcda3a490d46 devel/pango/Makefile
--- a/devel/pango/Makefile      Tue May 26 16:47:31 2009 +0000
+++ b/devel/pango/Makefile      Tue May 26 16:55:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2009/05/19 08:59:11 wiz Exp $
+# $NetBSD: Makefile,v 1.130 2009/05/26 16:55:23 wiz Exp $
 
 DISTNAME=              pango-1.24.2
 CATEGORIES=            devel fonts
@@ -33,9 +33,6 @@
 
 CONFIGURE_ARGS+=       --sysconfdir=${PREFIX}/libdata
 
-# Avoid an ICE in gcc2 on sparc64
-CONFIGURE_ENV+=                F77=${FALSE:Q}
-
 CHECK_FILES_SKIP+=     ${PREFIX}/libdata/pango/pango.modules
 
 PLIST_VARS+=           carbon
@@ -43,15 +40,15 @@
 .include "options.mk"
 
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.17.3
-BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.8.0
-BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.7nb3
-BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.5.0
-
 .include "../../devel/glib2/buildlink3.mk"
 # XXX: later maybe add an option for libthai to provide pango-thai-lang.la?
 #.include "../../devel/libthai/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+BUILDLINK_API_DEPENDS.cairo+=  cairo>=1.8.0
 .include "../../graphics/cairo/buildlink3.mk"
+BUILDLINK_API_DEPENDS.fontconfig+=     fontconfig>=2.5.0
 .include "../../fonts/fontconfig/buildlink3.mk"
+BUILDLINK_API_DEPENDS.Xft2+=   Xft2>=2.1.7nb3
 .include "../../graphics/freetype2/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r f224fc213845 -r dcda3a490d46 net/ORBit2/Makefile
--- a/net/ORBit2/Makefile       Tue May 26 16:47:31 2009 +0000
+++ b/net/ORBit2/Makefile       Tue May 26 16:55:23 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/04/13 17:06:30 schwarz Exp $
+# $NetBSD: Makefile,v 1.68 2009/05/26 16:55:23 wiz Exp $
 #
 
 DISTNAME=              ORBit2-2.14.17
@@ -10,9 +10,6 @@
 HOMEPAGE=              http://orbit-resource.sourceforge.net/
 COMMENT=               High-performance CORBA ORB with C language support
 
-# gtkdoc-rebase needed during installation
-BUILD_DEPENDS+=                gtk-doc>=1.9:../../textproc/gtk-doc
-
 PKG_INSTALLATION_TYPES= overwrite pkgviews
 PKG_DESTDIR_SUPPORT=   user-destdir
 
@@ -55,4 +52,5 @@
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
+.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"