Update glade3 to 3.8.5.

Update Comment.
Switch to USES=libtool instead of libtool:keepla.
Convert to Options handlers, and stop messing around with PKGNAMESUFFIX
if the gnome option is selected.

PR:		196404 (based on)
Submitted by:	Kevin Zheng <kevinz5000@gmail.com>

5 files changed, 136 insertions, 138 deletions

diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index 5d7c208dd722..05a152f598ff 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -1,23 +1,21 @@
 # Created by: Koop Mast <kwm@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/trunk/devel/glade3/Makefile 17268 2013-04-01 05:13:11Z marcus $
 
 PORTNAME=	glade3
-PORTVERSION=	3.8.3
-PORTREVISION=	3
+PORTVERSION=	3.8.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	User interface builder for GTK+/GNOME
+COMMENT=	User interface builder for Gtk+ 2
 
 CONFLICTS=	glade-3.*
 PORTSCOUT=	ignore
 
 INSTALLS_ICONS=	yes
-USE_GNOME=	gtk20 libxml2 gnomeprefix gnomedocutils
-USES=		gmake gettext libtool:keepla pathfix desktop-file-utils pkgconfig tar:xz
+USE_GNOME=	gtk20 libxml2 gnomedocutils
+USES=		gmake gettext libtool pathfix desktop-file-utils pkgconfig tar:xz
 INSTALLS_OMF=	yes
 INSTALL_TARGET=	install-strip
 USE_LDCONFIG=	yes
@@ -30,28 +28,13 @@ DOCSDIR=	${PREFIX}/share/doc/gladeui
 OPTIONS_DEFINE=	GNOME PYTHON
 OPTIONS_DEFAULT=PYTHON
 GNOME_DESC=	GNOME UI widget support
+OPTIONS_SUB=	yes
 
-.include <bsd.port.options.mk>
-
-.if ${PORT_OPTIONS:MGNOME}
-USE_GNOME+=	libgnomeui
-CONFIGURE_ARGS+=--enable-gnome
-PKGNAMESUFFIX:=	${PKGNAMESUFFIX}-gnome
-PLIST_SUB+=	GNOME:=""
-.else
-CONFIGURE_ARGS+=--disable-gnome
-PLIST_SUB+=	GNOME:="@comment "
-.endif
-
-.if ${PORT_OPTIONS:MPYTHON}
-USES+=		python
-USE_GNOME+=	pygtk2
-PLIST_SUB+=	PYTHON:=""
-CONFIGURE_ARGS+=--enable-python
-.else
-CONFIGURE_ARGS+=--disable-python
-PLIST_SUB+=	PYTHON:="@comment "
-.endif
+GNOME_CONFIGURE_ENABLE=	gnome
+GNOME_USE=	GNOME=libgnomeui
+PYTHON_CONFIGURE_ENABLE=	python
+PYTHON_USE=	GNOME=pygtk2
+PUTHON_USES=	python:2
 
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/glade3/bindings
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index ec36670e5c64..b3a5fe098174 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glade3-3.8.3.tar.xz) = 84bb2d7f782f203e4aab923e47db8d22529229b13e59570945261611c63941d6
-SIZE (gnome2/glade3-3.8.3.tar.xz) = 2306804
+SHA256 (gnome2/glade3-3.8.5.tar.xz) = 58a5f6e4df4028230ddecc74c564808b7ec4471b1925058e29304f778b6b2735
+SIZE (gnome2/glade3-3.8.5.tar.xz) = 2322076
diff --git a/devel/glade3/files/patch-configure b/devel/glade3/files/patch-configure
index f7b30f833889..947398a2bd35 100644
--- a/devel/glade3/files/patch-configure
+++ b/devel/glade3/files/patch-configure
@@ -1,6 +1,15 @@
---- configure.orig	2011-03-03 13:42:44.000000000 +0100
-+++ configure	2011-03-03 13:44:03.000000000 +0100
-@@ -14138,7 +14138,7 @@
+--- configure.orig	2014-09-19 03:53:39 UTC
++++ configure
+@@ -13652,8 +13652,6 @@
+         -Werror=implicit-function-declaration \
+         -Werror=pointer-arith \
+         -Werror=init-self \
+-        -Werror=format-security \
+-        -Werror=format=2 \
+         -Werror=missing-include-dirs \
+     "
+ 
+@@ -15530,7 +15528,7 @@
  $as_echo_n "checking for headers required to compile python extensions... " >&6; }
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
@@ -9,7 +18,7 @@
    PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
    if test "$py_prefix" != "$py_exec_prefix"; then
      PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
