[pkgsrc/trunk]: pkgsrc Remove build dependency on gtk-doc, related to PR#41475.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1ed450f128cf
branches:  trunk
changeset: 394035:1ed450f128cf
user:      obache <obache%pkgsrc.org@localhost>
date:      Wed Jun 03 12:40:32 2009 +0000

description:
Remove build dependency on gtk-doc, related to PR#41475.

It comes from upstream Bug#562310:
http://bugzilla.gnome.org/show_bug.cgi?id=562310
Availability detection of `gtkdoc-rebase' command is depend on the behaviour
of `which' command,  if `which gtkdoc-rebase' return false, do nothing.
It is known as not works as expected on Darwin and Solaris, then failed in
unwanted gtkdoc-rebase execution, and abort.

It is already fixed in upstream gtk-doc repository, but not released yet(1.12?).
So, some packages may contain and be using un-fixed gtk-doc.* files.

For easy to determine whether it is fixed or not, check gtk-doc.make contains
following commit (not using 'which gtkdoc-rebase', but $(GTKDOC_REBASE) macro):

http://git.gnome.org./cgit/gtk-doc/commit/?id=ef5f56ca5fd4a077e6f7a374e8dd333b7a6a8d42

diffstat:

 devel/GConf/Makefile.common |  7 +++++--
 devel/atk/Makefile          |  7 +++++--
 devel/glib2/Makefile        |  8 +++-----
 devel/pango/Makefile        |  7 +++++--
 net/ORBit2/Makefile         |  7 +++++--
 5 files changed, 23 insertions(+), 13 deletions(-)

diffs (120 lines):

diff -r 8d48fabb2028 -r 1ed450f128cf devel/GConf/Makefile.common
--- a/devel/GConf/Makefile.common       Wed Jun 03 12:29:42 2009 +0000
+++ b/devel/GConf/Makefile.common       Wed Jun 03 12:40:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2009/05/26 16:55:23 wiz Exp $
+# $NetBSD: Makefile.common,v 1.10 2009/06/03 12:40:32 obache Exp $
 #
 # used by devel/GConf/Makefile
 # used by devel/GConf-ui/Makefile
@@ -37,6 +37,9 @@
 CONFIGURE_ARGS+=       --with-sysconfsubdir=
 CONFIGURE_ARGS+=       --enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=   gtkdoc-rebase
+
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.10.0
 .include "../../devel/glib2/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
diff -r 8d48fabb2028 -r 1ed450f128cf devel/atk/Makefile
--- a/devel/atk/Makefile        Wed Jun 03 12:29:42 2009 +0000
+++ b/devel/atk/Makefile        Wed Jun 03 12:40:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2009/05/26 16:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.68 2009/06/03 12:40:32 obache Exp $
 #
 
 DISTNAME=              atk-1.26.0
@@ -29,9 +29,12 @@
 SUBST_FILES.loc=       configure
 SUBST_SED.loc=         -e 's,^\(\#define ATK_LOCALEDIR\).*,\1 "${PREFIX}/${PKGLOCALEDIR}/locale",'
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=   gtkdoc-rebase
+
 .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 8d48fabb2028 -r 1ed450f128cf devel/glib2/Makefile
--- a/devel/glib2/Makefile      Wed Jun 03 12:29:42 2009 +0000
+++ b/devel/glib2/Makefile      Wed Jun 03 12:40:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.160 2009/05/26 16:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.161 2009/06/03 12:40:32 obache Exp $
 
 # When updating glib2, please apply patch-ak to configure.in
 # Then run a matching version of autoconf to regen patch-aa.
@@ -74,10 +74,9 @@
 CONFIGURE_ENV+=                gt_cv_c_wchar_t=no
 .endif
 
-# Workaround for Bug#562310
-.if ${OPSYS} == "Darwin" || ${OPSYS} == "SunOS"
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
 TOOLS_NOOP+=           gtkdoc-rebase
-.endif
 
 .if ${OPSYS} == "HPUX"
 CONFIGURE_ENV+=                ac_cv_func_mmap_fixed_mapped=yes
@@ -107,5 +106,4 @@
 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 8d48fabb2028 -r 1ed450f128cf devel/pango/Makefile
--- a/devel/pango/Makefile      Wed Jun 03 12:29:42 2009 +0000
+++ b/devel/pango/Makefile      Wed Jun 03 12:40:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.130 2009/05/26 16:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.131 2009/06/03 12:40:32 obache Exp $
 
 DISTNAME=              pango-1.24.2
 CATEGORIES=            devel fonts
@@ -39,6 +39,10 @@
 
 .include "options.mk"
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=   gtkdoc-rebase
+
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.17.3
 .include "../../devel/glib2/buildlink3.mk"
 # XXX: later maybe add an option for libthai to provide pango-thai-lang.la?
@@ -50,5 +54,4 @@
 .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 8d48fabb2028 -r 1ed450f128cf net/ORBit2/Makefile
--- a/net/ORBit2/Makefile       Wed Jun 03 12:29:42 2009 +0000
+++ b/net/ORBit2/Makefile       Wed Jun 03 12:40:32 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.68 2009/05/26 16:55:23 wiz Exp $
+# $NetBSD: Makefile,v 1.69 2009/06/03 12:40:32 obache Exp $
 #
 
 DISTNAME=              ORBit2-2.14.17
@@ -48,9 +48,12 @@
                                { print "@unexec $${RMDIR} %D/" $$2 \
                                  " 2>/dev/null || $${TRUE}"; next; }
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=   gtkdoc-rebase
+
 BUILDLINK_API_DEPENDS.glib2+=  glib2>=2.8.0
 
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../net/libIDL/buildlink3.mk"
-.include "../../textproc/gtk-doc/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"