-Update to 3.1.5.

-Remove check on FreeBSD 4.x.

The path of include, shared library version and .pc file have been changed.

	-include/libgladeui-1.0/libgladeui/
	+include/libgladeui-1.0/gladeui/

	-lib/libgladeui-1.so.4
	+lib/libgladeui-1.so.5, ltverhack makes no difference.

	-libdata/pkgconfig/libgladeui-1.0.pc
	+libdata/pkgconfig/gladeui-1.0.pc

If anyone find any of port that depend on glade3, let me know and I shall bump
these port(s). So far, I only find devel/gnome2-hacker-tools and no bump need.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@8368 df743ca5-7f9a-e211-a948-0013205c9059

3 files changed, 92 insertions, 94 deletions

diff --git a/devel/glade3/Makefile b/devel/glade3/Makefile
index d005ede0c..e22a79c8c 100644
--- a/devel/glade3/Makefile
+++ b/devel/glade3/Makefile
@@ -3,11 +3,11 @@
 # Whom:			Koop Mast <kwm@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glade3/Makefile,v 1.25 2006/12/19 13:45:41 ahze Exp $
+#   $MCom: ports/devel/glade3/Makefile,v 1.26 2007/02/02 18:57:01 mezz Exp $
 #
 
 PORTNAME=	glade3
-PORTVERSION=	3.1.4
+PORTVERSION=	3.1.5
 CATEGORIES=	devel gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -20,22 +20,18 @@ INSTALLS_ICONS=	yes
 USE_XLIB=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnometarget gtk20 libxml2 gnomeprefix gnomehack
+USE_GNOME=	gnometarget gtk20 libxml2 gnomeprefix gnomehack \
+		gnome-doc-utils desktopfileutils
 WANT_GNOME=	yes
 USE_GETTEXT=	yes
+INSTALLS_OMF=	yes
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \
 		LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib"
 
-DOCSDIR=	share/doc/gladeui
-
 .include <bsd.port.pre.mk>
 
-.if ${OSVERSION} < 500000
-IGNORE=	does not build on 4.X
-.endif
-
 .if ${HAVE_GNOME:Mlibgnomeui}!=""
 USE_GNOME+=	libgnomeui
 CONFIGURE_ARGS+=--enable-gnome
@@ -56,5 +52,6 @@ PLIST_SUB+=	PYTHON:="@comment "
 
 post-install:
 	${MKDIR} ${PREFIX}/lib/glade3/bindings
+	@-update-desktop-database
 
 .include <bsd.port.post.mk>
diff --git a/devel/glade3/distinfo b/devel/glade3/distinfo
index 643f2ff7e..04cae1cbc 100644
--- a/devel/glade3/distinfo
+++ b/devel/glade3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glade3-3.1.4.tar.bz2) = 752fb25b6429b1ed9d9556f7bc4f6752
-SHA256 (gnome2/glade3-3.1.4.tar.bz2) = d01ac9fd53c5e28402d8e62fbe2cced48660a11fb2cc57c4d0493b8a3cc99adc
-SIZE (gnome2/glade3-3.1.4.tar.bz2) = 941004
+MD5 (gnome2/glade3-3.1.5.tar.bz2) = 0ba2a06a007a7a54235b5c7f64714b58
+SHA256 (gnome2/glade3-3.1.5.tar.bz2) = b9cf8775eb063f3bdf40e36d7a677aa996096db5695a20a66f574c8eee685bdd
+SIZE (gnome2/glade3-3.1.5.tar.bz2) = 1072770
diff --git a/devel/glade3/pkg-plist b/devel/glade3/pkg-plist
index d74e0bccb..b0a05b3ec 100644
--- a/devel/glade3/pkg-plist
+++ b/devel/glade3/pkg-plist
@@ -1,45 +1,44 @@
 bin/glade-3
