update to 3.4.0

This switches to the gnome-2.20 branch

add bl3 file

4 files changed, 289 insertions, 238 deletions

diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 6b9b898fe83..a0a4780f013 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2007/07/27 10:47:05 joerg Exp $
+# $NetBSD: Makefile,v 1.3 2007/12/16 14:03:00 drochner Exp $
 #
 
-DISTNAME=		glade3-3.2.2
+DISTNAME=		glade3-3.4.0
 CATEGORIES=		devel
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade3/3.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade3/3.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -16,10 +16,12 @@ USE_TOOLS+=		pkg-config intltool gmake msgfmt
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 
-PKGCONFIG_OVERRIDE+=	src/glade-3.pc.in
-PKGCONFIG_OVERRIDE+=	src/libgladeui-1.0.pc.in
+PKGCONFIG_OVERRIDE+=	data/gladeui-1.0.pc.in
 
 .include "../../x11/gtk2/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
+.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../devel/libbonoboui/buildlink3.mk"
+.include "../../devel/libgnomeui/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/glade3/PLIST b/devel/glade3/PLIST
index 2e5a3c6121b..4c5c10f2303 100644
--- a/devel/glade3/PLIST
+++ b/devel/glade3/PLIST
@@ -1,13 +1,8 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2007/07/17 19:12:02 drochner Exp $
+@comment $NetBSD: PLIST,v 1.2 2007/12/16 14:03:00 drochner Exp $
 bin/glade-3
-include/libgladeui-1.0/gladeui/atk.xpm
-include/libgladeui-1.0/gladeui/fixed_bg.xpm
-include/libgladeui-1.0/gladeui/glade-accumulators.h
 include/libgladeui-1.0/gladeui/glade-app.h
 include/libgladeui-1.0/gladeui/glade-base-editor.h
-include/libgladeui-1.0/gladeui/glade-binding.h
 include/libgladeui-1.0/gladeui/glade-builtins.h
-include/libgladeui-1.0/gladeui/glade-catalog.h
 include/libgladeui-1.0/gladeui/glade-clipboard-view.h
 include/libgladeui-1.0/gladeui/glade-clipboard.h
 include/libgladeui-1.0/gladeui/glade-command.h
@@ -19,249 +14,271 @@ include/libgladeui-1.0/gladeui/glade-design-view.h
 include/libgladeui-1.0/gladeui/glade-editor-property.h
 include/libgladeui-1.0/gladeui/glade-editor.h
 include/libgladeui-1.0/gladeui/glade-fixed.h
-include/libgladeui-1.0/gladeui/glade-id-allocator.h
-include/libgladeui-1.0/gladeui/glade-marshallers.h
-include/libgladeui-1.0/gladeui/glade-palette-box.h
-include/libgladeui-1.0/gladeui/glade-palette-expander.h
+include/libgladeui-1.0/gladeui/glade-gtk.h
+include/libgladeui-1.0/gladeui/glade-inspector.h
 include/libgladeui-1.0/gladeui/glade-palette-item.h
 include/libgladeui-1.0/gladeui/glade-palette.h
 include/libgladeui-1.0/gladeui/glade-parameter.h
 include/libgladeui-1.0/gladeui/glade-parser.h
 include/libgladeui-1.0/gladeui/glade-placeholder.h
-include/libgladeui-1.0/gladeui/glade-popup.h
-include/libgladeui-1.0/gladeui/glade-project-view.h
 include/libgladeui-1.0/gladeui/glade-project.h
 include/libgladeui-1.0/gladeui/glade-property-class.h
 include/libgladeui-1.0/gladeui/glade-property.h
 include/libgladeui-1.0/gladeui/glade-signal-editor.h
 include/libgladeui-1.0/gladeui/glade-signal.h
 include/libgladeui-1.0/gladeui/glade-utils.h
+include/libgladeui-1.0/gladeui/glade-widget-action.h
 include/libgladeui-1.0/gladeui/glade-widget-adaptor.h
 include/libgladeui-1.0/gladeui/glade-widget.h
 include/libgladeui-1.0/gladeui/glade-xml-utils.h
 include/libgladeui-1.0/gladeui/glade.h
+lib/glade3/modules/libgladegnome.la
 lib/glade3/modules/libgladegtk.la
 lib/libgladeui-1.la
 lib/pkgconfig/gladeui-1.0.pc
 share/applications/glade-3.desktop
