Updated to 2.2.0.1. Changes since 2.0.6 include:

* libgnome/Makefile.am (libgnome_2_la_LDFLAGS): Correct version number error.
* configure.in: Add EXTRAVERSION and set to .1.  Add missing translations to
  ALL_LINGUAS.
* configure.in: Added "mn" to ALL_LINGUAS.
* configure.in: Fix libtool versioning. Up number to 2.2.0
* schemas/desktop_gnome_peripherals_mouse.schemas.in: add
  /desktop/gnome/peripherals/mouse/cursor_theme and
  /desktop/gnome/peripherals/mouse/cursor_size
* monikers/bonobo-config-bag.c (bonobo_config_bag_new): Fix comment.
* schemas/Makefile.am (schema_in_files)
  schemas/desktop_gnome_thumbnailers.schemas.in: Add schemas for thumbnailers.
* schemas/desktop_gnome_accessibility_keyboard.schemas.in : set defaults to 0
  to fix #96483
* help-converters/info/main.c output title, fixing bug #83905

Changes in the package:
- Honor PKG_SYSCONFDIR.
- Use GConf2's schemas.mk file to register schemas.
- Depend on docbook, so the installed customization layer works.

8 files changed, 154 insertions, 184 deletions

diff --git a/devel/libgnome/Makefile b/devel/libgnome/Makefile
index 2618416dc67..708aea53732 100644
--- a/devel/libgnome/Makefile
+++ b/devel/libgnome/Makefile
@@ -1,34 +1,64 @@
-# $NetBSD: Makefile,v 1.6 2003/01/03 23:26:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/14 20:11:49 jmmv Exp $
 #
 
-DISTNAME=	libgnome-2.0.6
+DISTNAME=	libgnome-2.2.0.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnome/2.2/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 library (non-graphical)
 
-BUILD_DEPENDS+=		gtk-doc-[0-9]*:../../textproc/gtk-doc
+DEPENDS=	docbook>=4.2:../../textproc/docbook
 BUILD_USES_MSGFMT=	YES
 
 BUILDLINK_DEPENDS.libxml2=	libxml2>=2.4.22
 BUILDLINK_DEPENDS.esound=	esound>=0.2.26
 
-USE_BUILDLINK2=		YES
-USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
+USE_BUILDLINK2=		YES
 USE_GMAKE=		YES
-
 USE_LIBTOOL=		YES
+USE_PKGLOCALEDIR=	YES
+USE_PKGINSTALL=		YES
+
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/libgnome/libgnome-2.0.pc.in
+
+CONFIGURE_ARGS= 	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
+OWN_DIRS=	${PKG_SYSCONFDIR}/sound/events
+
+EGDIR=		${PREFIX}/share/examples/libgnome
+CONF_FILES=	${EGDIR}/gnome-vfs-2.0/modules/help-methods.conf \
+		${PKG_SYSCONFDIR}/gnome-vfs-2.0/modules/help-modules.conf
+CONF_FILES+=	${EGDIR}/sound/events/gnome-2.soundlist \
+		${PKG_SYSCONFDIR}/sound/events/gnome-2.soundlist
+CONF_FILES+=	${EGDIR}/sound/events/gtk-events-2.soundlist \
+		${PKG_SYSCONFDIR}/sound/events/gtk-events-2.soundlist
+
+GCONF2_SCHEMAS= 	desktop_gnome_accessibility_keyboard.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_applications_browser.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_applications_help_viewer.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_applications_terminal.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_applications_window_manager.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_background.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_file_views.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_interface.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_peripherals_keyboard.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_peripherals_mouse.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_sound.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_thumbnailers.schemas
+GCONF2_SCHEMAS+=	desktop_gnome_url_handlers.schemas
 
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../audio/esound/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/glib2/buildlink2.mk"
-.include "../../devel/GConf2/buildlink2.mk"
+.include "../../devel/GConf2/schemas.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/zlib/buildlink2.mk"
 .include "../../sysutils/gnome-vfs2/buildlink2.mk"
