Updated to 2.6.0:

What's new since 2.4:

* Improvements:
	- Mass deprecation of broken widgets (Jonathan Blandford)
	- Keyring support in authentication manager (Alexander Larsson)
	- Multi-screen versions of the help and url display methods
	  (Mark McLoughlin)
	- New stock icons (Jakub Steiner)
	- Deprecate GnomeIconTheme for GtkIconTheme (Alexander Larsson)
	- Improved crash dialog (Fernando Herrera)
	- Make entries support the new file chooser (Fernando Hererra,
						     Mark McLoughlin,
						     Carlos Garnacho Parro)
	- Gnome VFS file chooser backend (Alexander Larsson,
					  Federico Mena Quintero,
					  Owen Taylor)

* Bug fixes:
	- HIG fixes for gnome-scores (Alex Duggan)
	- Translate program arguments (Hidetoshi Tajima)
	- Icon list fixes (Federico Mena Quintero, Michael Zucchi)
	- Session management fixes (Christian Persch)
	- Handle toolbar orientation in gnome-app-helper (Bryan Forbes)
	- Various bug fixes (Anders Carlsson, Joe Marcus Clarke,
		             Dennis Cranston, Fernando Herrera, Richard Hult,
			     Alexander Larsson, George Lebl, Kjartan Maraas,
			     Padraig O'Brian, Carlos Romero, Jeffrey Steadfast,
			     Balamurali Viswanathan)


* Translations:
	- Added Canadian English translation (Adam Weinberger,
					      Alexander Winston)
	- Added Croatian translation (Robert Sedak)
	- Added Marathi translation (Jitendra Shah)
	- Added Serbian Jekavian translation (Bojan Suzić)
	- Added Thai translation (Theppitak Karoonboonyanan,
				  Paisa Seeluangsawat)

	- Updated Albanian translation (Laurent Dhima)
	- Updated Arabic translation (Arafat Medini)
	- Updated Azerbaijani translation (Mətin Əmirov)
	- Updated Belarusian translation (Ales Nyakhaychyk)
	- Updated Bengali translation (Sayamindu Dasgupta)
	- Updated Brazilian Portuguese translation (Raphael Higino,
						    Augusta Margues da Silva)
	- Updated British English translation (Gareth Owen)
	- Updated Czech translation (Miloslav Trmac)
 	- Updated Danish translation (Ole Laursen)
	- Updated Dutch translation (Kess van den Broek, Reinout van Schouwen)
	- Updated Estonian translation (Priit Laes)
	- Updated Finnish translation (Pauli Virtanen)

 	- Updated French translation (Christphe Fergeau, Christophe Merlet)

	- Updated German translation (Christian Neumair)
	- Updated Greek translation (Nikos Charonitakis, Kostas Papadimas)

	- Updated Hindi translation (Guntupalli Karunakar)
	- Updated Hungarian translation (Andras Timar)
	- Updated Irish translation (Alastair McKinstry)
	- Updated Italian translation (Alesso Frusciante, Francesco Marletta)

	- Updated Korean translation (Changwoo Ryu)
	- Updated Japanese translation (Takeshi AIHANA)

	- Updated Latvian translation (Pēteris Krišjānis)
	- Updated Lithuanian translation (Žygimantas Beručka, Tomas Kuliavas)
	- Updated Malay translation (Hasbullah Bin Pit)
	- Updated Mongolian translation (Sanlig Badral)

	- Updated Norwegian translation (Kjartan Maraas)
	- Updated Norwegian Nynorsk translation (Åsmund Skjæveland)

	- Updated Polish translation (GNOME PL Team)

	- Updated Portuguese translation (Duarte Loreto)
	- Updated Romanian translation (Mişu Moldovan)
	- Updated Russian translation (Russian Team)

	- Updated Serbian translations (Danilo Šegan, Bojan Suzic)
	- Updated Simplified Chinese translation (Funda Wang)

	- Updated Slovak translation (Marcel Telka)

	- Updated Spanish translation (Francisco Javier F. Serrador)
	- Updated Swedish translation (Christian Rose)
	- Updated Tamil translation (Dinesh Nadarajah)
	- Updated Ukranian translation (Maxim Dziumanenko)

	- Updated Welsh translation (Dafydd Harries)

4 files changed, 25 insertions, 14 deletions

diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index caeeb2aebe0..aea51d8d06d 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.29 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2004/04/01 18:25:54 jmmv Exp $
 #
 
-DISTNAME=	libgnomeui-2.4.0.1
-PKGREVISION=	6
+DISTNAME=	libgnomeui-2.6.0
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -24,7 +23,6 @@ USE_PERL5=		yes
 USE_X11=		yes
 USE_LIBTOOL=		yes
 
-CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 PKGCONFIG_BASE=		${WRKSRC}/libgnomeui/libgnomeui-2.0.pc
@@ -47,4 +45,5 @@ post-configure:
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeui/PLIST b/devel/libgnomeui/PLIST
index 5a8e7060f9e..5e1392b1e4f 100644
--- a/devel/libgnomeui/PLIST
+++ b/devel/libgnomeui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2003/12/14 19:49:53 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/04/01 18:25:54 jmmv Exp $
 include/libgnomeui-2.0/gnome.h
 include/libgnomeui-2.0/libgnomeui/gnome-about.h
 include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
