diff options
| -rw-r--r-- | devel/GConf/Makefile.common | 7 | ||||
| -rw-r--r-- | devel/atk/Makefile | 7 | ||||
| -rw-r--r-- | devel/glib2/Makefile | 8 | ||||
| -rw-r--r-- | devel/pango/Makefile | 7 | ||||
| -rw-r--r-- | net/ORBit2/Makefile | 7 |
5 files changed, 23 insertions, 13 deletions
diff --git a/devel/GConf/Makefile.common b/devel/GConf/Makefile.common index b83799ba5b9..14e38566b96 100644 --- a/devel/GConf/Makefile.common +++ b/devel/GConf/Makefile.common @@ -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+= --sysconfdir=${PKG_SYSCONFDIR:Q} 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 --git a/devel/atk/Makefile b/devel/atk/Makefile index b6f4de4d1a6..16f88769586 100644 --- a/devel/atk/Makefile +++ b/devel/atk/Makefile @@ -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_MESSAGE.loc= Fixing invalid use of AM_GLIB_DEFINE_LOCALEDIR. 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 --git a/devel/glib2/Makefile b/devel/glib2/Makefile index 4ce3c0e2642..97a1b7e4b13 100644 --- a/devel/glib2/Makefile +++ b/devel/glib2/Makefile @@ -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 @@ SUBST_MESSAGE.thr= Fixing libgthread. 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 @@ CONFIGURE_ARGS+= --disable-threads BUILDLINK_API_DEPENDS.pcre+= pcre>=7.4nb1 .include "../../devel/pcre/buildlink3.mk" -.include "../../textproc/gtk-doc/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/devel/pango/Makefile b/devel/pango/Makefile index 9f2a51da275..c0e4101199f 100644 --- a/devel/pango/Makefile +++ b/devel/pango/Makefile @@ -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 @@ PLIST_VARS+= carbon .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 @@ 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 --git a/net/ORBit2/Makefile b/net/ORBit2/Makefile index 13ea51aa494..69d925a6e04 100644 --- a/net/ORBit2/Makefile +++ b/net/ORBit2/Makefile @@ -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_PLIST_AWK+= /^@dirrm share\/idl$$/ \ { 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" |