-@@ -14167,10 +14167,10 @@
+@@ -15559,10 +15557,10 @@
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries required to embed python" >&5
  $as_echo_n "checking for libraries required to embed python... " >&6; }
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
diff --git a/devel/glade3/pkg-descr b/devel/glade3/pkg-descr
index b74a7247cf0c..18cdc062e860 100644
--- a/devel/glade3/pkg-descr
+++ b/devel/glade3/pkg-descr
@@ -1,5 +1,8 @@
 Glade is a RAD tool to enable quick & easy development of user interfaces
-for GTK+/GNOME.  It can generate the C source code needed to create
-the interfaces designed within Glade's interface editor.
+for the GTK+ toolkit and the GNOME desktop environment. The user interfaces
+designed in Glade are saved as XML, and by using the GtkBuilder GTK+ object
+these can be loaded by applications dynamically as needed.
+
+This version of Glade targets Gtk+ 2.
 
 WWW: http://glade.gnome.org/
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index bad661731578..356e197977e1 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -42,6 +42,7 @@ 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-store-editor.h
+include/libgladeui-1.0/gladeui/glade-string-list.h
 include/libgladeui-1.0/gladeui/glade-text-button.h
 include/libgladeui-1.0/gladeui/glade-tool-button-editor.h
 include/libgladeui-1.0/gladeui/glade-tool-item-group-editor.h
@@ -52,64 +53,21 @@ 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
-%%GNOME:%%lib/glade3/modules/libgladegnome.la
-%%GNOME:%%lib/glade3/modules/libgladegnome.so
-%%PYTHON:%%lib/glade3/modules/libgladepython.la
-%%PYTHON:%%lib/glade3/modules/libgladepython.so
-lib/glade3/modules/libgladegtk.la
+%%GNOME%%lib/glade3/modules/libgladegnome.so
 lib/glade3/modules/libgladegtk.so
-lib/libgladeui-1.la
+%%PYTHON%%lib/glade3/modules/libgladepython.so
 lib/libgladeui-1.so
 lib/libgladeui-1.so.11
-lib/libgladeui-1.so.11.1.2
+lib/libgladeui-1.so.11.2.0
 libdata/pkgconfig/gladeui-1.0.pc
 share/applications/glade-3.desktop
-%%DOCSDIR%%/GladeApp.html
-%%DOCSDIR%%/GladeBaseEditor.html
-%%DOCSDIR%%/GladeClipboard.html
-%%DOCSDIR%%/GladeDesignView.html
-%%DOCSDIR%%/GladeEditorProperty.html
-%%DOCSDIR%%/GladeFixed.html
-%%DOCSDIR%%/GladeInspector.html
-%%DOCSDIR%%/GladePalette.html
-%%DOCSDIR%%/GladePlaceholder.html
-%%DOCSDIR%%/GladeProject.html
-%%DOCSDIR%%/GladeProperty.html
-%%DOCSDIR%%/GladeWidget.html
-%%DOCSDIR%%/GladeWidgetAction.html
-%%DOCSDIR%%/catalog.html
-%%DOCSDIR%%/catalogintro.html
-%%DOCSDIR%%/core.html
-%%DOCSDIR%%/dockables.html
-%%DOCSDIR%%/gladeui.devhelp2
-%%DOCSDIR%%/gladeui-Glade-Parameter.html
-%%DOCSDIR%%/gladeui-Glade-Utils.html
-%%DOCSDIR%%/gladeui-GladeClipboardView.html
-%%DOCSDIR%%/gladeui-GladeSignalEditor.html
-%%DOCSDIR%%/gladeui-GladePropertyClass.html
-%%DOCSDIR%%/gladeui-Xml-Utils.html
-%%DOCSDIR%%/gladeui-glade-command.html
-%%DOCSDIR%%/gladeui-glade-editor.html
-%%DOCSDIR%%/gladeui-glade-widget-adaptor.html
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/ix01.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/misc.html
-%%DOCSDIR%%/properties.html
-%%DOCSDIR%%/pythonsupport.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/widgetclasses.html
-%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml
-%%GNOME:%%%%DATADIR%%/catalogs/bonobo.xml.in
-%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml
-%%GNOME:%%%%DATADIR%%/catalogs/canvas.xml.in
+%%GNOME%%%%DATADIR%%/catalogs/bonobo.xml
+%%GNOME%%%%DATADIR%%/catalogs/bonobo.xml.in
+%%GNOME%%%%DATADIR%%/catalogs/canvas.xml
+%%GNOME%%%%DATADIR%%/catalogs/canvas.xml.in
 %%DATADIR%%/catalogs/glade-catalog.dtd