-include/libgladeui-1.0/libgladeui/atk.xpm
-include/libgladeui-1.0/libgladeui/fixed_bg.xpm
-include/libgladeui-1.0/libgladeui/glade-accumulators.h
-include/libgladeui-1.0/libgladeui/glade-app.h
-include/libgladeui-1.0/libgladeui/glade-base-editor.h
-include/libgladeui-1.0/libgladeui/glade-binding.h
-include/libgladeui-1.0/libgladeui/glade-builtins.h
-include/libgladeui-1.0/libgladeui/glade-catalog.h
-include/libgladeui-1.0/libgladeui/glade-clipboard-view.h
-include/libgladeui-1.0/libgladeui/glade-clipboard.h
-include/libgladeui-1.0/libgladeui/glade-command.h
-include/libgladeui-1.0/libgladeui/glade-cursor.h
-include/libgladeui-1.0/libgladeui/glade-custom.h
-include/libgladeui-1.0/libgladeui/glade-debug.h
-include/libgladeui-1.0/libgladeui/glade-design-layout.h
-include/libgladeui-1.0/libgladeui/glade-design-view.h
-include/libgladeui-1.0/libgladeui/glade-editor-property.h
-include/libgladeui-1.0/libgladeui/glade-editor.h
-include/libgladeui-1.0/libgladeui/glade-fixed.h
-include/libgladeui-1.0/libgladeui/glade-gtk.h
-include/libgladeui-1.0/libgladeui/glade-id-allocator.h
-include/libgladeui-1.0/libgladeui/glade-marshallers.h
-include/libgladeui-1.0/libgladeui/glade-palette-box.h
-include/libgladeui-1.0/libgladeui/glade-palette-expander.h
-include/libgladeui-1.0/libgladeui/glade-palette-item.h
-include/libgladeui-1.0/libgladeui/glade-palette.h
-include/libgladeui-1.0/libgladeui/glade-parameter.h
-include/libgladeui-1.0/libgladeui/glade-parser.h
-include/libgladeui-1.0/libgladeui/glade-placeholder.h
-include/libgladeui-1.0/libgladeui/glade-popup.h
-include/libgladeui-1.0/libgladeui/glade-project-view.h
-include/libgladeui-1.0/libgladeui/glade-project.h
-include/libgladeui-1.0/libgladeui/glade-property-class.h
-include/libgladeui-1.0/libgladeui/glade-property.h
-include/libgladeui-1.0/libgladeui/glade-signal-editor.h
-include/libgladeui-1.0/libgladeui/glade-signal.h
-include/libgladeui-1.0/libgladeui/glade-utils.h
-include/libgladeui-1.0/libgladeui/glade-widget-adaptor.h
-include/libgladeui-1.0/libgladeui/glade-widget.h
-include/libgladeui-1.0/libgladeui/glade-xml-utils.h
-include/libgladeui-1.0/libgladeui/glade.h
+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
+include/libgladeui-1.0/gladeui/glade-cursor.h
+include/libgladeui-1.0/gladeui/glade-custom.h
+include/libgladeui-1.0/gladeui/glade-debug.h
+include/libgladeui-1.0/gladeui/glade-design-layout.h
+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-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-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
 %%PYTHON:%%lib/glade3/bindings/libgladepython.la
 %%PYTHON:%%lib/glade3/bindings/libgladepython.so
 %%GNOME:%%lib/glade3/modules/libgladegnome.la
@@ -48,45 +47,8 @@ lib/glade3/modules/libgladegtk.la
 lib/glade3/modules/libgladegtk.so
 lib/libgladeui-1.la
 lib/libgladeui-1.so
-lib/libgladeui-1.so.4
-libdata/pkgconfig/libgladeui-1.0.pc
-%%DOCSDIR%%/GladeApp.html
-%%DOCSDIR%%/GladeClipboard.html
-%%DOCSDIR%%/GladeClipboardView.html
-%%DOCSDIR%%/GladeEditor.html
-%%DOCSDIR%%/GladeEditorProperty.html
-%%DOCSDIR%%/GladeFixed.html
-%%DOCSDIR%%/GladePalette.html
-%%DOCSDIR%%/GladePlaceholder.html
-%%DOCSDIR%%/GladeProject.html
-%%DOCSDIR%%/GladeProjectView.html
-%%DOCSDIR%%/GladeProperty.html
-%%DOCSDIR%%/GladeWidget.html
-%%DOCSDIR%%/catalog.html
-%%DOCSDIR%%/catalogintro.html
-%%DOCSDIR%%/children.html
-%%DOCSDIR%%/core.html
-%%DOCSDIR%%/dockables.html
-%%DOCSDIR%%/gladeui-GladeCommand.html
-%%DOCSDIR%%/gladeui-GladePropertyClass.html
-%%DOCSDIR%%/gladeui-GladeWidgetClass.html
-%%DOCSDIR%%/gladeui-glade-base-editor.html
-%%DOCSDIR%%/gladeui-glade-parameter.html
-%%DOCSDIR%%/gladeui-glade-signal-editor.html
-%%DOCSDIR%%/gladeui-glade-utils.html
-%%DOCSDIR%%/gladeui.devhelp
-%%DOCSDIR%%/gladeui.devhelp2
-%%DOCSDIR%%/home.png
-%%DOCSDIR%%/index.html
-%%DOCSDIR%%/index.sgml
-%%DOCSDIR%%/ix01.html
-%%DOCSDIR%%/left.png
-%%DOCSDIR%%/misc.html
-%%DOCSDIR%%/properties.html
-%%DOCSDIR%%/right.png
-%%DOCSDIR%%/style.css
-%%DOCSDIR%%/up.png
-%%DOCSDIR%%/widgetclasses.html
+lib/libgladeui-1.so.5
+libdata/pkgconfig/gladeui-1.0.pc
 share/gnome/applications/glade-3.desktop
 %%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml
 %%GNOME:%%share/gnome/glade3/catalogs/bonobo.xml.in