diff --git a/devel/libgnome/PLIST b/devel/libgnome/PLIST
index 80213cd3fc1..65894a3392a 100644
--- a/devel/libgnome/PLIST
+++ b/devel/libgnome/PLIST
@@ -1,73 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/05 10:39:10 jmmv Exp $
-etc/gconf/gconf.xml.defaults/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/file_views/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/interface/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/sound/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/server-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/preferences/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/server-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/start-here/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/system-settings/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash/%gconf.xml
-etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown/%gconf.xml
-etc/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
-etc/gconf/schemas/desktop_gnome_applications_browser.schemas
-etc/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
-etc/gconf/schemas/desktop_gnome_applications_terminal.schemas
-etc/gconf/schemas/desktop_gnome_applications_window_manager.schemas
-etc/gconf/schemas/desktop_gnome_background.schemas
-etc/gconf/schemas/desktop_gnome_file_views.schemas
-etc/gconf/schemas/desktop_gnome_interface.schemas
-etc/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
-etc/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
-etc/gconf/schemas/desktop_gnome_sound.schemas
-etc/gconf/schemas/desktop_gnome_url_handlers.schemas
-etc/gnome-vfs-2.0/modules/help-methods.conf
-etc/sound/events/gnome-2.soundlist
-etc/sound/events/gtk-events-2.soundlist
+@comment $NetBSD: PLIST,v 1.4 2003/02/14 20:11:49 jmmv Exp $
 include/libgnome-2.0/libgnome/gnome-config.h
 include/libgnome-2.0/libgnome/gnome-exec.h
 include/libgnome-2.0/libgnome/gnome-gconf.h
@@ -93,32 +24,83 @@ lib/gnome-vfs-2.0/modules/libvfs-help.so
 lib/libgnome-2.a
 lib/libgnome-2.la
 lib/libgnome-2.so
-lib/libgnome-2.so.0
-lib/libgnome-2.so.0.0
+lib/libgnome-2.so.200
+lib/libgnome-2.so.200.0
 lib/pkgconfig/libgnome-2.0.pc
 libexec/gnome2-db2html
 libexec/gnome2-info2html
 libexec/gnome2-man2html
+share/doc/html/libgnome/home.png
+share/doc/html/libgnome/index.html
+share/doc/html/libgnome/index.sgml
+share/doc/html/libgnome/left.png
+share/doc/html/libgnome/libgnome-gnome-config.html
+share/doc/html/libgnome/libgnome-gnome-exec.html
+share/doc/html/libgnome/libgnome-gnome-gconf.html
+share/doc/html/libgnome/libgnome-gnome-help.html
+share/doc/html/libgnome/libgnome-gnome-i18n.html
+share/doc/html/libgnome/libgnome-gnome-init.html
+share/doc/html/libgnome/libgnome-gnome-program.html
+share/doc/html/libgnome/libgnome-gnome-score.html
+share/doc/html/libgnome/libgnome-gnome-sound.html
+share/doc/html/libgnome/libgnome-gnome-triggers.html
+share/doc/html/libgnome/libgnome-gnome-url.html
+share/doc/html/libgnome/libgnome-gnome-util.html
+share/doc/html/libgnome/libgnome-libgnometypebuiltins.html
+share/doc/html/libgnome/libgnome.html
+share/doc/html/libgnome/right.png
+share/doc/html/libgnome/up.png
+share/doc/html/libgnome/x1296.html
+share/doc/html/libgnome/x2754.html
+share/doc/html/libgnome/x3411.html
+share/doc/html/libgnome/x4196.html
+share/examples/libgnome/gnome-vfs-2.0/modules/help-methods.conf
+share/examples/libgnome/sound/events/gnome-2.soundlist
+share/examples/libgnome/sound/events/gtk-events-2.soundlist
+share/gconf/schemas/desktop_gnome_accessibility_keyboard.schemas
+share/gconf/schemas/desktop_gnome_applications_browser.schemas
+share/gconf/schemas/desktop_gnome_applications_help_viewer.schemas
+share/gconf/schemas/desktop_gnome_applications_terminal.schemas
+share/gconf/schemas/desktop_gnome_applications_window_manager.schemas
+share/gconf/schemas/desktop_gnome_background.schemas
+share/gconf/schemas/desktop_gnome_file_views.schemas
+share/gconf/schemas/desktop_gnome_interface.schemas
+share/gconf/schemas/desktop_gnome_peripherals_keyboard.schemas
+share/gconf/schemas/desktop_gnome_peripherals_mouse.schemas
+share/gconf/schemas/desktop_gnome_sound.schemas
+share/gconf/schemas/desktop_gnome_thumbnailers.schemas
+share/gconf/schemas/desktop_gnome_url_handlers.schemas
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnome-2.0.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnome-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnome-2.0.mo
@@ -140,70 +122,17 @@ share/sgml/docbook/gnome-customization-0.1/gnome-custom.xsl
 share/sgml/docbook/gnome-customization-0.1/gnome-customization.xsl
 share/sgml/docbook/gnome-customization-0.1/l10n.xml
 @dirrm share/sgml/docbook/gnome-customization-0.1