-%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml
-%%GNOME:%%%%DATADIR%%/catalogs/gnome.xml.in
+%%GNOME%%%%DATADIR%%/catalogs/gnome.xml
+%%GNOME%%%%DATADIR%%/catalogs/gnome.xml.in
 %%DATADIR%%/catalogs/gtk+.xml
 %%DATADIR%%/catalogs/gtk+.xml.in
 %%DATADIR%%/catalogs/gtkunixprint.xml
@@ -117,29 +75,29 @@ share/applications/glade-3.desktop
 %%DATADIR%%/pixmaps/atk.png
 %%DATADIR%%/pixmaps/devhelp.png
 %%DATADIR%%/pixmaps/drag-resize.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dock.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-bonobo-dockitem.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-about.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-app.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-appbar.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-canvas.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-colorpicker.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dateedit.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-dialog.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druid.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpageedge.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-druidpagestandard.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-entry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fileentry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-fontpicker.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-href.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconentry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconlist.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-iconselection.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-messagebox.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmap.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-pixmapentry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gnome-propertybox.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-aboutdialog.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accelgroup.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-accellabel.png
@@ -169,6 +127,7 @@ share/applications/glade-3.desktop
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combo.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-combobox.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxentry.png
+%%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-comboboxtext.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-curve.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-custom.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-default.png
@@ -266,29 +225,29 @@ share/applications/glade-3.desktop
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-vseparator.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-window.png
 %%DATADIR%%/pixmaps/hicolor/16x16/actions/widget-gtk-windowgroup.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
-%%GNOME:%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dock.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-bonobo-dockitem.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-about.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-app.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-appbar.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-canvas.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-colorpicker.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dateedit.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-dialog.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druid.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpageedge.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-druidpagestandard.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-entry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fileentry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-fontpicker.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-href.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconentry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconlist.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-iconselection.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-messagebox.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmap.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-pixmapentry.png
+%%GNOME%%%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gnome-propertybox.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-aboutdialog.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accelgroup.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-accellabel.png
@@ -318,6 +277,7 @@ share/applications/glade-3.desktop
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combo.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-combobox.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxentry.png
+%%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-comboboxtext.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-curve.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-custom.png
 %%DATADIR%%/pixmaps/hicolor/22x22/actions/widget-gtk-default.png
@@ -435,12 +395,12 @@ share/gnome/help/glade3/el/legal.xml
 share/gnome/help/glade3/en_GB/figures/main-window.png
 share/gnome/help/glade3/en_GB/glade3.xml
 share/gnome/help/glade3/en_GB/legal.xml
-share/gnome/help/glade3/eu/figures/main-window.png
-share/gnome/help/glade3/eu/glade3.xml
-share/gnome/help/glade3/eu/legal.xml
 share/gnome/help/glade3/es/figures/main-window.png
 share/gnome/help/glade3/es/glade3.xml
 share/gnome/help/glade3/es/legal.xml
