Install documentation under share/doc/html (not share/gtk-doc/html).

Also avoid possible detection of gtk-doc (not needed).
Bump PKGREVISION to 1.

2 files changed, 99 insertions, 98 deletions

diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 96addebd888..529afbf88c5 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2002/12/24 03:36:58 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2003/01/04 19:56:38 jmmv Exp $
 #
 
 DISTNAME=		glib-2.2.0
 PKGNAME=		${DISTNAME:S/glib/glib2/}
+PKGREVISION=		1
 CATEGORIES=		devel
 MASTER_SITES=		ftp://ftp.gtk.org/pub/gtk/v2.2/ \
 			ftp://ftp.cs.umn.edu/pub/gimp/gtk/v2.2/ \
@@ -28,7 +29,9 @@ PKGCONFIG_OVERRIDE+=	${WRKSRC}/gthread-2.0.pc.in
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ENV+=		PKGLOCALEDIR=${PKGLOCALEDIR}
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/glib
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 test: build
 	cd ${WRKSRC} && ${MAKE_ENV} ${MAKE_PROGRAM} check 2>&1 | \
diff --git a/devel/glib2/PLIST b/devel/glib2/PLIST
index 506fbecc068..1007ac96923 100644
--- a/devel/glib2/PLIST
+++ b/devel/glib2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/12/24 03:36:58 wiz Exp $
+@comment $NetBSD: PLIST,v 1.8 2003/01/04 19:56:38 jmmv Exp $
 bin/glib-genmarshal
 bin/glib-gettextize
 bin/glib-mkenums
@@ -96,99 +96,99 @@ man/man1/glib-genmarshal.1
 man/man1/glib-mkenums.1
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
+share/doc/html/glib/glib-Arrays.html
+share/doc/html/glib/glib-Asynchronous-Queues.html
+share/doc/html/glib/glib-Automatic-String-Completion.html
+share/doc/html/glib/glib-Balanced-Binary-Trees.html
+share/doc/html/glib/glib-Basic-Types.html
+share/doc/html/glib/glib-Byte-Arrays.html
+share/doc/html/glib/glib-Byte-Order-Macros.html
+share/doc/html/glib/glib-Caches.html
+share/doc/html/glib/glib-Character-Set-Conversion.html
+share/doc/html/glib/glib-Datasets.html
+share/doc/html/glib/glib-Date-and-Time-Functions.html
+share/doc/html/glib/glib-Double-ended-Queues.html
+share/doc/html/glib/glib-Doubly-Linked-Lists.html
+share/doc/html/glib/glib-Dynamic-Loading-of-Modules.html
+share/doc/html/glib/glib-Error-Reporting.html
+share/doc/html/glib/glib-File-Utilities.html
+share/doc/html/glib/glib-Glob-style-pattern-matching.html
+share/doc/html/glib/glib-Hash-Tables.html
+share/doc/html/glib/glib-Hook-Functions.html
+share/doc/html/glib/glib-IO-Channels.html
+share/doc/html/glib/glib-Keyed-Data-Lists.html
+share/doc/html/glib/glib-Lexical-Scanner.html
+share/doc/html/glib/glib-Limits-of-Basic-Types.html
+share/doc/html/glib/glib-Memory-Allocation.html
+share/doc/html/glib/glib-Memory-Allocators.html
+share/doc/html/glib/glib-Memory-Chunks.html
+share/doc/html/glib/glib-Message-Logging.html
+share/doc/html/glib/glib-Miscellaneous-Macros.html
+share/doc/html/glib/glib-Miscellaneous-Utility-Functions.html
+share/doc/html/glib/glib-N-ary-Trees.html
+share/doc/html/glib/glib-Numerical-Definitions.html
+share/doc/html/glib/glib-Pointer-Arrays.html
+share/doc/html/glib/glib-Quarks.html
+share/doc/html/glib/glib-Random-Numbers.html
+share/doc/html/glib/glib-Relations-and-Tuples.html
+share/doc/html/glib/glib-Shell-related-Utilities.html
+share/doc/html/glib/glib-Simple-XML-Subset-Parser.html
+share/doc/html/glib/glib-Singly-Linked-Lists.html
+share/doc/html/glib/glib-Spawning-Processes.html
+share/doc/html/glib/glib-Standard-Macros.html
+share/doc/html/glib/glib-String-Chunks.html
+share/doc/html/glib/glib-String-Utility-Functions.html
+share/doc/html/glib/glib-Strings.html
+share/doc/html/glib/glib-The-Main-Event-Loop.html
+share/doc/html/glib/glib-Thread-Pools.html
+share/doc/html/glib/glib-Threads.html
+share/doc/html/glib/glib-Timers.html
+share/doc/html/glib/glib-Trash-Stacks.html
+share/doc/html/glib/glib-Type-Conversion-Macros.html
+share/doc/html/glib/glib-Unicode-Manipulation.html
+share/doc/html/glib/glib-Warnings-and-Assertions.html
+share/doc/html/glib/glib-Windows-Compatability-Functions.html
+share/doc/html/glib/glib-building.html
+share/doc/html/glib/glib-changes.html
+share/doc/html/glib/glib-compiling.html
+share/doc/html/glib/glib-core.html
+share/doc/html/glib/glib-data-types.html
+share/doc/html/glib/glib-fundamentals.html
+share/doc/html/glib/glib-resources.html
+share/doc/html/glib/glib-running.html
+share/doc/html/glib/glib-utilities.html
+share/doc/html/glib/glib.devhelp
+share/doc/html/glib/glib.html
+share/doc/html/glib/home.png
+share/doc/html/glib/index.html
+share/doc/html/glib/index.sgml
+share/doc/html/glib/left.png
+share/doc/html/glib/mainloop-states.gif
+share/doc/html/glib/right.png
+share/doc/html/glib/up.png
+share/doc/html/gobject/gobject-Boxed-Types.html
+share/doc/html/gobject/gobject-Closures.html
+share/doc/html/gobject/gobject-Enumeration-and-Flag-Types.html
+share/doc/html/gobject/gobject-GParamSpec.html
+share/doc/html/gobject/gobject-GType.html
+share/doc/html/gobject/gobject-GTypeModule.html
+share/doc/html/gobject/gobject-GTypePlugin.html
+share/doc/html/gobject/gobject-Generic-values.html
+share/doc/html/gobject/gobject-Signals.html
+share/doc/html/gobject/gobject-Standard-Parameter-and-Value-Types.html
+share/doc/html/gobject/gobject-The-Base-Object-Type.html
+share/doc/html/gobject/gobject-Value-arrays.html
+share/doc/html/gobject/gobject-Varargs-Value-Collection.html
+share/doc/html/gobject/gobject.devhelp
+share/doc/html/gobject/home.png
+share/doc/html/gobject/index.html
+share/doc/html/gobject/index.sgml
+share/doc/html/gobject/left.png
+share/doc/html/gobject/pr01.html
+share/doc/html/gobject/right.png
+share/doc/html/gobject/rn01.html
+share/doc/html/gobject/up.png
 share/glib-2.0/gettext/po/Makefile.in.in
