Update to 2.6.0:

Glade 2.6.0	(Apr 14 2004)
===========

 o Fixed trivial compilation problem in plain GTK+ version.
 o Fixed bug freeing unallocated memory on Win32.
 o Updated links to related software in README.

Glade 2.5.1	(Mar 29 2004)
===========

 o Fixed bug migrating old toolbar widgets which meant that widgets other
   than the normal/toggle/radio buttons were being lost when loading.
 o Use the new GtkFileChooseDialog throughout Glade.
 o Load the gail-gnome module as well as gail.
 o If there is no .gladep file check the <requires> tags to see if it is
   a GNOME or GTK+ project. Previously it would assume its a GNOME project.
 o Set up GtkFrame according to the HIG.
 o A few other minor fixes.

Glade 2.5.0	(Mar 17 2004)
===========

 o Added support for new widgets in GTK+ 2.4 - GtkExpander, GtkFontButton,
   GtkColorButton, GtkComboBox, GtkComboBoxEntry, GtkToolItem, GtkToolButton,
   GtkToggleToolButton, GtkRadioToolButton, GtkSeparatorToolItem,
   GtkFileChooserWidget, GtkFileChooserDialog.
 o Added support for a number of new properties of existing widgets.
 o New user manual (Pat Costello).
 o Removed Turbo Start Guide.
 o Updated FAQ to use sect1/sect2 elements so it is displayed OK in yelp.

3 files changed, 14 insertions, 11 deletions

diff --git a/devel/glade2/Makefile b/devel/glade2/Makefile
index c6c5ba45032..d1bb962a2fa 100644
--- a/devel/glade2/Makefile
+++ b/devel/glade2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.29 2004/04/14 16:15:21 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/20 16:40:55 jmmv Exp $
 #
 
-DISTNAME=		glade-2.0.1
+DISTNAME=		glade-2.6.0
 PKGNAME=		${DISTNAME:S/-/2-/}
-PKGREVISION=		8
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade/2.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/glade/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		sab@posix.org.uk
@@ -16,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_BUILDLINK3=		YES
-USE_DIRS+=		xdg-1.1
+USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	YES
 USE_GNU_TOOLS+=		make
 USE_X11=		YES
diff --git a/devel/glade2/PLIST b/devel/glade2/PLIST
index 7941b45bf23..310ba476294 100644
--- a/devel/glade2/PLIST
+++ b/devel/glade2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/12/14 22:53:59 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.4 2004/04/20 16:40:55 jmmv Exp $
 bin/glade-2
 share/applications/glade-2.desktop
 share/glade-2/gtk/autogen.sh
@@ -19,7 +19,6 @@ share/gnome/help/glade-2/C/figures/window-palette-add.png
 share/gnome/help/glade-2/C/figures/window-palette-basic.png
 share/gnome/help/glade-2/C/figures/window-palette-gnome.png
 share/gnome/help/glade-2/C/glade-faq.xml
-share/gnome/help/glade-2/C/glade-turbo-start.xml
 share/gnome/help/glade-2/C/glade-user-guide.xml
 share/gnome/help/glade-2/C/legal.xml
 share/gnome/help/glade-2/ro/glade-faq.xml
@@ -32,11 +31,13 @@ ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/glade-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/glade-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/glade-2.0.mo
@@ -64,17 +65,20 @@ ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/glade-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/glade-2.0.mo
 share/omf/glade-2/glade-faq-C.omf
 share/omf/glade-2/glade-faq-ro.omf
-share/omf/glade-2/glade-turbo-start-C.omf
 share/omf/glade-2/glade-user-guide-C.omf
 share/pixmaps/glade-2.png
 share/pixmaps/glade-2/glade_logo.png
 @dirrm share/pixmaps/glade-2
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/omf/glade-2
+@comment in scrollkeeper: @dirrm share/omf
 @exec ${MKDIR} %D/share/gnome/help/glade-2/ro/figures
 @dirrm share/gnome/help/glade-2/ro/figures
 @dirrm share/gnome/help/glade-2/ro
 @dirrm share/gnome/help/glade-2/C/figures
 @dirrm share/gnome/help/glade-2/C
 @dirrm share/gnome/help/glade-2
+@comment in gnome2-dirs: @dirrm share/gnome/help
 @dirrm share/glade-2/gtk
 @dirrm share/glade-2
+@comment in xdg-dirs: @dirrm share/applications
diff --git a/devel/glade2/distinfo b/devel/glade2/distinfo
index 3963268b495..97e19bc042c 100644
--- a/devel/glade2/distinfo
+++ b/devel/glade2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2003/12/14 22:53:59 xtraeme Exp $
+$NetBSD: distinfo,v 1.4 2004/04/20 16:40:55 jmmv Exp $
 
-SHA1 (glade-2.0.1.tar.bz2) = 5b0819e386f181a04ff541e12a7848d9340120e3
-Size (glade-2.0.1.tar.bz2) = 1912213 bytes
+SHA1 (glade-2.6.0.tar.bz2) = e2fad9dbca2efe6ae6a44c12d292179498400e55
+Size (glade-2.6.0.tar.bz2) = 2145674 bytes