Update to 2.6.0:

What's new since 2.4:

* Bug fixes:
	- BPath fixes (David Boucher)
	- Doc fixes (Richard Hult)
	- Set methods for height and width in GnomeCanvasRichText
	  (Kjartan Maraas)
	- Build fixes ("The Written Word", Kjartan Maraas)

* Translations:
	- Added British English translation (Gareth Owen)
	- Added Canadian English translation (Adam Weinberger)
	- Added Lithuanian translation (Žygimantas Beručka, Tomas Kuliavas)
	- Added Serbian Jekavian translation (Bojan Suzić)
	- Added Punjabi translation (Amanpreet Singh Alam)

	- 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 (Medina)
	- Updated Croatian translation (Robert Sedak)
	- Updated Czech translation (Miloslav Trmac)
 	- Updated Danish translation (Ole Laursen)
	- Updated Dutch translation (Vincent van Adrighem)
	- Updated Finnish translation (Pauli Virtanen)
	- Updated French translation (Christophe Merlet)
	- Updated German translation (Christian Neumair)
	- Updated Greek translation (Kostas Papadimas)
	- Updated Hindi translation (Guntupalli Karunakar)
	- Updated Hungarian translation (Andras Timar)
	- Updated Irish translation (Paul Duffy)
	- Updated Italian translation (Alesso Frusciante)
	- Updated Japanese translation (Takeshi AIHANA)
	- Updated Korean translation (Changwoo Ryu)
	- 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 (Branko Ivanovic, Danilo Šegan)
	- 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 Ukrainian translation (Maxim Dziumanenko)
	- Updated Welsh translation (Dafydd Harries)

5 files changed, 20 insertions, 39 deletions

diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index 0515217215f..4f506a8a9b0 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.24 2004/02/14 18:26:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.25 2004/04/01 18:22:52 jmmv Exp $
 #
 
-DISTNAME=		libgnomecanvas-2.4.0
-PKGREVISION=		2
+DISTNAME=		libgnomecanvas-2.6.0
 CATEGORIES=		graphics gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.4/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomecanvas/2.6/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
diff --git a/graphics/libgnomecanvas/PLIST b/graphics/libgnomecanvas/PLIST
index 4b89b2b1786..47444494543 100644
--- a/graphics/libgnomecanvas/PLIST
+++ b/graphics/libgnomecanvas/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2003/12/14 19:48:37 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/04/01 18:22:52 jmmv Exp $
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-bpath.h
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-clipgroup.h
 include/libgnomecanvas-2.0/libgnomecanvas/gnome-canvas-line.h
@@ -19,34 +19,9 @@ lib/libglade/2.0/libcanvas.so
 lib/libgnomecanvas-2.a
 lib/libgnomecanvas-2.la
 lib/libgnomecanvas-2.so
-lib/libgnomecanvas-2.so.400
-lib/libgnomecanvas-2.so.400.0
+lib/libgnomecanvas-2.so.600
+lib/libgnomecanvas-2.so.600.0
 lib/pkgconfig/libgnomecanvas-2.0.pc
