Update to 2.3.6:

libglade-2.3.6: 10-March-2004
- Implement support GtkComboBoxEntry, GtkToolItem, GtkToolButton,
  GtkToggleToolButton, GtkRadioToolButton & GtkSeparatorToolItem (Damon
  Chaplin)
- Fix automake warning (Steve Chaplin)
- Add libglade version number to the docs (Matthias Clasen)
- Fix usage of C++ keyword as an argument name (Bas Driessen)
- Allow additional signal parameter for glademm (Christof Petig)
- Support tooltips in toolbars (Michael Voigt)

libglade-2.3.2: 15-January-2004
- Support disambiguating msgids by prefixing them with a context
  string. (Christian Stimming, Matthias Clasen)

libglade-2.3.1:  14-November-2003
- Register GtkColorButton, GtkComboBox, GtkFileChooser and
  GtkFontButton types (Jonathan Blandford)
- Implemement support for GtkExpander (Mark McLoughlin)
- Fix memory leak and incorrect colour map usage (Morten Welinder)
- Win32 build support (Tor Lillqvist, Masahiro Sakai)
- Build fixes (James Henstridge, Michael Meeks)

7 files changed, 31 insertions, 50 deletions

diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index e1bfc6bc6c7..2b3f8ae5058 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,11 +1,10 @@
-# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:38 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/01 18:16:46 jmmv Exp $
 #
 
-DISTNAME=		libglade-2.0.1
+DISTNAME=		libglade-2.3.6
 PKGNAME=		${DISTNAME:S/libglade/libglade2/}
-PKGREVISION=		14
 CATEGORIES=		devel gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.0/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.3/}
 
 MAINTAINER=		jmmv@NetBSD.org
 HOMEPAGE=		http://www.daa.com.au/~james/gnome/
@@ -14,13 +13,14 @@ COMMENT=		Runtime interpreter for GLADE GUI files (v2)
 BUILD_USES_MSGFMT=	YES
 
 USE_BUILDLINK3=		YES
+USE_GNU_TOOLS+=		make
 USE_X11=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libglade-2.0.pc.in
 
 CONFIGURE_ENV+=		jh_cv_path_python="${PYTHONBIN}"
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc/html"
 
 XML_ENTRIES=	system http://glade.gnome.org/glade-2.0.dtd \
 		${PREFIX}/share/xml/libglade/glade-2.0.dtd
diff --git a/devel/libglade2/PLIST b/devel/libglade2/PLIST
index 21ba1f16ee9..91fb1e37d0b 100644
--- a/devel/libglade2/PLIST
+++ b/devel/libglade2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2003/01/29 20:28:31 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/04/01 18:16:46 jmmv Exp $
 bin/libglade-convert
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
@@ -9,23 +9,31 @@ lib/libglade-2.0.a
 lib/libglade-2.0.la
 lib/libglade-2.0.so
 lib/libglade-2.0.so.0
-lib/libglade-2.0.so.0.1
+lib/libglade-2.0.so.0.3
 lib/pkgconfig/libglade-2.0.pc
-share/doc/html/libglade/gladexml.html
+share/doc/html/libglade/GladeXML.html
+share/doc/html/libglade/home.png
+share/doc/html/libglade/index.html
+share/doc/html/libglade/index.sgml
+share/doc/html/libglade/left.png
+share/doc/html/libglade/libglade-Libglade-Build.html
+share/doc/html/libglade/libglade-Libglade-Initialisation.html
+share/doc/html/libglade/libglade-Libglade-SAX-Parser.html
 share/doc/html/libglade/libglade-dtd-exceptions.html
 share/doc/html/libglade/libglade-dtd.html
 share/doc/html/libglade/libglade-embedding.html
 share/doc/html/libglade/libglade-extending.html
 share/doc/html/libglade/libglade-i18n.html
 share/doc/html/libglade/libglade-lib.html
-share/doc/html/libglade/libglade-libglade-build.html
-share/doc/html/libglade/libglade-libglade-initialisation.html
-share/doc/html/libglade/libglade-libglade-sax-parser.html
 share/doc/html/libglade/libglade-modules.html
 share/doc/html/libglade/libglade-notes.html
-share/doc/html/libglade/libglade.html
+share/doc/html/libglade/libglade.devhelp
+share/doc/html/libglade/right.png
+share/doc/html/libglade/up.png
+@comment in xmlcatmgr: share/xml/catalog
 share/xml/libglade/glade-2.0.dtd
 @dirrm share/xml/libglade
+@comment in xmlcatmgr: @dirrm share/xml
 @dirrm share/doc/html/libglade
 @exec ${MKDIR} %D/lib/libglade/2.0
 @dirrm lib/libglade/2.0