-share/gtk-doc/html/glib/glib-Arrays.html
-share/gtk-doc/html/glib/glib-Asynchronous-Queues.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-Basic-Types.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-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-IO-Channels.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-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-Warnings-and-Assertions.html
-share/gtk-doc/html/glib/glib-Windows-Compatability-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-data-types.html
-share/gtk-doc/html/glib/glib-fundamentals.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.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/left.png
-share/gtk-doc/html/glib/mainloop-states.gif
-share/gtk-doc/html/glib/right.png
-share/gtk-doc/html/glib/up.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-GType.html
-share/gtk-doc/html/gobject/gobject-GTypeModule.html
-share/gtk-doc/html/gobject/gobject-GTypePlugin.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-Value-arrays.html
-share/gtk-doc/html/gobject/gobject-Varargs-Value-Collection.html
-share/gtk-doc/html/gobject/gobject.devhelp
-share/gtk-doc/html/gobject/home.png
-share/gtk-doc/html/gobject/index.html
-share/gtk-doc/html/gobject/index.sgml
-share/gtk-doc/html/gobject/left.png
-share/gtk-doc/html/gobject/pr01.html
-share/gtk-doc/html/gobject/right.png
-share/gtk-doc/html/gobject/rn01.html
-share/gtk-doc/html/gobject/up.png
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/glib20.mo
@@ -224,13 +224,11 @@ ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/glib20.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/glib20.mo
-@dirrm share/gtk-doc/html/gobject
-@dirrm share/gtk-doc/html/glib
-@unexec ${RMDIR} %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/share/gtk-doc 2>/dev/null || ${TRUE}
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
+@dirrm share/doc/html/gobject
+@dirrm share/doc/html/glib
 @dirrm lib/glib-2.0/include
 @dirrm lib/glib-2.0
 @dirrm include/glib/glib-2.0/gobject