@@ -18,6 +18,7 @@ include/libgnomeui-2.0/libgnomeui/gnome-druid.h
 include/libgnomeui-2.0/libgnomeui/gnome-entry.h
 include/libgnomeui-2.0/libgnomeui/gnome-file-entry.h
 include/libgnomeui-2.0/libgnomeui/gnome-font-picker.h
+include/libgnomeui-2.0/libgnomeui/gnome-help.h
 include/libgnomeui-2.0/libgnomeui/gnome-href.h
 include/libgnomeui-2.0/libgnomeui/gnome-ice.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h
@@ -43,19 +44,23 @@ include/libgnomeui-2.0/libgnomeui/gnome-thumbnail.h
 include/libgnomeui-2.0/libgnomeui/gnome-types.h
 include/libgnomeui-2.0/libgnomeui/gnome-ui-init.h
 include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h
+include/libgnomeui-2.0/libgnomeui/gnome-url.h
 include/libgnomeui-2.0/libgnomeui/gnome-vfs-util.h
 include/libgnomeui-2.0/libgnomeui/gnome-window-icon.h
 include/libgnomeui-2.0/libgnomeui/gnome-window.h
 include/libgnomeui-2.0/libgnomeui/gnometypebuiltins.h
 include/libgnomeui-2.0/libgnomeui/libgnomeui.h
+lib/gtk-2.0/2.4.0/filesystems/libgnome-vfs.a
+lib/gtk-2.0/2.4.0/filesystems/libgnome-vfs.la
+lib/gtk-2.0/2.4.0/filesystems/libgnome-vfs.so
 lib/libglade/2.0/libgnome.a
 lib/libglade/2.0/libgnome.la
 lib/libglade/2.0/libgnome.so
 lib/libgnomeui-2.a
 lib/libgnomeui-2.la
 lib/libgnomeui-2.so
-lib/libgnomeui-2.so.400
-lib/libgnomeui-2.so.400.0
+lib/libgnomeui-2.so.600
+lib/libgnomeui-2.so.600.0
 lib/pkgconfig/libgnomeui-2.0.pc
 libexec/gnome_segv2
 share/doc/html/libgnomeui/GnomeAbout.html
@@ -121,6 +126,7 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
@@ -131,6 +137,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnomeui-2.0.mo
@@ -144,6 +151,7 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
@@ -158,8 +166,10 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeui-2.0.mo
@@ -173,7 +183,9 @@ share/pixmaps/gnome-error.png
 share/pixmaps/gnome-info.png
 share/pixmaps/gnome-question.png
 share/pixmaps/gnome-warning.png
+@comment in xdg-dirs: @dirrm share/pixmaps
 @dirrm share/doc/html/libgnomeui
 @comment in libglade2: @dirrm lib/libglade/2.0
+@comment in gtk2: @dirrm lib/gtk-2.0/2.2.0/filesystems
 @dirrm include/libgnomeui-2.0/libgnomeui
 @dirrm include/libgnomeui-2.0
diff --git a/devel/libgnomeui/buildlink3.mk b/devel/libgnomeui/buildlink3.mk
index 0e38f7af325..020126b24da 100644
--- a/devel/libgnomeui/buildlink3.mk
+++ b/devel/libgnomeui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/03/26 02:27:38 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/04/01 18:25:54 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEUI_BUILDLINK3_MK:=	${LIBGNOMEUI_BUILDLINK3_MK}+
@@ -11,8 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeui}
 BUILDLINK_PACKAGES+=	libgnomeui
 
 .if !empty(LIBGNOMEUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.4.0.1nb2
-BUILDLINK_RECOMMENDED.libgnomeui?=	libgnomeui>=2.4.0.1nb6
+BUILDLINK_DEPENDS.libgnomeui+=		libgnomeui>=2.6.0
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .endif	# LIBGNOMEUI_BUILDLINK3_MK
 
@@ -24,5 +23,6 @@ BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 .include "../../devel/libgnome/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
+.include "../../security/gnome-keyring/buildlink3.mk"
 
 BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/devel/libgnomeui/distinfo b/devel/libgnomeui/distinfo
index 6a777d8c2af..1cf3b69df34 100644
--- a/devel/libgnomeui/distinfo
+++ b/devel/libgnomeui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/12/14 19:49:53 jmmv Exp $
+$NetBSD: distinfo,v 1.7 2004/04/01 18:25:54 jmmv Exp $
 
-SHA1 (libgnomeui-2.4.0.1.tar.bz2) = 2823f22ea31b9ea5b5a07bf252ae89066601ad2b
-Size (libgnomeui-2.4.0.1.tar.bz2) = 1269316 bytes
+SHA1 (libgnomeui-2.6.0.tar.bz2) = acd047164142cc751192d9d80265a75ea205ac61
+Size (libgnomeui-2.6.0.tar.bz2) = 1456029 bytes