+share/glade3/catalogs/bonobo.xml
+share/glade3/catalogs/bonobo.xml.in
+share/glade3/catalogs/canvas.xml
+share/glade3/catalogs/canvas.xml.in
+share/glade3/catalogs/gnome.xml
+share/glade3/catalogs/gnome.xml.in
 share/glade3/catalogs/gtk+.xml
 share/glade3/catalogs/gtk+.xml.in
-share/glade3/pixmaps/16x16/aboutdialog.png
-share/glade3/pixmaps/16x16/accellabel.png
-share/glade3/pixmaps/16x16/alignment.png
-share/glade3/pixmaps/16x16/arrow.png
-share/glade3/pixmaps/16x16/aspectframe.png
-share/glade3/pixmaps/16x16/assistant.png
-share/glade3/pixmaps/16x16/button.png
-share/glade3/pixmaps/16x16/calendar.png
-share/glade3/pixmaps/16x16/checkbutton.png
-share/glade3/pixmaps/16x16/checkmenuitem.png
-share/glade3/pixmaps/16x16/clist.png
-share/glade3/pixmaps/16x16/colorbutton.png
-share/glade3/pixmaps/16x16/colorselection.png
-share/glade3/pixmaps/16x16/colorselectiondialog.png
-share/glade3/pixmaps/16x16/combo.png
-share/glade3/pixmaps/16x16/combobox.png
-share/glade3/pixmaps/16x16/comboboxentry.png
-share/glade3/pixmaps/16x16/curve.png
-share/glade3/pixmaps/16x16/custom.png
-share/glade3/pixmaps/16x16/dialog.png
-share/glade3/pixmaps/16x16/drawingarea.png
-share/glade3/pixmaps/16x16/entry.png
-share/glade3/pixmaps/16x16/eventbox.png
-share/glade3/pixmaps/16x16/expander.png
-share/glade3/pixmaps/16x16/filechooserbutton.png
-share/glade3/pixmaps/16x16/filechooserdialog.png
-share/glade3/pixmaps/16x16/fileselection.png
-share/glade3/pixmaps/16x16/fixed.png
-share/glade3/pixmaps/16x16/fontbutton.png
-share/glade3/pixmaps/16x16/fontselection.png
-share/glade3/pixmaps/16x16/fontselectiondialog.png
-share/glade3/pixmaps/16x16/frame.png
-share/glade3/pixmaps/16x16/gammacurve.png
-share/glade3/pixmaps/16x16/handlebox.png
-share/glade3/pixmaps/16x16/hbox.png
-share/glade3/pixmaps/16x16/hbuttonbox.png
-share/glade3/pixmaps/16x16/hpaned.png
-share/glade3/pixmaps/16x16/hruler.png
-share/glade3/pixmaps/16x16/hscale.png
-share/glade3/pixmaps/16x16/hscrollbar.png
-share/glade3/pixmaps/16x16/hseparator.png
-share/glade3/pixmaps/16x16/iconview.png
-share/glade3/pixmaps/16x16/image.png
-share/glade3/pixmaps/16x16/imagemenuitem.png
-share/glade3/pixmaps/16x16/inputdialog.png
-share/glade3/pixmaps/16x16/label.png
-share/glade3/pixmaps/16x16/layout.png
-share/glade3/pixmaps/16x16/linkbutton.png
-share/glade3/pixmaps/16x16/list.png
-share/glade3/pixmaps/16x16/listitem.png
-share/glade3/pixmaps/16x16/menu.png
-share/glade3/pixmaps/16x16/menubar.png
-share/glade3/pixmaps/16x16/menuitem.png
-share/glade3/pixmaps/16x16/menutoolbutton.png
-share/glade3/pixmaps/16x16/messagedialog.png
-share/glade3/pixmaps/16x16/notebook.png
-share/glade3/pixmaps/16x16/optionmenu.png
-share/glade3/pixmaps/16x16/pagesetupdialog.png
-share/glade3/pixmaps/16x16/printdialog.png
-share/glade3/pixmaps/16x16/progressbar.png
-share/glade3/pixmaps/16x16/radiobutton.png
-share/glade3/pixmaps/16x16/radiomenuitem.png
-share/glade3/pixmaps/16x16/radiotoolbutton.png
-share/glade3/pixmaps/16x16/recentchooser.png
-share/glade3/pixmaps/16x16/recentchooserdialog.png
-share/glade3/pixmaps/16x16/ruler.png
-share/glade3/pixmaps/16x16/scrolledwindow.png
-share/glade3/pixmaps/16x16/separatormenuitem.png
-share/glade3/pixmaps/16x16/separatortoolitem.png
-share/glade3/pixmaps/16x16/spinbutton.png
-share/glade3/pixmaps/16x16/statusbar.png
-share/glade3/pixmaps/16x16/table.png
-share/glade3/pixmaps/16x16/textview.png
-share/glade3/pixmaps/16x16/togglebutton.png
-share/glade3/pixmaps/16x16/toggletoolbutton.png
-share/glade3/pixmaps/16x16/toolbar.png
-share/glade3/pixmaps/16x16/toolbutton.png
-share/glade3/pixmaps/16x16/toolitem.png
-share/glade3/pixmaps/16x16/treeview.png
-share/glade3/pixmaps/16x16/vbox.png
-share/glade3/pixmaps/16x16/vbuttonbox.png
-share/glade3/pixmaps/16x16/viewport.png
-share/glade3/pixmaps/16x16/vpaned.png
-share/glade3/pixmaps/16x16/vruler.png
-share/glade3/pixmaps/16x16/vscale.png
-share/glade3/pixmaps/16x16/vscrollbar.png
-share/glade3/pixmaps/16x16/vseparator.png
-share/glade3/pixmaps/16x16/window.png
-share/glade3/pixmaps/22x22/aboutdialog.png
-share/glade3/pixmaps/22x22/accellabel.png
-share/glade3/pixmaps/22x22/alignment.png
-share/glade3/pixmaps/22x22/arrow.png
-share/glade3/pixmaps/22x22/aspectframe.png
-share/glade3/pixmaps/22x22/assistant.png
-share/glade3/pixmaps/22x22/button.png
-share/glade3/pixmaps/22x22/calendar.png
-share/glade3/pixmaps/22x22/checkbutton.png
-share/glade3/pixmaps/22x22/checkmenuitem.png
-share/glade3/pixmaps/22x22/clist.png
-share/glade3/pixmaps/22x22/colorbutton.png
-share/glade3/pixmaps/22x22/colorselection.png
-share/glade3/pixmaps/22x22/colorselectiondialog.png
-share/glade3/pixmaps/22x22/combo.png
-share/glade3/pixmaps/22x22/combobox.png
-share/glade3/pixmaps/22x22/comboboxentry.png
-share/glade3/pixmaps/22x22/curve.png
-share/glade3/pixmaps/22x22/custom.png
-share/glade3/pixmaps/22x22/dialog.png
-share/glade3/pixmaps/22x22/drawingarea.png
-share/glade3/pixmaps/22x22/entry.png
-share/glade3/pixmaps/22x22/eventbox.png
-share/glade3/pixmaps/22x22/expander.png
-share/glade3/pixmaps/22x22/filechooserbutton.png
-share/glade3/pixmaps/22x22/filechooserdialog.png
-share/glade3/pixmaps/22x22/fileselection.png
-share/glade3/pixmaps/22x22/fixed.png
-share/glade3/pixmaps/22x22/fontbutton.png
-share/glade3/pixmaps/22x22/fontselection.png
-share/glade3/pixmaps/22x22/fontselectiondialog.png
-share/glade3/pixmaps/22x22/frame.png
-share/glade3/pixmaps/22x22/gammacurve.png
-share/glade3/pixmaps/22x22/handlebox.png
-share/glade3/pixmaps/22x22/hbox.png
-share/glade3/pixmaps/22x22/hbuttonbox.png
-share/glade3/pixmaps/22x22/hpaned.png
-share/glade3/pixmaps/22x22/hruler.png
-share/glade3/pixmaps/22x22/hscale.png
-share/glade3/pixmaps/22x22/hscrollbar.png
-share/glade3/pixmaps/22x22/hseparator.png
-share/glade3/pixmaps/22x22/iconview.png
-share/glade3/pixmaps/22x22/image.png
-share/glade3/pixmaps/22x22/imagemenuitem.png
-share/glade3/pixmaps/22x22/inputdialog.png
-share/glade3/pixmaps/22x22/label.png
-share/glade3/pixmaps/22x22/layout.png
-share/glade3/pixmaps/22x22/linkbutton.png
-share/glade3/pixmaps/22x22/list.png
-share/glade3/pixmaps/22x22/listitem.png
-share/glade3/pixmaps/22x22/menu.png
-share/glade3/pixmaps/22x22/menubar.png
-share/glade3/pixmaps/22x22/menuitem.png
-share/glade3/pixmaps/22x22/menutoolbutton.png
-share/glade3/pixmaps/22x22/messagedialog.png
-share/glade3/pixmaps/22x22/notebook.png
-share/glade3/pixmaps/22x22/optionmenu.png
-share/glade3/pixmaps/22x22/pagesetupdialog.png
-share/glade3/pixmaps/22x22/printdialog.png
-share/glade3/pixmaps/22x22/progressbar.png
-share/glade3/pixmaps/22x22/radiobutton.png
-share/glade3/pixmaps/22x22/radiomenuitem.png
-share/glade3/pixmaps/22x22/radiotoolbutton.png
-share/glade3/pixmaps/22x22/recentchooser.png
-share/glade3/pixmaps/22x22/recentchooserdialog.png
-share/glade3/pixmaps/22x22/ruler.png
-share/glade3/pixmaps/22x22/scrolledwindow.png
-share/glade3/pixmaps/22x22/separatormenuitem.png
-share/glade3/pixmaps/22x22/separatortoolitem.png
-share/glade3/pixmaps/22x22/spinbutton.png
-share/glade3/pixmaps/22x22/statusbar.png
-share/glade3/pixmaps/22x22/table.png
-share/glade3/pixmaps/22x22/textview.png
-share/glade3/pixmaps/22x22/togglebutton.png
-share/glade3/pixmaps/22x22/toggletoolbutton.png
-share/glade3/pixmaps/22x22/toolbar.png
-share/glade3/pixmaps/22x22/toolbutton.png
-share/glade3/pixmaps/22x22/toolitem.png
-share/glade3/pixmaps/22x22/treeview.png
-share/glade3/pixmaps/22x22/vbox.png
-share/glade3/pixmaps/22x22/vbuttonbox.png
-share/glade3/pixmaps/22x22/viewport.png
-share/glade3/pixmaps/22x22/vpaned.png
-share/glade3/pixmaps/22x22/vruler.png
-share/glade3/pixmaps/22x22/vscale.png
-share/glade3/pixmaps/22x22/vscrollbar.png
-share/glade3/pixmaps/22x22/vseparator.png
-share/glade3/pixmaps/22x22/window.png
+share/glade3/catalogs/gtkunixprint.xml
+share/glade3/catalogs/gtkunixprint.xml.in
+share/glade3/pixmaps/atk.png
 share/glade3/pixmaps/devhelp.png
