diff options
| author | sketch <sketch> | 2009-09-18 14:51:56 +0000 |
|---|---|---|
| committer | sketch <sketch> | 2009-09-18 14:51:56 +0000 |
| commit | 09cfbf29de8cae33498b10121eeb3e8c0ed698fa (patch) | |
| tree | ded4484a38c4f593a2c8ea6a2f9ae92cb625cb7b /sysutils/dbus-glib | |
| parent | b16d1f6e85855f0a74f1f59d2b61885efb2dc3cb (diff) | |
| download | pkgsrc-09cfbf29de8cae33498b10121eeb3e8c0ed698fa.tar.gz | |
Cleaner fix for previous, from wiz.
Diffstat (limited to 'sysutils/dbus-glib')
| -rw-r--r-- | sysutils/dbus-glib/Makefile | 6 | ||||
| -rw-r--r-- | sysutils/dbus-glib/distinfo | 3 | ||||
| -rw-r--r-- | sysutils/dbus-glib/patches/patch-ab | 27 |
3 files changed, 6 insertions, 30 deletions
diff --git a/sysutils/dbus-glib/Makefile b/sysutils/dbus-glib/Makefile index 1bd81e86c92..ec7c582b12a 100644 --- a/sysutils/dbus-glib/Makefile +++ b/sysutils/dbus-glib/Makefile @@ -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 @@ USE_LIBTOOL= YES 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 --git a/sysutils/dbus-glib/distinfo b/sysutils/dbus-glib/distinfo index d8466973d04..e04f703dcba 100644 --- a/sysutils/dbus-glib/distinfo +++ b/sysutils/dbus-glib/distinfo @@ -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 --git a/sysutils/dbus-glib/patches/patch-ab b/sysutils/dbus-glib/patches/patch-ab deleted file mode 100644 index cf6d5ed4c65..00000000000 --- a/sysutils/dbus-glib/patches/patch-ab +++ /dev/null @@ -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 - |