migrate devhelp docs to share/gtk-doc/html, bump PKGREVISION

2 files changed, 166 insertions, 167 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 11bb06b493f..a85c110c68e 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.108 2006/10/09 12:52:34 joerg Exp $
+# $NetBSD: Makefile,v 1.109 2006/11/13 18:34:38 drochner Exp $
 
 DISTNAME=		glib-2.12.4
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/glib/2.12/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/pub/glib/2.12/ \
@@ -35,9 +36,7 @@ PKGCONFIG_OVERRIDE+=	gthread-2.0.pc.in
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR:Q}
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 CONFIGURE_ARGS+=	${CONFIGURE_ARGS.${ICONV_TYPE}-iconv}
 
 CONFIGURE_ARGS.gnu-iconv+=	--with-libiconv=gnu
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 827bf9547c4..e555380e8bd 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.34 2006/10/06 18:05:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.35 2006/11/13 18:34:38 drochner Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -94,169 +94,169 @@ man/man1/glib-mkenums.1
 man/man1/gobject-query.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
-share/doc/glib/file-name-encodings.png
-share/doc/glib/glib-Arrays.html
-share/doc/glib/glib-Asynchronous-Queues.html
-share/doc/glib/glib-Atomic-Operations.html
-share/doc/glib/glib-Automatic-String-Completion.html
-share/doc/glib/glib-Balanced-Binary-Trees.html
-share/doc/glib/glib-Base64-Encoding.html
-share/doc/glib/glib-Basic-Types.html
-share/doc/glib/glib-Bookmark-file-parser.html
-share/doc/glib/glib-Byte-Arrays.html
-share/doc/glib/glib-Byte-Order-Macros.html
-share/doc/glib/glib-Caches.html
-share/doc/glib/glib-Character-Set-Conversion.html
-share/doc/glib/glib-Commandline-option-parser.html
-share/doc/glib/glib-Datasets.html
-share/doc/glib/glib-Date-and-Time-Functions.html
-share/doc/glib/glib-Double-ended-Queues.html
-share/doc/glib/glib-Doubly-Linked-Lists.html
-share/doc/glib/glib-Dynamic-Loading-of-Modules.html
-share/doc/glib/glib-Error-Reporting.html
-share/doc/glib/glib-File-Utilities.html
-share/doc/glib/glib-Glob-style-pattern-matching.html
-share/doc/glib/glib-Hash-Tables.html
-share/doc/glib/glib-Hook-Functions.html
-share/doc/glib/glib-I18N.html
-share/doc/glib/glib-IO-Channels.html
-share/doc/glib/glib-Key-value-file-parser.html
-share/doc/glib/glib-Keyed-Data-Lists.html
-share/doc/glib/glib-Lexical-Scanner.html
-share/doc/glib/glib-Limits-of-Basic-Types.html
-share/doc/glib/glib-Memory-Allocation.html
-share/doc/glib/glib-Memory-Allocators.html
-share/doc/glib/glib-Memory-Chunks.html
-share/doc/glib/glib-Memory-Slices.html
-share/doc/glib/glib-Message-Logging.html
-share/doc/glib/glib-Miscellaneous-Macros.html
-share/doc/glib/glib-Miscellaneous-Utility-Functions.html
-share/doc/glib/glib-N-ary-Trees.html
-share/doc/glib/glib-Numerical-Definitions.html
-share/doc/glib/glib-Pointer-Arrays.html
-share/doc/glib/glib-Quarks.html
-share/doc/glib/glib-Random-Numbers.html
-share/doc/glib/glib-Relations-and-Tuples.html
-share/doc/glib/glib-Shell-related-Utilities.html
-share/doc/glib/glib-Simple-XML-Subset-Parser.html
-share/doc/glib/glib-Singly-Linked-Lists.html
-share/doc/glib/glib-Spawning-Processes.html
-share/doc/glib/glib-Standard-Macros.html
-share/doc/glib/glib-String-Chunks.html
-share/doc/glib/glib-String-Utility-Functions.html
-share/doc/glib/glib-Strings.html
-share/doc/glib/glib-The-Main-Event-Loop.html
-share/doc/glib/glib-Thread-Pools.html
-share/doc/glib/glib-Threads.html
-share/doc/glib/glib-Timers.html
-share/doc/glib/glib-Trash-Stacks.html
-share/doc/glib/glib-Type-Conversion-Macros.html
-share/doc/glib/glib-Unicode-Manipulation.html
-share/doc/glib/glib-Version-Information.html
-share/doc/glib/glib-Warnings-and-Assertions.html
-share/doc/glib/glib-Windows-Compatibility-Functions.html
-share/doc/glib/glib-building.html
-share/doc/glib/glib-changes.html
-share/doc/glib/glib-compiling.html
-share/doc/glib/glib-core.html
-share/doc/glib/glib-cross-compiling.html
-share/doc/glib/glib-data-types.html
-share/doc/glib/glib-fundamentals.html
-share/doc/glib/glib-gettextize.html
-share/doc/glib/glib-resources.html
-share/doc/glib/glib-running.html
-share/doc/glib/glib-utilities.html
-share/doc/glib/glib.devhelp
-share/doc/glib/glib.devhelp2
-share/doc/glib/glib.html
-share/doc/glib/home.png
-share/doc/glib/index.html
-share/doc/glib/index.sgml
-share/doc/glib/ix01.html
-share/doc/glib/ix02.html
-share/doc/glib/ix03.html
-share/doc/glib/ix04.html
-share/doc/glib/ix05.html
-share/doc/glib/ix06.html
-share/doc/glib/ix07.html
-share/doc/glib/ix08.html
-share/doc/glib/left.png
-share/doc/glib/mainloop-states.gif
-share/doc/glib/right.png
-share/doc/glib/style.css
-share/doc/glib/tools.html
-share/doc/glib/up.png
-share/doc/gobject/GTypeModule.html
-share/doc/gobject/GTypePlugin.html
-share/doc/gobject/ch01.html
-share/doc/gobject/ch01s02.html
-share/doc/gobject/ch02.html
-share/doc/gobject/ch06s03.html
-share/doc/gobject/ch07s02.html
-share/doc/gobject/ch07s03.html
-share/doc/gobject/chapter-gobject.html
-share/doc/gobject/chapter-signal.html
-share/doc/gobject/glib-genmarshal.html
-share/doc/gobject/glib-mkenums.html
-share/doc/gobject/glue.png
-share/doc/gobject/gobject-Boxed-Types.html
-share/doc/gobject/gobject-Closures.html
-share/doc/gobject/gobject-Enumeration-and-Flag-Types.html
-share/doc/gobject/gobject-GParamSpec.html
-share/doc/gobject/gobject-Generic-values.html
-share/doc/gobject/gobject-Signals.html
-share/doc/gobject/gobject-Standard-Parameter-and-Value-Types.html
-share/doc/gobject/gobject-The-Base-Object-Type.html
-share/doc/gobject/gobject-Type-Information.html
-share/doc/gobject/gobject-Value-arrays.html
-share/doc/gobject/gobject-Varargs-Value-Collection.html
-share/doc/gobject/gobject-memory.html
-share/doc/gobject/gobject-properties.html
-share/doc/gobject/gobject-query.html
-share/doc/gobject/gobject.devhelp
-share/doc/gobject/gobject.devhelp2
-share/doc/gobject/gtype-conventions.html
-share/doc/gobject/gtype-instantiable-classed.html
-share/doc/gobject/gtype-non-instantiable-classed.html
-share/doc/gobject/gtype-non-instantiable.html
-share/doc/gobject/home.png
-share/doc/gobject/howto-gobject-chainup.html
-share/doc/gobject/howto-gobject-code.html
-share/doc/gobject/howto-gobject-construction.html
-share/doc/gobject/howto-gobject-destruction.html
-share/doc/gobject/howto-gobject-methods.html
-share/doc/gobject/howto-gobject.html
-share/doc/gobject/howto-interface-implement.html
-share/doc/gobject/howto-interface-properties.html
-share/doc/gobject/howto-interface.html
-share/doc/gobject/howto-signals.html
-share/doc/gobject/index.html
-share/doc/gobject/index.sgml
-share/doc/gobject/ix01.html
-share/doc/gobject/ix02.html
-share/doc/gobject/ix03.html
-share/doc/gobject/ix04.html
-share/doc/gobject/ix05.html
-share/doc/gobject/ix06.html
-share/doc/gobject/ix07.html
-share/doc/gobject/ix08.html
-share/doc/gobject/left.png
-share/doc/gobject/pr01.html
-share/doc/gobject/pt01.html
-share/doc/gobject/pt02.html
-share/doc/gobject/pt03.html
-share/doc/gobject/right.png
-share/doc/gobject/rn01.html
-share/doc/gobject/rn02.html
-share/doc/gobject/signal.html
-share/doc/gobject/style.css
-share/doc/gobject/tools-ginspector.html
-share/doc/gobject/tools-gob.html
-share/doc/gobject/tools-gtkdoc.html
-share/doc/gobject/tools-refdb.html
-share/doc/gobject/up.png
 share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