+share/gnome/help/glade3/eu/figures/main-window.png
+share/gnome/help/glade3/eu/glade3.xml
+share/gnome/help/glade3/eu/legal.xml
 share/gnome/help/glade3/fr/figures/main-window.png
 share/gnome/help/glade3/fr/glade3.xml
 share/gnome/help/glade3/fr/legal.xml
@@ -474,6 +434,48 @@ share/gnome/help/glade3/uk/legal.xml
 share/gnome/help/glade3/zh_CN/figures/main-window.png
 share/gnome/help/glade3/zh_CN/glade3.xml
 share/gnome/help/glade3/zh_CN/legal.xml
+share/gtk-doc/html/gladeui/GladeApp.html
+share/gtk-doc/html/gladeui/GladeBaseEditor.html
+share/gtk-doc/html/gladeui/GladeClipboard.html
+share/gtk-doc/html/gladeui/GladeDesignView.html
+share/gtk-doc/html/gladeui/GladeEditorProperty.html
+share/gtk-doc/html/gladeui/GladeFixed.html
+share/gtk-doc/html/gladeui/GladeInspector.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/GladeProperty.html
+share/gtk-doc/html/gladeui/GladeWidget.html
+share/gtk-doc/html/gladeui/GladeWidgetAction.html
+share/gtk-doc/html/gladeui/catalog.html
+share/gtk-doc/html/gladeui/catalogintro.html
+share/gtk-doc/html/gladeui/core.html
+share/gtk-doc/html/gladeui/dockables.html
+share/gtk-doc/html/gladeui/gladeui-Glade-Parameter.html
+share/gtk-doc/html/gladeui/gladeui-Glade-Utils.html
+share/gtk-doc/html/gladeui/gladeui-GladeClipboardView.html
+share/gtk-doc/html/gladeui/gladeui-GladePropertyClass.html
+share/gtk-doc/html/gladeui/gladeui-GladeSignalEditor.html
+share/gtk-doc/html/gladeui/gladeui-Xml-Utils.html
+share/gtk-doc/html/gladeui/gladeui-glade-command.html
+share/gtk-doc/html/gladeui/gladeui-glade-editor.html
+share/gtk-doc/html/gladeui/gladeui-glade-widget-adaptor.html
+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-insensitive.png
+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/pythonsupport.html
+share/gtk-doc/html/gladeui/right-insensitive.png
+share/gtk-doc/html/gladeui/right.png
+share/gtk-doc/html/gladeui/style.css
+share/gtk-doc/html/gladeui/up-insensitive.png
+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
@@ -492,9 +494,9 @@ share/locale/cs/LC_MESSAGES/glade3.mo
 share/locale/da/LC_MESSAGES/glade3.mo
 share/locale/de/LC_MESSAGES/glade3.mo
 share/locale/el/LC_MESSAGES/glade3.mo
+share/locale/en@shaw/LC_MESSAGES/glade3.mo
 share/locale/en_CA/LC_MESSAGES/glade3.mo
 share/locale/en_GB/LC_MESSAGES/glade3.mo
-share/locale/en@shaw/LC_MESSAGES/glade3.mo
 share/locale/eo/LC_MESSAGES/glade3.mo
 share/locale/es/LC_MESSAGES/glade3.mo
 share/locale/et/LC_MESSAGES/glade3.mo
@@ -552,8 +554,8 @@ share/omf/glade3/glade3-cs.omf
 share/omf/glade3/glade3-de.omf
 share/omf/glade3/glade3-el.omf
 share/omf/glade3/glade3-en_GB.omf
-share/omf/glade3/glade3-eu.omf
 share/omf/glade3/glade3-es.omf
+share/omf/glade3/glade3-eu.omf
 share/omf/glade3/glade3-fr.omf
 share/omf/glade3/glade3-hi.omf
 share/omf/glade3/glade3-it.omf
@@ -565,3 +567,4 @@ share/omf/glade3/glade3-sl.omf
 share/omf/glade3/glade3-sv.omf
 share/omf/glade3/glade3-uk.omf
 share/omf/glade3/glade3-zh_CN.omf
+@dir lib/glade3/bindings