+share/glade3/pixmaps/drag-resize.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-alignment.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-arrow.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-aspectframe.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-assistant.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-button.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-calendar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-checkbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-checkmenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-clist.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-colorbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-colorselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-colorselectiondialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-combo.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxentry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-curve.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-custom.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-dialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-drawingarea.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-entry.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-eventbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-expander.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-filechooserwidget.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fileselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fixed.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fontbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fontselection.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-fontselectiondialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-frame.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-gammacurve.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-gtktextview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-handlebox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hbuttonbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hpaned.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hruler.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hscale.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hscrollbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-hseparator.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-iconview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-image.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-imagemenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-inputdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-label.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-layout.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-linkbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-list.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-listitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menu.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menubar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-menutoolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-messagedialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-notebook.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-optionmenu.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-pagesetupdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-printdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-progressbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-radiobutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-radiomenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-radiotoolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooser.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-recentchooserdialog.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-ruler.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-scrolledwindow.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-separatormenuitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-separatortoolitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-spinbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-statusbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-table.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-textview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-togglebutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toggletoolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toolbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toolbutton.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-toolitem.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-treeview.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vbuttonbox.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-viewport.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vpaned.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vruler.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vscale.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vscrollbar.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
+share/glade3/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-alignment.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-arrow.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-aspectframe.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-assistant.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-button.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-calendar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-checkbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-checkmenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-clist.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-colorbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-colorselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-colorselectiondialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-combo.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxentry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-curve.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-custom.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-dialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-drawingarea.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-entry.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-eventbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-expander.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-filechooserwidget.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fileselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fixed.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fontbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fontselection.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-fontselectiondialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-frame.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-gammacurve.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-handlebox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hbuttonbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hpaned.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hruler.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hscale.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hscrollbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-hseparator.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-iconview.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-image.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-imagemenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-inputdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-label.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-layout.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-linkbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-list.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-listitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menu.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menubar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-menutoolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-messagedialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-notebook.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-optionmenu.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-pagesetupdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-printdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-progressbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-radiobutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-radiomenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-radiotoolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooser.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-recentchooserdialog.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-ruler.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-scrolledwindow.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-separatormenuitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-separatortoolitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-spinbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-statusbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-table.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-textview.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-togglebutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toggletoolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toolbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toolbutton.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-toolitem.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-treeview.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vbuttonbox.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-viewport.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vpaned.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vruler.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vscale.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vscrollbar.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-vseparator.png
+share/glade3/pixmaps/hicolor/22x22/actions/widget-gtk-window.png
 share/glade3/pixmaps/plus.png
 share/glade3/pixmaps/selector.png