+share/gtk-doc/html/glib/file-name-encodings.png
+share/gtk-doc/html/glib/glib-Arrays.html
+share/gtk-doc/html/glib/glib-Asynchronous-Queues.html
+share/gtk-doc/html/glib/glib-Atomic-Operations.html
+share/gtk-doc/html/glib/glib-Automatic-String-Completion.html
+share/gtk-doc/html/glib/glib-Balanced-Binary-Trees.html
+share/gtk-doc/html/glib/glib-Base64-Encoding.html
+share/gtk-doc/html/glib/glib-Basic-Types.html
+share/gtk-doc/html/glib/glib-Bookmark-file-parser.html
+share/gtk-doc/html/glib/glib-Byte-Arrays.html
+share/gtk-doc/html/glib/glib-Byte-Order-Macros.html
+share/gtk-doc/html/glib/glib-Caches.html
+share/gtk-doc/html/glib/glib-Character-Set-Conversion.html
+share/gtk-doc/html/glib/glib-Commandline-option-parser.html
+share/gtk-doc/html/glib/glib-Datasets.html
+share/gtk-doc/html/glib/glib-Date-and-Time-Functions.html
+share/gtk-doc/html/glib/glib-Double-ended-Queues.html
+share/gtk-doc/html/glib/glib-Doubly-Linked-Lists.html
+share/gtk-doc/html/glib/glib-Dynamic-Loading-of-Modules.html
+share/gtk-doc/html/glib/glib-Error-Reporting.html
+share/gtk-doc/html/glib/glib-File-Utilities.html
+share/gtk-doc/html/glib/glib-Glob-style-pattern-matching.html
+share/gtk-doc/html/glib/glib-Hash-Tables.html
+share/gtk-doc/html/glib/glib-Hook-Functions.html
+share/gtk-doc/html/glib/glib-I18N.html
+share/gtk-doc/html/glib/glib-IO-Channels.html
+share/gtk-doc/html/glib/glib-Key-value-file-parser.html
+share/gtk-doc/html/glib/glib-Keyed-Data-Lists.html
+share/gtk-doc/html/glib/glib-Lexical-Scanner.html
+share/gtk-doc/html/glib/glib-Limits-of-Basic-Types.html
+share/gtk-doc/html/glib/glib-Memory-Allocation.html
+share/gtk-doc/html/glib/glib-Memory-Allocators.html
+share/gtk-doc/html/glib/glib-Memory-Chunks.html
+share/gtk-doc/html/glib/glib-Memory-Slices.html
+share/gtk-doc/html/glib/glib-Message-Logging.html
+share/gtk-doc/html/glib/glib-Miscellaneous-Macros.html
+share/gtk-doc/html/glib/glib-Miscellaneous-Utility-Functions.html
+share/gtk-doc/html/glib/glib-N-ary-Trees.html
+share/gtk-doc/html/glib/glib-Numerical-Definitions.html
+share/gtk-doc/html/glib/glib-Pointer-Arrays.html
+share/gtk-doc/html/glib/glib-Quarks.html
+share/gtk-doc/html/glib/glib-Random-Numbers.html
+share/gtk-doc/html/glib/glib-Relations-and-Tuples.html
+share/gtk-doc/html/glib/glib-Shell-related-Utilities.html
+share/gtk-doc/html/glib/glib-Simple-XML-Subset-Parser.html
+share/gtk-doc/html/glib/glib-Singly-Linked-Lists.html
+share/gtk-doc/html/glib/glib-Spawning-Processes.html
+share/gtk-doc/html/glib/glib-Standard-Macros.html
+share/gtk-doc/html/glib/glib-String-Chunks.html
+share/gtk-doc/html/glib/glib-String-Utility-Functions.html
+share/gtk-doc/html/glib/glib-Strings.html
+share/gtk-doc/html/glib/glib-The-Main-Event-Loop.html
+share/gtk-doc/html/glib/glib-Thread-Pools.html
+share/gtk-doc/html/glib/glib-Threads.html
+share/gtk-doc/html/glib/glib-Timers.html
+share/gtk-doc/html/glib/glib-Trash-Stacks.html
+share/gtk-doc/html/glib/glib-Type-Conversion-Macros.html
+share/gtk-doc/html/glib/glib-Unicode-Manipulation.html
+share/gtk-doc/html/glib/glib-Version-Information.html
+share/gtk-doc/html/glib/glib-Warnings-and-Assertions.html
+share/gtk-doc/html/glib/glib-Windows-Compatibility-Functions.html
+share/gtk-doc/html/glib/glib-building.html
+share/gtk-doc/html/glib/glib-changes.html
+share/gtk-doc/html/glib/glib-compiling.html
+share/gtk-doc/html/glib/glib-core.html
+share/gtk-doc/html/glib/glib-cross-compiling.html
+share/gtk-doc/html/glib/glib-data-types.html
+share/gtk-doc/html/glib/glib-fundamentals.html
+share/gtk-doc/html/glib/glib-gettextize.html
+share/gtk-doc/html/glib/glib-resources.html
+share/gtk-doc/html/glib/glib-running.html
+share/gtk-doc/html/glib/glib-utilities.html
+share/gtk-doc/html/glib/glib.devhelp
+share/gtk-doc/html/glib/glib.devhelp2
+share/gtk-doc/html/glib/glib.html
+share/gtk-doc/html/glib/home.png
+share/gtk-doc/html/glib/index.html
+share/gtk-doc/html/glib/index.sgml
+share/gtk-doc/html/glib/ix01.html
+share/gtk-doc/html/glib/ix02.html
+share/gtk-doc/html/glib/ix03.html
+share/gtk-doc/html/glib/ix04.html
+share/gtk-doc/html/glib/ix05.html
+share/gtk-doc/html/glib/ix06.html
+share/gtk-doc/html/glib/ix07.html
+share/gtk-doc/html/glib/ix08.html
+share/gtk-doc/html/glib/left.png
+share/gtk-doc/html/glib/mainloop-states.gif
+share/gtk-doc/html/glib/right.png
+share/gtk-doc/html/glib/style.css
+share/gtk-doc/html/glib/tools.html
+share/gtk-doc/html/glib/up.png
+share/gtk-doc/html/gobject/GTypeModule.html
+share/gtk-doc/html/gobject/GTypePlugin.html
+share/gtk-doc/html/gobject/ch01.html
+share/gtk-doc/html/gobject/ch01s02.html
+share/gtk-doc/html/gobject/ch02.html
+share/gtk-doc/html/gobject/ch06s03.html
+share/gtk-doc/html/gobject/ch07s02.html
+share/gtk-doc/html/gobject/ch07s03.html
+share/gtk-doc/html/gobject/chapter-gobject.html
+share/gtk-doc/html/gobject/chapter-signal.html
+share/gtk-doc/html/gobject/glib-genmarshal.html
+share/gtk-doc/html/gobject/glib-mkenums.html
+share/gtk-doc/html/gobject/glue.png
+share/gtk-doc/html/gobject/gobject-Boxed-Types.html
+share/gtk-doc/html/gobject/gobject-Closures.html
+share/gtk-doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
+share/gtk-doc/html/gobject/gobject-GParamSpec.html
+share/gtk-doc/html/gobject/gobject-Generic-values.html
+share/gtk-doc/html/gobject/gobject-Signals.html
+share/gtk-doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
+share/gtk-doc/html/gobject/gobject-The-Base-Object-Type.html
+share/gtk-doc/html/gobject/gobject-Type-Information.html
+share/gtk-doc/html/gobject/gobject-Value-arrays.html
+share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
+share/gtk-doc/html/gobject/gobject-memory.html
+share/gtk-doc/html/gobject/gobject-properties.html
+share/gtk-doc/html/gobject/gobject-query.html
+share/gtk-doc/html/gobject/gobject.devhelp
+share/gtk-doc/html/gobject/gobject.devhelp2
+share/gtk-doc/html/gobject/gtype-conventions.html
+share/gtk-doc/html/gobject/gtype-instantiable-classed.html
+share/gtk-doc/html/gobject/gtype-non-instantiable-classed.html
+share/gtk-doc/html/gobject/gtype-non-instantiable.html
+share/gtk-doc/html/gobject/home.png
+share/gtk-doc/html/gobject/howto-gobject-chainup.html
+share/gtk-doc/html/gobject/howto-gobject-code.html
+share/gtk-doc/html/gobject/howto-gobject-construction.html
+share/gtk-doc/html/gobject/howto-gobject-destruction.html
+share/gtk-doc/html/gobject/howto-gobject-methods.html
+share/gtk-doc/html/gobject/howto-gobject.html
+share/gtk-doc/html/gobject/howto-interface-implement.html
+share/gtk-doc/html/gobject/howto-interface-properties.html
+share/gtk-doc/html/gobject/howto-interface.html
+share/gtk-doc/html/gobject/howto-signals.html
+share/gtk-doc/html/gobject/index.html
+share/gtk-doc/html/gobject/index.sgml
+share/gtk-doc/html/gobject/ix01.html
+share/gtk-doc/html/gobject/ix02.html
+share/gtk-doc/html/gobject/ix03.html
+share/gtk-doc/html/gobject/ix04.html
+share/gtk-doc/html/gobject/ix05.html
+share/gtk-doc/html/gobject/ix06.html
+share/gtk-doc/html/gobject/ix07.html
+share/gtk-doc/html/gobject/ix08.html
+share/gtk-doc/html/gobject/left.png
+share/gtk-doc/html/gobject/pr01.html
+share/gtk-doc/html/gobject/pt01.html
+share/gtk-doc/html/gobject/pt02.html
+share/gtk-doc/html/gobject/pt03.html
+share/gtk-doc/html/gobject/right.png
+share/gtk-doc/html/gobject/rn01.html
+share/gtk-doc/html/gobject/rn02.html
+share/gtk-doc/html/gobject/signal.html
+share/gtk-doc/html/gobject/style.css
+share/gtk-doc/html/gobject/tools-ginspector.html
+share/gtk-doc/html/gobject/tools-gob.html
+share/gtk-doc/html/gobject/tools-gtkdoc.html
+share/gtk-doc/html/gobject/tools-refdb.html
+share/gtk-doc/html/gobject/up.png
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
@@ -335,11 +335,11 @@ share/locale/yi/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_HK/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@dirrm share/gtk-doc/html/gobject
+@dirrm share/gtk-doc/html/glib
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
-@dirrm share/doc/gobject
-@dirrm share/doc/glib
 @dirrm lib/glib-2.0/include
 @dirrm lib/glib-2.0
 @dirrm include/glib/glib-2.0/gobject