@@ -101,6 +63,7 @@ share/gnome/glade3/pixmaps/16x16/accellabel.png
 share/gnome/glade3/pixmaps/16x16/alignment.png
 share/gnome/glade3/pixmaps/16x16/arrow.png
 share/gnome/glade3/pixmaps/16x16/aspectframe.png
+share/gnome/glade3/pixmaps/16x16/assistant.png
 %%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodock.png
 %%GNOME:%%share/gnome/glade3/pixmaps/16x16/bonobodockitem.png
 share/gnome/glade3/pixmaps/16x16/button.png
@@ -165,6 +128,7 @@ share/gnome/glade3/pixmaps/16x16/imagemenuitem.png
 share/gnome/glade3/pixmaps/16x16/inputdialog.png
 share/gnome/glade3/pixmaps/16x16/label.png
 share/gnome/glade3/pixmaps/16x16/layout.png
+share/gnome/glade3/pixmaps/16x16/linkbutton.png
 share/gnome/glade3/pixmaps/16x16/list.png
 share/gnome/glade3/pixmaps/16x16/listitem.png
 share/gnome/glade3/pixmaps/16x16/menu.png
@@ -174,10 +138,12 @@ share/gnome/glade3/pixmaps/16x16/menutoolbutton.png
 share/gnome/glade3/pixmaps/16x16/messagedialog.png
 share/gnome/glade3/pixmaps/16x16/notebook.png
 share/gnome/glade3/pixmaps/16x16/optionmenu.png
+share/gnome/glade3/pixmaps/16x16/pagesetupdialog.png
 share/gnome/glade3/pixmaps/16x16/progressbar.png
 share/gnome/glade3/pixmaps/16x16/radiobutton.png
 share/gnome/glade3/pixmaps/16x16/radiomenuitem.png
 share/gnome/glade3/pixmaps/16x16/radiotoolbutton.png
+share/gnome/glade3/pixmaps/16x16/recentchooser.png
 share/gnome/glade3/pixmaps/16x16/ruler.png
 share/gnome/glade3/pixmaps/16x16/scrolledwindow.png
 share/gnome/glade3/pixmaps/16x16/separatormenuitem.png
@@ -206,6 +172,7 @@ share/gnome/glade3/pixmaps/22x22/accellabel.png
 share/gnome/glade3/pixmaps/22x22/alignment.png
 share/gnome/glade3/pixmaps/22x22/arrow.png
 share/gnome/glade3/pixmaps/22x22/aspectframe.png
+share/gnome/glade3/pixmaps/22x22/assistant.png
 %%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodock.png
 %%GNOME:%%share/gnome/glade3/pixmaps/22x22/bonobodockitem.png
 share/gnome/glade3/pixmaps/22x22/button.png
@@ -270,6 +237,7 @@ share/gnome/glade3/pixmaps/22x22/imagemenuitem.png
 share/gnome/glade3/pixmaps/22x22/inputdialog.png
 share/gnome/glade3/pixmaps/22x22/label.png
 share/gnome/glade3/pixmaps/22x22/layout.png
+share/gnome/glade3/pixmaps/22x22/linkbutton.png
 share/gnome/glade3/pixmaps/22x22/list.png
 share/gnome/glade3/pixmaps/22x22/listitem.png
 share/gnome/glade3/pixmaps/22x22/menu.png
@@ -279,10 +247,12 @@ share/gnome/glade3/pixmaps/22x22/menutoolbutton.png
 share/gnome/glade3/pixmaps/22x22/messagedialog.png
 share/gnome/glade3/pixmaps/22x22/notebook.png
 share/gnome/glade3/pixmaps/22x22/optionmenu.png