-share/doc/html/libgnomecanvas/c35.html
-share/doc/html/libgnomecanvas/c4.html
-share/doc/html/libgnomecanvas/gnomecanvas.html
-share/doc/html/libgnomecanvas/gnomecanvasbpath.html
-share/doc/html/libgnomecanvas/gnomecanvasclipgroup.html
-share/doc/html/libgnomecanvas/gnomecanvasellipse.html
-share/doc/html/libgnomecanvas/gnomecanvasgroup.html
-share/doc/html/libgnomecanvas/gnomecanvasitem.html
-share/doc/html/libgnomecanvas/gnomecanvasline.html
-share/doc/html/libgnomecanvas/gnomecanvaspixbuf.html
-share/doc/html/libgnomecanvas/gnomecanvaspolygon.html
-share/doc/html/libgnomecanvas/gnomecanvasre.html
-share/doc/html/libgnomecanvas/gnomecanvasrect.html
-share/doc/html/libgnomecanvas/gnomecanvasrichtext.html
-share/doc/html/libgnomecanvas/gnomecanvasshape.html
-share/doc/html/libgnomecanvas/gnomecanvastext.html
-share/doc/html/libgnomecanvas/gnomecanvaswidget.html
-share/doc/html/libgnomecanvas/home.png
-share/doc/html/libgnomecanvas/index.html
-share/doc/html/libgnomecanvas/index.sgml
-share/doc/html/libgnomecanvas/left.png
-share/doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-path-def.html
-share/doc/html/libgnomecanvas/libgnomecanvas-gnome-canvas-util.html
-share/doc/html/libgnomecanvas/right.png
-share/doc/html/libgnomecanvas/up.png
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -59,6 +34,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomecanvas-2.0.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgnomecanvas-2.0.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -68,6 +45,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/id/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -76,6 +54,7 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/kn/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/libgnomecanvas-2.0.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -85,6 +64,7 @@ ${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomecanvas-2.0.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -95,6 +75,7 @@ ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomecanvas-2.0.mo
+${PKGLOCALEDIR}/locale/sr@ije/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomecanvas-2.0.mo
@@ -104,6 +85,7 @@ ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/yi/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomecanvas-2.0.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomecanvas-2.0.mo
+@exec ${MKDIR} %D/share/doc/html/libgnomecanvas
 @dirrm share/doc/html/libgnomecanvas
 @comment in libglade2: @dirrm lib/libglade/2.0
 @dirrm include/libgnomecanvas-2.0/libgnomecanvas
diff --git a/graphics/libgnomecanvas/buildlink2.mk b/graphics/libgnomecanvas/buildlink2.mk
index 4d1ca696a2b..f80dffcab18 100644
--- a/graphics/libgnomecanvas/buildlink2.mk
+++ b/graphics/libgnomecanvas/buildlink2.mk
@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.10 2004/01/03 18:49:43 reed Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2004/04/01 18:22:52 jmmv Exp $
 
 .if !defined(LIBGNOMECANVAS_BUILDLINK2_MK)
 LIBGNOMECANVAS_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnomecanvas
-BUILDLINK_DEPENDS.libgnomecanvas?=	libgnomecanvas>=2.4.0nb1
+BUILDLINK_DEPENDS.libgnomecanvas?=	libgnomecanvas>=2.5.91
 BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomecanvas=libgnomecanvas
diff --git a/graphics/libgnomecanvas/buildlink3.mk b/graphics/libgnomecanvas/buildlink3.mk
index 8cc3449e4aa..9fdad785aac 100644
--- a/graphics/libgnomecanvas/buildlink3.mk
+++ b/graphics/libgnomecanvas/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:12 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:22:52 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMECANVAS_BUILDLINK3_MK:=	${LIBGNOMECANVAS_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomecanvas}
 BUILDLINK_PACKAGES+=	libgnomecanvas
 
 .if !empty(LIBGNOMECANVAS_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.4.0nb1
+BUILDLINK_DEPENDS.libgnomecanvas+=	libgnomecanvas>=2.6.0
 BUILDLINK_PKGSRCDIR.libgnomecanvas?=	../../graphics/libgnomecanvas
 .endif	# LIBGNOMECANVAS_BUILDLINK3_MK
 
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index 12105f082d3..6dfc3b46d49 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.7 2003/12/14 19:48:37 jmmv Exp $
+$NetBSD: distinfo,v 1.8 2004/04/01 18:22:52 jmmv Exp $
 
-SHA1 (libgnomecanvas-2.4.0.tar.bz2) = 0d8abcd0e4682090409d728939c3f64c809122f9
-Size (libgnomecanvas-2.4.0.tar.bz2) = 535399 bytes
+SHA1 (libgnomecanvas-2.6.0.tar.bz2) = af426ab299395bb1ae2a67e1294eac12bbbf4730
+Size (libgnomecanvas-2.6.0.tar.bz2) = 512743 bytes