diff --git a/devel/libglade2/buildlink2.mk b/devel/libglade2/buildlink2.mk
index f3721c9ef29..9134189f01f 100644
--- a/devel/libglade2/buildlink2.mk
+++ b/devel/libglade2/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.9 2004/01/03 18:49:38 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.10 2004/04/01 18:16:46 jmmv Exp $
 
 .if !defined(LIBGLADE2_BUILDLINK2_MK)
 LIBGLADE2_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libglade2
-BUILDLINK_DEPENDS.libglade2?=	libglade2>=2.0.1nb13
+BUILDLINK_DEPENDS.libglade2?=	libglade2>=2.3.6
 BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libglade2=libglade2
@@ -12,11 +12,6 @@ BUILDLINK_PREFIX.libglade2_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libglade2=	include/libglade-2.0/glade/*
 BUILDLINK_FILES.libglade2+=	lib/libglade-2.0.*
 
-BUILDLINK_CPPFLAGS.libglade2= \
-	-I${BUILDLINK_PREFIX.libglade2}/include/libglade-2.0
-
-CPPFLAGS+=	${BUILDLINK_CPPFLAGS.libglade2}
-
 .include "../../textproc/libxml2/buildlink2.mk"
 .include "../../x11/gtk2/buildlink2.mk"
 
diff --git a/devel/libglade2/buildlink3.mk b/devel/libglade2/buildlink3.mk
index 6c618350adb..288363b5d53 100644
--- a/devel/libglade2/buildlink3.mk
+++ b/devel/libglade2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:10 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:16:46 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGLADE2_BUILDLINK3_MK:=	${LIBGLADE2_BUILDLINK3_MK}+
@@ -11,9 +11,8 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibglade2}
 BUILDLINK_PACKAGES+=	libglade2
 
 .if !empty(LIBGLADE2_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.0.1nb13
+BUILDLINK_DEPENDS.libglade2+=	libglade2>=2.3.6
 BUILDLINK_PKGSRCDIR.libglade2?=	../../devel/libglade2
-BUILDLINK_INCDIRS.libglade2?=	include/libglade-2.0
 .endif	# LIBGLADE2_BUILDLINK3_MK
 
 .include "../../textproc/libxml2/buildlink3.mk"
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index b1d01292c6f..daeac82f448 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.4 2003/01/10 19:36:02 jmmv Exp $
+$NetBSD: distinfo,v 1.5 2004/04/01 18:16:46 jmmv Exp $
 
-SHA1 (libglade-2.0.1.tar.gz) = 15197752962c8b12efd4a2832d78c3577d11ffea
-Size (libglade-2.0.1.tar.gz) = 354841 bytes
-SHA1 (patch-aa) = 2aee085383d9f712fd75ea34fc033be53ea4484a
-SHA1 (patch-ab) = 2f911c8763e936ae5ed9f0f5326064136540cfcc
+SHA1 (libglade-2.3.6.tar.gz) = 7f42a3202611f9343644adc2272757ea37332264
+Size (libglade-2.3.6.tar.gz) = 465623 bytes
+SHA1 (patch-ab) = e77f94b51082aad4150b616b3b934125b658a692
diff --git a/devel/libglade2/patches/patch-aa b/devel/libglade2/patches/patch-aa
deleted file mode 100644
index 8fa00473971..00000000000
--- a/devel/libglade2/patches/patch-aa
+++ /dev/null
@@ -1,22 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2003/01/05 11:54:44 jmmv Exp $
-
---- doc/Makefile.in.orig	Thu Aug 29 14:53:59 2002
-+++ doc/Makefile.in
-@@ -115,7 +115,7 @@ DOC_MAIN_SGML_FILE = libglade-docs.sgml
- # The directory containing the source code (if it contains documentation).
- DOC_SOURCE_DIR = ../glade
- 
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(datadir)/doc/html
- 
- TARGET_DIR = $(HTML_DIR)/$(DOC_MODULE)
- 
-@@ -342,8 +342,6 @@ install-data-local: 
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(TARGET_DIR); \
- 	  echo '-- Fixing Crossreferences' ; \
- 	  gtkdoc-fixxref --module=$(DOC_MODULE) --html-dir=$(HTML_DIR) || true; \
- 	fi)
diff --git a/devel/libglade2/patches/patch-ab b/devel/libglade2/patches/patch-ab
index eae298bbec1..8824cc040bf 100644
--- a/devel/libglade2/patches/patch-ab
+++ b/devel/libglade2/patches/patch-ab
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.1 2003/01/10 19:36:03 jmmv Exp $
+$NetBSD: patch-ab,v 1.2 2004/04/01 18:16:46 jmmv Exp $
+
+http://bugzilla.gnome.org/show_bug.cgi?id=134231
 
 --- Makefile.in.orig	Thu Aug 29 14:53:59 2002
 +++ Makefile.in