-share/gtk-doc/html/gladeui/GladeApp.html
-share/gtk-doc/html/gladeui/GladeClipboard.html
-share/gtk-doc/html/gladeui/GladeClipboardView.html
-share/gtk-doc/html/gladeui/GladeEditor.html
-share/gtk-doc/html/gladeui/GladeEditorProperty.html
-share/gtk-doc/html/gladeui/GladeFixed.html
-share/gtk-doc/html/gladeui/GladePalette.html
-share/gtk-doc/html/gladeui/GladePlaceholder.html
-share/gtk-doc/html/gladeui/GladeProject.html
-share/gtk-doc/html/gladeui/GladeProjectView.html
-share/gtk-doc/html/gladeui/GladeProperty.html
-share/gtk-doc/html/gladeui/GladeWidget.html
-share/gtk-doc/html/gladeui/catalog.html
-share/gtk-doc/html/gladeui/catalogintro.html
-share/gtk-doc/html/gladeui/children.html
-share/gtk-doc/html/gladeui/core.html
-share/gtk-doc/html/gladeui/dockables.html
-share/gtk-doc/html/gladeui/gladeui-GladeCommand.html
-share/gtk-doc/html/gladeui/gladeui-GladePropertyClass.html
-share/gtk-doc/html/gladeui/gladeui-GladeWidgetClass.html
-share/gtk-doc/html/gladeui/gladeui-glade-base-editor.html
-share/gtk-doc/html/gladeui/gladeui-glade-parameter.html
-share/gtk-doc/html/gladeui/gladeui-glade-signal-editor.html
-share/gtk-doc/html/gladeui/gladeui-glade-utils.html
-share/gtk-doc/html/gladeui/gladeui.devhelp
-share/gtk-doc/html/gladeui/gladeui.devhelp2
-share/gtk-doc/html/gladeui/home.png
-share/gtk-doc/html/gladeui/index.html
-share/gtk-doc/html/gladeui/index.sgml
-share/gtk-doc/html/gladeui/ix01.html
-share/gtk-doc/html/gladeui/left.png
-share/gtk-doc/html/gladeui/misc.html
-share/gtk-doc/html/gladeui/properties.html
-share/gtk-doc/html/gladeui/right.png
-share/gtk-doc/html/gladeui/style.css
-share/gtk-doc/html/gladeui/up.png
-share/gtk-doc/html/gladeui/widgetclasses.html
 share/icons/hicolor/16x16/apps/glade-3.png
 share/icons/hicolor/22x22/apps/glade-3.png
 share/icons/hicolor/24x24/apps/glade-3.png
