From 68176f85d589f4ea1c812b5068b235bfb40fee3b Mon Sep 17 00:00:00 2001
From: jmmv <jmmv>
Date: Tue, 28 Dec 2004 21:41:45 +0000
Subject: Update to 2.4.1: - Register GtkFileChooserDialog correctly. - Fix a
 number of bugs in the libglade-convert utility. - Fix some memory leaks in
 the XML parsing code. - Handle tooltips on GtkToolItems properly, and get rid
 of uses of   the old toolbar API. - Fix some bugs in setting up ATK
 relations. - Various other bug fixes (see ChangeLog).

---
 devel/libglade2/Makefile         |  6 +++---
 devel/libglade2/PLIST            |  3 +--
 devel/libglade2/distinfo         |  7 +++----
 devel/libglade2/patches/patch-ab | 14 --------------
 4 files changed, 7 insertions(+), 23 deletions(-)
 delete mode 100644 devel/libglade2/patches/patch-ab

diff --git a/devel/libglade2/Makefile b/devel/libglade2/Makefile
index ce1341e74cb..352c60b76fb 100644
--- a/devel/libglade2/Makefile
+++ b/devel/libglade2/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.29 2004/12/24 08:04:26 reed Exp $
+# $NetBSD: Makefile,v 1.30 2004/12/28 21:41:45 jmmv Exp $
 #
 
-DISTNAME=		libglade-2.4.0
+DISTNAME=		libglade-2.4.1
 PKGNAME=		${DISTNAME:S/libglade/libglade2/}
-PKGREVISION=		2
 CATEGORIES=		devel gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libglade/2.4/}
 EXTRACT_SUFX=		.tar.bz2
@@ -23,6 +22,7 @@ PKGCONFIG_OVERRIDE=	libglade-2.0.pc.in
 
 CONFIGURE_ENV+=		jh_cv_path_python="${PYTHONBIN}"
 CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc/html"
+CONFIGURE_ARGS+=	--without-xml-catalog
 
 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 fa4ce863fc9..05fc6859c20 100644
--- a/devel/libglade2/PLIST
+++ b/devel/libglade2/PLIST
@@ -1,5 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2004/09/22 08:09:26 jlam Exp $
-bin/libglade-convert
+@comment $NetBSD: PLIST,v 1.13 2004/12/28 21:41:45 jmmv Exp $
 include/libglade-2.0/glade/glade-build.h
 include/libglade-2.0/glade/glade-init.h
 include/libglade-2.0/glade/glade-parser.h
diff --git a/devel/libglade2/distinfo b/devel/libglade2/distinfo
index 02c3782da81..77e3029c93f 100644
--- a/devel/libglade2/distinfo
+++ b/devel/libglade2/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.6 2004/09/02 12:14:29 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/12/28 21:41:45 jmmv Exp $
 
-SHA1 (libglade-2.4.0.tar.bz2) = 95428bec28bb6929f673d061df804babbe56f90f
-Size (libglade-2.4.0.tar.bz2) = 310334 bytes
-SHA1 (patch-ab) = e77f94b51082aad4150b616b3b934125b658a692
+SHA1 (libglade-2.4.1.tar.bz2) = 1c12cb75d726c0902e8ac553c0a24743b4ecfde0
+Size (libglade-2.4.1.tar.bz2) = 317285 bytes
diff --git a/devel/libglade2/patches/patch-ab b/devel/libglade2/patches/patch-ab
deleted file mode 100644
index 8824cc040bf..00000000000
--- a/devel/libglade2/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$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
-@@ -636,7 +636,6 @@ uninstall-info: uninstall-info-recursive
- 
- 
- install-data-local:
--	-xmlcatalog --noout --add "system" "http://glade.gnome.org/glade-2.0.dtd" $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
- uninstall-local:
- 	-xmlcatalog --noout --del $(xmldir)/glade-2.0.dtd $(XMLCATALOG)
- 
-- 
cgit v1.2.3