ride on update and migrate devhelp documentation to share/gtk-doc

2 files changed, 24 insertions, 27 deletions

diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index b65b3e62e5a..d60b9c08bac 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.41 2006/10/23 00:22:14 wiz Exp $
+# $NetBSD: Makefile.common,v 1.42 2006/10/23 09:03:03 drochner Exp $
 #
 
 GCONF2_VERSION=		2.16.0
@@ -32,8 +32,6 @@ PKG_SYSCONFSUBDIR=	gconf
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--with-sysconfsubdir=
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
-CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--enable-gconf-source=xml::${PKG_SYSCONFDIR}/gconf.xml.defaults
 
 BUILDLINK_API_DEPENDS.glib2+=	glib2>=2.10.0
diff --git a/devel/GConf2/PLIST b/devel/GConf2/PLIST
index 5b33c2e7f58..a16542c7ef8 100644
--- a/devel/GConf2/PLIST
+++ b/devel/GConf2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.27 2006/10/23 00:22:14 wiz Exp $
+@comment $NetBSD: PLIST,v 1.28 2006/10/23 09:03:03 drochner Exp $
 bin/gconf-merge-tree
 bin/gconftool-2
 include/gconf/2/gconf/gconf-changeset.h
@@ -17,29 +17,28 @@ lib/pkgconfig/gconf-2.0.pc
 libexec/gconfd-2
 man/man1/gconftool-2.1
 share/aclocal/gconf-2.m4
-share/doc/gconf/ch01.html
-share/doc/gconf/gconf-GConfClient.html
-share/doc/gconf/gconf-gconf-backend.html
-share/doc/gconf/gconf-gconf-changeset.html
-share/doc/gconf/gconf-gconf-engine.html
-share/doc/gconf/gconf-gconf-error.html
-share/doc/gconf/gconf-gconf-internals.html
-share/doc/gconf/gconf-gconf-listeners.html
-share/doc/gconf/gconf-gconf-locale.html
-share/doc/gconf/gconf-gconf-schema.html
-share/doc/gconf/gconf-gconf-sources.html
-share/doc/gconf/gconf-gconf-value.html
-share/doc/gconf/gconf-gconf.html
-share/doc/gconf/gconf.devhelp
-share/doc/gconf/gconf.devhelp2
-share/doc/gconf/home.png
-share/doc/gconf/index.html
-share/doc/gconf/index.sgml
-share/doc/gconf/left.png
-share/doc/gconf/right.png
-share/doc/gconf/style.css
-share/doc/gconf/up.png
 share/examples/GConf2/path
+share/gtk-doc/html/gconf/ch01.html
+share/gtk-doc/html/gconf/gconf-GConfClient.html
+share/gtk-doc/html/gconf/gconf-gconf-backend.html
+share/gtk-doc/html/gconf/gconf-gconf-changeset.html
+share/gtk-doc/html/gconf/gconf-gconf-engine.html
+share/gtk-doc/html/gconf/gconf-gconf-error.html
+share/gtk-doc/html/gconf/gconf-gconf-internals.html
+share/gtk-doc/html/gconf/gconf-gconf-listeners.html
+share/gtk-doc/html/gconf/gconf-gconf-locale.html
+share/gtk-doc/html/gconf/gconf-gconf-schema.html
+share/gtk-doc/html/gconf/gconf-gconf-sources.html
+share/gtk-doc/html/gconf/gconf-gconf-value.html
+share/gtk-doc/html/gconf/gconf-gconf.html
+share/gtk-doc/html/gconf/gconf.devhelp
+share/gtk-doc/html/gconf/home.png
+share/gtk-doc/html/gconf/index.html
+share/gtk-doc/html/gconf/index.sgml
+share/gtk-doc/html/gconf/left.png
+share/gtk-doc/html/gconf/right.png
+share/gtk-doc/html/gconf/style.css
+share/gtk-doc/html/gconf/up.png
 share/locale/am/LC_MESSAGES/GConf2.mo
 share/locale/ar/LC_MESSAGES/GConf2.mo
 share/locale/az/LC_MESSAGES/GConf2.mo
@@ -113,11 +112,11 @@ share/locale/zh_TW/LC_MESSAGES/GConf2.mo
 share/sgml/gconf/gconf-1.0.dtd
 @dirrm share/sgml/gconf
 @comment in xmlcatmgr: @dirrm share/sgml
+@dirrm share/gtk-doc/html/gconf
 @exec ${MKDIR} %D/share/gconf/schemas
 @dirrm share/gconf/schemas
 @unexec ${RMDIR} -p %D/share/gconf 2>/dev/null || ${TRUE}
 @dirrm share/examples/GConf2
-@dirrm share/doc/gconf
 @dirrm lib/GConf/2
 @unexec ${RMDIR} -p %D/lib/GConf 2>/dev/null || ${TRUE}
 @dirrm include/gconf/2/gconf