-@exec ${MKDIR} %D/share/gtk-doc/html/libgnome
-@dirrm share/gtk-doc/html/libgnome
+@comment in docbook: @dirrm share/sgml/docbook
+@comment in GConf2: @dirrm share/gconf/schemas
+@dirrm share/examples/libgnome/sound/events
+@dirrm share/examples/libgnome/sound
+@dirrm share/examples/libgnome/gnome-vfs-2.0/modules
+@dirrm share/examples/libgnome/gnome-vfs-2.0
+@dirrm share/examples/libgnome
+@dirrm share/doc/html/libgnome
+@comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0/modules
+@comment in gnome-vfs2: @dirrm lib/gnome-vfs-2.0
 @comment in bonobo-activation: @dirrm lib/bonobo/servers
 @comment in bonobo-activation: @dirrm lib/bonobo/monikers
 @dirrm include/libgnome-2.0/libgnome
 @dirrm include/libgnome-2.0
-@unexec ${RMDIR} %D/etc/sound/events 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/sound 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gnome-vfs-2.0/modules 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf/schemas 2>/dev/null || ${TRUE}
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/unknown
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/system-settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/start-here
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/server-settings
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/preferences
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers/applications
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/url-handlers
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/sound
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/mouse
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/peripherals
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/interface
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/file-views
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/background
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/window_manager
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/applications
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop/gnome
-@dirrm etc/gconf/gconf.xml.defaults/schemas/desktop
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/schemas/desktop 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/schemas 2>/dev/null || ${TRUE}
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/unknown
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/trash
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/system-settings
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/start-here
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/server-settings
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/preferences
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/man
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/info
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/ghelp
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers/applications
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/url-handlers
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/sound
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/mouse
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/peripherals
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/interface
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/file_views
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/background
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/window_manager
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/terminal
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/help_viewer
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications/browser
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/applications
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility/keyboard
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome/accessibility
-@dirrm etc/gconf/gconf.xml.defaults/desktop/gnome
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults/desktop 2>/dev/null || ${TRUE}
-@unexec ${RMDIR} %D/etc/gconf/gconf.xml.defaults 2>/dev/null || ${TRUE}
diff --git a/devel/libgnome/buildlink2.mk b/devel/libgnome/buildlink2.mk
index 0a6a4aa1a99..256d814916c 100644
--- a/devel/libgnome/buildlink2.mk
+++ b/devel/libgnome/buildlink2.mk
@@ -1,16 +1,17 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/12/24 06:09:56 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.4 2003/02/14 20:11:49 jmmv Exp $
 
 .if !defined(LIBGNOME_BUILDLINK2_MK)
 LIBGNOME_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnome
