Update to 1.11:

GTK-Doc 1.11    (Nov 16 2008)
============

 Changes

 o 531572 : one-page generation option
 o 448879 : Use a footer when generating HTML documentation
 o 311857 : xsltproc very slow generating index for gtk-docs.sgml
 o 335239 : Using gnome-doc-utils for gtk-doc documentation
 o 460753 : enable vpath build in gtkdoc-mkhtml
 o 473342 : Warn about repeated symbols in sections
 o 487727 : DocBook XML DTD version
 o 523669 : make check: Element publisher content does not follow the...
 o 530758 : gtk-doc should not expand XML tags and their attributes
 o 533262 : no-template mode scans different source files
 o 534627 : gtk-doc uses non-standard HTML element
 o 542137 : No declaration found for: gsf_output_*
 o 543855 : Fix for Bug 460753 (enable vpath build in gtkdoc-mkhtml) ...
 o 544172 : Fails to parse return value of 'char const *'
 o 552822 : Add rules to create $(REPORT_FILES)
 o 553407 : Example Makefile.am uses obsolete INCLUDES instead of AM_...
 o 554718 : gtk-doc needs to allow versioned TARGET_DIR
 o 554833 : Be more careful with " struct _ < struct_name >  "
 o 558082 : evince docs build fails with GTK_DISABLE_SINGLE_INCLUDES
 o 559281 : Correct check for existance of gtkdoc-rebase

 Contributors

 Behdad Esfahbod
 Christian Persch
 David Nečas
 Felix Riemann
 Jeffrey Stedfast
 Marc-Andre Lureau
 Matthew Barnes
 Peter Kjellerstedt
 Sebastian Dröge
 Simon Josefsson
 Stefan Kost

4 files changed, 31 insertions, 24 deletions

diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index c62ff09d16a..a584cef434a 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.32 2008/07/14 12:56:13 joerg Exp $
+# $NetBSD: Makefile,v 1.33 2008/11/18 11:55:58 wiz Exp $
 #
 
-DISTNAME=	gtk-doc-1.10
+DISTNAME=	gtk-doc-1.11
 CATEGORIES=	textproc
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.10/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/gtk-doc/1.11/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
@@ -19,19 +19,12 @@ GNU_CONFIGURE=		YES
 PKGCONFIG_OVERRIDE=	gtk-doc.pc.in
 CONFIGURE_ARGS+=	--with-xml-catalog=${XML_DEFAULT_CATALOG:Q}
 USE_DIRS+=		gnome2-1.6
-USE_TOOLS+=		perl:run
+USE_TOOLS+=		gmake perl:run pkg-config
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.gtkdoc
-PKG_SUPPORTED_OPTIONS=	sgml
-.include "../../mk/bsd.options.mk"
-
-.if !empty(PKG_OPTIONS:Msgml)
-DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
-SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
-.include "../../textproc/jade/buildlink3.mk"
-.endif
+.include "options.mk"
 
 .include "../../lang/python/application.mk"
+.include "../../textproc/gnome-doc-utils/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../textproc/xmlcatmgr/catalogs.mk"
diff --git a/textproc/gtk-doc/PLIST b/textproc/gtk-doc/PLIST
index e1b9d52ea38..f47615077e2 100644
--- a/textproc/gtk-doc/PLIST
+++ b/textproc/gtk-doc/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2008/04/24 21:32:01 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2008/11/18 11:55:58 wiz Exp $
 bin/gtkdoc-check
 bin/gtkdoc-depscan
 bin/gtkdoc-fixxref
@@ -12,8 +12,8 @@ bin/gtkdoc-scangobj
 bin/gtkdoc-scanobj
 bin/gtkdocize
 share/aclocal/gtk-doc.m4
-share/doc/gtk-doc/fdl-appendix.xml
-share/doc/gtk-doc/gtk-doc-manual.xml
+share/gnome/help/gtk-doc-manual/C/fdl-appendix.xml
+share/gnome/help/gtk-doc-manual/C/gtk-doc-manual.xml
 share/gtk-doc/data/devhelp.xsl
 share/gtk-doc/data/devhelp2.xsl
 share/gtk-doc/data/gtk-doc.dcl
@@ -28,12 +28,14 @@ share/gtk-doc/data/right.png
 share/gtk-doc/data/style.css
 share/gtk-doc/data/up.png
 share/gtk-doc/data/version-greater-or-equal.xsl
-share/omf/gtk-doc/gtk-doc-manual-C.omf
+share/omf/gtk-doc-manual/gtk-doc-manual-C.omf
 share/pkgconfig/gtk-doc.pc
 share/sgml/gtk-doc/gtk-doc.cat
 @dirrm share/sgml/gtk-doc
 @comment in xmlcatmgr: @dirrm share/sgml
-@dirrm share/omf/gtk-doc
-@comment in scrollkeeper: @dirrm share/omf
+@dirrm share/omf/gtk-doc-manual
+@comment in rarian: @dirrm share/omf
 @dirrm share/gtk-doc/data
-@dirrm share/doc/gtk-doc
+@dirrm share/gnome/help/gtk-doc-manual/C
+@dirrm share/gnome/help/gtk-doc-manual
+@comment in gnome2-dirs: @dirrm share/gnome/help
diff --git a/textproc/gtk-doc/distinfo b/textproc/gtk-doc/distinfo
index dd7f7e6330e..98643954b0d 100644
--- a/textproc/gtk-doc/distinfo
+++ b/textproc/gtk-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.14 2008/04/24 21:32:01 wiz Exp $
+$NetBSD: distinfo,v 1.15 2008/11/18 11:55:58 wiz Exp $
 
-SHA1 (gtk-doc-1.10.tar.bz2) = 861c977b011efd1bf91957d1a02fb792f39e5509
-RMD160 (gtk-doc-1.10.tar.bz2) = b7f7563ddec9ff140fc6fc6feea5b7f49cb1ff32
-Size (gtk-doc-1.10.tar.bz2) = 404379 bytes
+SHA1 (gtk-doc-1.11.tar.bz2) = 685823e269cc08fdef50828b0a68697222877b1c
+RMD160 (gtk-doc-1.11.tar.bz2) = 802c61e4e2072f5e91fe65d6f40587313b7bd23b
+Size (gtk-doc-1.11.tar.bz2) = 453459 bytes
diff --git a/textproc/gtk-doc/options.mk b/textproc/gtk-doc/options.mk
new file mode 100644
index 00000000000..da6fde00366
--- /dev/null
+++ b/textproc/gtk-doc/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2008/11/18 11:55:58 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.gtkdoc
+PKG_SUPPORTED_OPTIONS=	sgml
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Msgml)
+DEPENDS+= dsssl-docbook-modular-[0-9]*:../../textproc/dsssl-docbook-modular
+SGML_CATALOGS= ${PREFIX}/share/sgml/gtk-doc/gtk-doc.cat
+.include "../../textproc/jade/buildlink3.mk"
+.endif