@@ -271,14 +288,17 @@ share/icons/hicolor/scalable/apps/glade-3.svg
 share/locale/ar/LC_MESSAGES/glade3.mo
 share/locale/az/LC_MESSAGES/glade3.mo
 share/locale/bg/LC_MESSAGES/glade3.mo
+share/locale/bn/LC_MESSAGES/glade3.mo
+share/locale/bn_IN/LC_MESSAGES/glade3.mo
 share/locale/ca/LC_MESSAGES/glade3.mo
 share/locale/da/LC_MESSAGES/glade3.mo
 share/locale/de/LC_MESSAGES/glade3.mo
-share/locale/dz/LC_MESSAGES/glade3.mo
 share/locale/el/LC_MESSAGES/glade3.mo
 share/locale/en_CA/LC_MESSAGES/glade3.mo
 share/locale/en_GB/LC_MESSAGES/glade3.mo
 share/locale/es/LC_MESSAGES/glade3.mo
+share/locale/et/LC_MESSAGES/glade3.mo
+share/locale/fi/LC_MESSAGES/glade3.mo
 share/locale/fr/LC_MESSAGES/glade3.mo
 share/locale/gl/LC_MESSAGES/glade3.mo
 share/locale/hu/LC_MESSAGES/glade3.mo
@@ -291,15 +311,20 @@ share/locale/ml/LC_MESSAGES/glade3.mo
 share/locale/ms/LC_MESSAGES/glade3.mo
 share/locale/nb/LC_MESSAGES/glade3.mo
 share/locale/nn/LC_MESSAGES/glade3.mo