+share/gnome/glade3/pixmaps/22x22/pagesetupdialog.png
 share/gnome/glade3/pixmaps/22x22/progressbar.png
 share/gnome/glade3/pixmaps/22x22/radiobutton.png
 share/gnome/glade3/pixmaps/22x22/radiomenuitem.png
 share/gnome/glade3/pixmaps/22x22/radiotoolbutton.png
+share/gnome/glade3/pixmaps/22x22/recentchooser.png
 share/gnome/glade3/pixmaps/22x22/ruler.png
 share/gnome/glade3/pixmaps/22x22/scrolledwindow.png
 share/gnome/glade3/pixmaps/22x22/separatormenuitem.png
@@ -309,20 +279,41 @@ share/gnome/glade3/pixmaps/22x22/window.png
 share/gnome/glade3/pixmaps/devhelp.png
 share/gnome/glade3/pixmaps/plus.png
 share/gnome/glade3/pixmaps/selector.png
+share/gnome/help/glade/C/figures/main-window.png
+share/gnome/help/glade/C/glade.xml
+share/gnome/help/glade/C/legal.xml
+share/gnome/help/glade/en_GB/figures/main-window.png
+share/gnome/help/glade/en_GB/glade.xml
+share/gnome/help/glade/en_GB/legal.xml
+share/gnome/help/glade/sv/figures/main-window.png
+share/gnome/help/glade/sv/glade.xml
+share/gnome/help/glade/sv/legal.xml
+share/gnome/omf/glade/glade-C.omf
+share/gnome/omf/glade/glade-en_GB.omf
+share/gnome/omf/glade/glade-sv.omf
+share/icons/hicolor/16x16/apps/glade-3.png
+share/icons/hicolor/22x22/apps/glade-3.png
+share/icons/hicolor/24x24/apps/glade-3.png
+share/icons/hicolor/32x32/apps/glade-3.png
 share/icons/hicolor/48x48/apps/glade-3.png
+share/icons/hicolor/scalable/apps/glade-3.svg
 share/locale/ar/LC_MESSAGES/glade3.mo
 share/locale/az/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/en_CA/LC_MESSAGES/glade3.mo
 share/locale/en_GB/LC_MESSAGES/glade3.mo
 share/locale/es/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
 share/locale/ja/LC_MESSAGES/glade3.mo
 share/locale/ko/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/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
@@ -330,22 +321,30 @@ share/locale/ru/LC_MESSAGES/glade3.mo
 share/locale/sk/LC_MESSAGES/glade3.mo
 share/locale/sv/LC_MESSAGES/glade3.mo
 share/locale/ta/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
 share/locale/vi/LC_MESSAGES/glade3.mo
 share/locale/zh_CN/LC_MESSAGES/glade3.mo
 share/locale/zh_HK/LC_MESSAGES/glade3.mo
 share/locale/zh_TW/LC_MESSAGES/glade3.mo
+@dirrm share/gnome/omf/glade
+@dirrm share/gnome/help/glade/sv/figures
+@dirrm share/gnome/help/glade/sv
+@dirrm share/gnome/help/glade/en_GB/figures
+@dirrm share/gnome/help/glade/en_GB
+@dirrm share/gnome/help/glade/C/figures
+@dirrm share/gnome/help/glade/C
+@dirrm share/gnome/help/glade
 @dirrm share/gnome/glade3/pixmaps/22x22
 @dirrm share/gnome/glade3/pixmaps/16x16
 @dirrm share/gnome/glade3/pixmaps
 @dirrm share/gnome/glade3/catalogs
 @dirrm share/gnome/glade3
-@dirrm %%DOCSDIR%%
 @dirrm lib/glade3/modules
 @dirrm lib/glade3/bindings
 @dirrm lib/glade3
-@dirrm include/libgladeui-1.0/libgladeui
+@dirrm include/libgladeui-1.0/gladeui
 @dirrm include/libgladeui-1.0
 @exec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
 @unexec %%LOCALBASE%%/bin/update-desktop-database > /dev/null || /usr/bin/true
@@ -369,3 +368,5 @@ share/locale/zh_TW/LC_MESSAGES/glade3.mo
 @dirrmtry share/locale/ko
 @dirrmtry share/locale/gl/LC_MESSAGES
 @dirrmtry share/locale/gl
+@dirrmtry share/locale/ca/LC_MESSAGES
+@dirrmtry share/locale/ca