-BUILDLINK_DEPENDS.libgnome?=	libgnome>=2.0.4nb1
+BUILDLINK_DEPENDS.libgnome?=	libgnome>=2.2.0.1
 BUILDLINK_PKGSRCDIR.libgnome?=	../../devel/libgnome
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnome=libgnome
 BUILDLINK_PREFIX.libgnome_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libgnome=	include/libgnome-2.0/libgnome/*
 BUILDLINK_FILES.libgnome+=	lib/libgnome-2.*
+BUILDLINK_FILES.libgnome+=	lib/pkgconfig/libgnome-2.0.pc
 
 .include "../../archivers/bzip2/buildlink2.mk"
 .include "../../audio/esound/buildlink2.mk"
diff --git a/devel/libgnome/distinfo b/devel/libgnome/distinfo
index 4e53e141cec..8da9648e842 100644
--- a/devel/libgnome/distinfo
+++ b/devel/libgnome/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.2 2003/01/03 23:26:22 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 20:11:50 jmmv Exp $
 
-SHA1 (libgnome-2.0.6.tar.bz2) = 854a38e294a6666c0525da5cfe662c4e08502d8f
-Size (libgnome-2.0.6.tar.bz2) = 472750 bytes
-SHA1 (patch-aa) = 49196a1722143fd7e8a255fe6a2a4972401a2609
-SHA1 (patch-ab) = 208760d2da4d76ac02cb6e4fe7f23aecc241abed
-SHA1 (patch-ac) = 5870d1c3802f3c8614b9e79b1e0ad7cc8ef69d43
+SHA1 (libgnome-2.2.0.1.tar.bz2) = 50a7dd086638094723f47788d399d1826647710e
+Size (libgnome-2.2.0.1.tar.bz2) = 716319 bytes
+SHA1 (patch-aa) = edb9f86dbc9defefab5a31ebc6303a7488dab639
+SHA1 (patch-ab) = f1d44227b78406e7daece28e734ac239cda41518
+SHA1 (patch-ac) = 646ec430e239123624916b081f976fe6de669865
+SHA1 (patch-ad) = debc95d4b6bed9998d18c2b2bad1b5a985300ccc
diff --git a/devel/libgnome/patches/patch-aa b/devel/libgnome/patches/patch-aa
index 0e112b05442..b43a6277961 100644
--- a/devel/libgnome/patches/patch-aa
+++ b/devel/libgnome/patches/patch-aa
@@ -1,15 +1,13 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/11 23:31:16 rh Exp $
+$NetBSD: patch-aa,v 1.2 2003/02/14 20:11:50 jmmv Exp $
 
---- doc/reference/Makefile.am.orig	Thu Sep  5 23:37:18 2002
-+++ doc/reference/Makefile.am	Thu Sep  5 23:37:33 2002
-@@ -155,8 +155,8 @@
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+	  echo '-- Installing $(srcdir)/html/index.html' ; \
-+	  $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- 	fi)
+--- gnome-data/Makefile.in.orig	Thu Jan 23 15:08:16 2003
++++ gnome-data/Makefile.in
+@@ -132,7 +132,7 @@ YACC = @YACC@
+ Z_LIBS = @Z_LIBS@
+ gnomelocaledir = @gnomelocaledir@
  
- #
+-soundlistdir = $(sysconfdir)/sound/events
++soundlistdir = $(datadir)/examples/libgnome/sound/events
+ 
+ soundlist_in_files = \
+ 	gnome-2.soundlist.in		\
diff --git a/devel/libgnome/patches/patch-ab b/devel/libgnome/patches/patch-ab
index 19bde4049b1..4ea71d97c43 100644
--- a/devel/libgnome/patches/patch-ab
+++ b/devel/libgnome/patches/patch-ab
@@ -1,15 +1,13 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/11 23:31:16 rh Exp $
+$NetBSD: patch-ab,v 1.2 2003/02/14 20:11:51 jmmv Exp $
 
---- doc/reference/Makefile.in.orig	Thu Sep  5 23:37:21 2002
-+++ doc/reference/Makefile.in	Thu Sep  5 23:37:41 2002
-@@ -379,8 +379,8 @@
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+	  echo '-- Installing $(srcdir)/html/index.html' ; \
-+	  $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- 	fi)
+--- help-converters/gnome-vfs-module/Makefile.in.orig	Thu Jan 23 15:08:20 2003
++++ help-converters/gnome-vfs-module/Makefile.in
+@@ -150,7 +150,7 @@ libvfs_help_la_SOURCES = \
+ libvfs_help_la_LDFLAGS = $(module_flags)
+ libvfs_help_la_LIBADD = $(HELP_VFS_MODULE_LIBS)
  
- #
+-modulesconfdir = $(sysconfdir)/gnome-vfs-2.0/modules
++modulesconfdir = $(datadir)/examples/libgnome/gnome-vfs-2.0/modules
+ modulesconf_DATA = help-methods.conf
+ 
+ EXTRA_DIST = help-methods.conf
diff --git a/devel/libgnome/patches/patch-ac b/devel/libgnome/patches/patch-ac
index 484f4adddb9..6972b55521a 100644
--- a/devel/libgnome/patches/patch-ac
+++ b/devel/libgnome/patches/patch-ac
@@ -1,11 +1,11 @@
-$NetBSD: patch-ac,v 1.1.1.1 2002/09/11 23:31:16 rh Exp $
+$NetBSD: patch-ac,v 1.2 2003/02/14 20:11:51 jmmv Exp $
 
---- libgnome/gnome-init.h.orig	Fri Sep  6 23:02:37 2002
-+++ libgnome/gnome-init.h	Fri Sep  6 23:02:47 2002
-@@ -32,8 +32,8 @@
- G_BEGIN_DECLS
- 
- /* This is where the user specific files are stored under $HOME */
+--- libgnome/gnome-init.h.orig	Fri Nov 22 14:47:27 2002
++++ libgnome/gnome-init.h
+@@ -36,8 +36,8 @@ G_BEGIN_DECLS
+  * to override .gnome2 via environment variable and this is
+  * an important feature for environments that mix GNOME versions)
+  */
 -#define GNOME_DOT_GNOME		".gnome2/"
 -#define GNOME_DOT_GNOME_PRIVATE	".gnome2_private/"
 +#define GNOME_DOT_GNOME		".gnome2"
diff --git a/devel/libgnome/patches/patch-ad b/devel/libgnome/patches/patch-ad
new file mode 100644
index 00000000000..a5318f750a9
--- /dev/null
+++ b/devel/libgnome/patches/patch-ad
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.1 2003/02/14 20:11:52 jmmv Exp $
+
+--- schemas/Makefile.in.orig	Thu Jan 23 15:08:14 2003
++++ schemas/Makefile.in
+@@ -279,7 +279,7 @@ maintainer-clean
+ 
+ # don't do this if we are building in eg. rpm
+ install-data-local:
+-	if test -z "$(DESTDIR)" ; then \
++	if false ; then \
+ 		for p in $(schema_DATA) ; do \
+ 			GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(srcdir)/$$p; \
+ 		done \