+share/locale/oc/LC_MESSAGES/glade3.mo
+share/locale/or/LC_MESSAGES/glade3.mo
 share/locale/pa/LC_MESSAGES/glade3.mo
 share/locale/pl/LC_MESSAGES/glade3.mo
 share/locale/pt/LC_MESSAGES/glade3.mo
 share/locale/pt_BR/LC_MESSAGES/glade3.mo
 share/locale/ru/LC_MESSAGES/glade3.mo
+share/locale/si/LC_MESSAGES/glade3.mo
 share/locale/sk/LC_MESSAGES/glade3.mo
+share/locale/sl/LC_MESSAGES/glade3.mo
 share/locale/sq/LC_MESSAGES/glade3.mo
 share/locale/sv/LC_MESSAGES/glade3.mo
 share/locale/ta/LC_MESSAGES/glade3.mo
+share/locale/te/LC_MESSAGES/glade3.mo
 share/locale/th/LC_MESSAGES/glade3.mo
 share/locale/tr/LC_MESSAGES/glade3.mo
 share/locale/uk/LC_MESSAGES/glade3.mo
@@ -314,9 +339,11 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
 @comment in hicolor-icon-theme: @dirrm share/icons/hicolor
-@dirrm share/gtk-doc/html/gladeui
-@dirrm share/glade3/pixmaps/22x22
-@dirrm share/glade3/pixmaps/16x16
+@dirrm share/glade3/pixmaps/hicolor/22x22/actions
+@dirrm share/glade3/pixmaps/hicolor/22x22
+@dirrm share/glade3/pixmaps/hicolor/16x16/actions
+@dirrm share/glade3/pixmaps/hicolor/16x16
+@dirrm share/glade3/pixmaps/hicolor
 @dirrm share/glade3/pixmaps
 @dirrm share/glade3/catalogs
 @dirrm share/glade3
diff --git a/devel/glade3/buildlink3.mk b/devel/glade3/buildlink3.mk
new file mode 100644
index 00000000000..b1b64563dd7
--- /dev/null
+++ b/devel/glade3/buildlink3.mk
@@ -0,0 +1,22 @@
+# $NetBSD: buildlink3.mk,v 1.1 2007/12/16 14:03:00 drochner Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GLADE3_BUILDLINK3_MK:=	${GLADE3_BUILDLINK3_MK}+
+
+.if ${BUILDLINK_DEPTH} == "+"
+BUILDLINK_DEPENDS+=	glade3
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nglade3}
+BUILDLINK_PACKAGES+=	glade3
+BUILDLINK_ORDER:=	${BUILDLINK_ORDER} ${BUILDLINK_DEPTH}glade3
+
+.if ${GLADE3_BUILDLINK3_MK} == "+"
+BUILDLINK_API_DEPENDS.glade3+=	glade3>=3.4.0
+BUILDLINK_PKGSRCDIR.glade3?=	../../devel/glade3
+.endif	# GLADE3_BUILDLINK3_MK
+
+.include "../../x11/gtk2/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index 3b18198ce6a..c1363aa79c1 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/07/17 19:12:02 drochner Exp $
+$NetBSD: distinfo,v 1.2 2007/12/16 14:03:00 drochner Exp $
 
-SHA1 (glade3-3.2.2.tar.bz2) = d32d38dbb475d6c35c564c4e5dcb3df3ce075916
-RMD160 (glade3-3.2.2.tar.bz2) = 6953c52ab921e6d0727e428796095fe9b84a0873
-Size (glade3-3.2.2.tar.bz2) = 1429808 bytes
+SHA1 (glade3-3.4.0.tar.bz2) = 79710d932db8fdd19a5aff21727af14059d16763
+RMD160 (glade3-3.4.0.tar.bz2) = 2f703f14f46f5a35c8d39f899e87d7a3d83093cf
+Size (glade3-3.4.0.tar.bz2) = 1493286 bytes