[pkgsrc/trunk]: pkgsrc/sysutils/dbus-glib Cleaner fix for previous, from wiz.

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/0cb6c1db3afd
branches:  trunk
changeset: 399358:0cb6c1db3afd
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Fri Sep 18 14:51:56 2009 +0000

description:
Cleaner fix for previous, from wiz.

diffstat:

 sysutils/dbus-glib/Makefile         |   6 +++++-
 sysutils/dbus-glib/distinfo         |   3 +--
 sysutils/dbus-glib/patches/patch-ab |  27 ---------------------------
 3 files changed, 6 insertions(+), 30 deletions(-)

diffs (63 lines):

diff -r 5588e5103606 -r 0cb6c1db3afd sysutils/dbus-glib/Makefile
--- a/sysutils/dbus-glib/Makefile       Fri Sep 18 14:33:32 2009 +0000
+++ b/sysutils/dbus-glib/Makefile       Fri Sep 18 14:51:56 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2009/08/15 21:10:11 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2009/09/18 14:51:56 sketch Exp $
 #
 
 DISTNAME=      dbus-glib-0.82
@@ -18,6 +18,10 @@
 
 PKGCONFIG_OVERRIDE=    dbus-glib-1.pc.in
 
+# Workaround for Upstream Bug#562310.
+# for more detail, see also PR#41475.
+TOOLS_NOOP+=           gtkdoc-rebase
+
 CONFIGURE_ARGS+=       --disable-ansi
 CONFIGURE_ARGS+=       --disable-asserts
 CONFIGURE_ARGS+=       --disable-doxygen-docs
diff -r 5588e5103606 -r 0cb6c1db3afd sysutils/dbus-glib/distinfo
--- a/sysutils/dbus-glib/distinfo       Fri Sep 18 14:33:32 2009 +0000
+++ b/sysutils/dbus-glib/distinfo       Fri Sep 18 14:51:56 2009 +0000
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.9 2009/09/18 13:09:02 sketch Exp $
+$NetBSD: distinfo,v 1.10 2009/09/18 14:51:56 sketch Exp $
 
 SHA1 (dbus-glib-0.82.tar.gz) = 8ad09cf13810382048a685bcafc72f252b2539a8
 RMD160 (dbus-glib-0.82.tar.gz) = 570664552de2d455ca4aa27144243be3974e7d77
 Size (dbus-glib-0.82.tar.gz) = 674953 bytes
 SHA1 (patch-aa) = 4b77f6d86f636d1e0bcdb1f2e0ad9d3bc438b07c
-SHA1 (patch-ab) = 5c3799726bbb9c247d3187b8d476442a51155296
diff -r 5588e5103606 -r 0cb6c1db3afd sysutils/dbus-glib/patches/patch-ab
--- a/sysutils/dbus-glib/patches/patch-ab       Fri Sep 18 14:33:32 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,27 +0,0 @@
-$NetBSD: patch-ab,v 1.1 2009/09/18 13:09:02 sketch Exp $
-
---- doc/reference/Makefile.in.orig     Fri Sep 18 13:56:05 2009
-+++ doc/reference/Makefile.in  Fri Sep 18 14:01:34 2009
-@@ -651,8 +651,9 @@
-           mv -f $${installdir}/$(DOC_MODULE).devhelp \
-             $${installdir}/$(DOC_MODULE)-$(DOC_MODULE_VERSION).devhelp; \
-         fi; \
--        ! which gtkdoc-rebase >/dev/null 2>&1 || \
-+        if type gtkdoc-rebase >/dev/null; then \
-           gtkdoc-rebase --relative --dest-dir=$(DESTDIR) --html-dir=$${installdir} ; \
-+        fi; \
-       fi
- 
- uninstall-local:
-@@ -681,8 +682,9 @@
-       -cp $(srcdir)/$(DOC_MODULE).types $(distdir)/
-       -cp $(srcdir)/$(DOC_MODULE)-sections.txt $(distdir)/
-       cd $(distdir) && rm -f $(DISTCLEANFILES)
--      ! which gtkdoc-rebase >/dev/null 2>&1 || \
--        gtkdoc-rebase --online --relative --html-dir=$(distdir)/html
-+      if type gtkdoc-rebase >/dev/null; then \
-+        gtkdoc-rebase --online --relative --html-dir=$(distdir)/html ; \
-+      fi
- 
- .PHONY : dist-hook-local docs
-