Update to 2.6.1.

8 files changed, 34 insertions, 18 deletions

diff --git a/graphics/libgnomecanvas/Makefile b/graphics/libgnomecanvas/Makefile
index a62fd2a08e7f..7746cbef5f8e 100644
--- a/graphics/libgnomecanvas/Makefile
+++ b/graphics/libgnomecanvas/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnomecanvas
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	graphics gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
diff --git a/graphics/libgnomecanvas/distinfo b/graphics/libgnomecanvas/distinfo
index ba48aa4d6e38..d6c389e910e5 100644
--- a/graphics/libgnomecanvas/distinfo
+++ b/graphics/libgnomecanvas/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomecanvas-2.6.0.tar.bz2) = a670348ceecaa85b35940dcbd9f8c20e
-SIZE (gnome2/libgnomecanvas-2.6.0.tar.bz2) = 512743
+MD5 (gnome2/libgnomecanvas-2.6.1.tar.bz2) = 9c2ec0c165ff49973e9bb5f910918cda
+SIZE (gnome2/libgnomecanvas-2.6.1.tar.bz2) = 520838
diff --git a/graphics/libgnomecanvas/files/patch-configure b/graphics/libgnomecanvas/files/patch-configure
new file mode 100644
index 000000000000..a64d3f7a7f59
--- /dev/null
+++ b/graphics/libgnomecanvas/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure.orig	Tue Apr 20 02:54:07 2004
++++ configure	Tue Apr 20 02:54:16 2004
+@@ -1510,7 +1510,7 @@
+ LIBGNOMECANVAS_MAJOR_VERSION=2
+ LIBGNOMECANVAS_MINOR_VERSION=6
+ LIBGNOMECANVAS_MICRO_VERSION=1
+-LIBGNOMECANVAS_INTERFACE_AGE=0
++LIBGNOMECANVAS_INTERFACE_AGE=1
+ # If you need a modifier for the version number.
+ # Normally empty, but can be used to make "fixup" releases.
+ LIBGNOMECANVAS_EXTRAVERSION=
diff --git a/graphics/libgnomecanvas/pkg-plist b/graphics/libgnomecanvas/pkg-plist
index 303dcc19ef74..be326c42d585 100644
--- a/graphics/libgnomecanvas/pkg-plist
+++ b/graphics/libgnomecanvas/pkg-plist
@@ -34,10 +34,12 @@ share/locale/en_GB/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/eo/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/es/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/et/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/eu/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fa/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/ga/LC_MESSAGES/libgnomecanvas-2.0.mo
+share/locale/gu/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/he/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnomecanvas-2.0.mo
 share/locale/hr/LC_MESSAGES/libgnomecanvas-2.0.mo
diff --git a/x11/libgnome/Makefile b/x11/libgnome/Makefile
index 7db61fe4291d..bece9634758c 100644
--- a/x11/libgnome/Makefile
+++ b/x11/libgnome/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnome
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES?=	x11 gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -22,8 +22,8 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack gnomehier intlhack esound gnomevfs2 \
-		libxslt
+USE_GNOME=	gnomeprefix gnomehack lthack gnomehier intlhack esound \
+		gnomevfs2 libxslt
 USE_BISON=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
diff --git a/x11/libgnome/distinfo b/x11/libgnome/distinfo
index 7c8c192bb53a..8748b118442a 100644
--- a/x11/libgnome/distinfo
+++ b/x11/libgnome/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnome-2.6.0.tar.bz2) = c3fd920119581ba1da531222ed69a5e0
-SIZE (gnome2/libgnome-2.6.0.tar.bz2) = 1070613
+MD5 (gnome2/libgnome-2.6.1.tar.bz2) = 6abd153ac8e0c612927de0698634a46e
+SIZE (gnome2/libgnome-2.6.1.tar.bz2) = 1094109
diff --git a/x11/libgnome/files/patch-configure b/x11/libgnome/files/patch-configure
index 8111dd90a73f..01835d192bb7 100644
--- a/x11/libgnome/files/patch-configure
+++ b/x11/libgnome/files/patch-configure
@@ -1,10 +1,11 @@
---- configure.orig	Mon Aug 11 15:31:05 2003
-+++ configure	Mon Aug 11 15:31:06 2003
-@@ -19070,6 +19070,7 @@
- 
- # This can be used to rebuild libtool when needed
- LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
-+$ac_aux_dir/ltconfig $LIBTOOL_DEPS
- 
- # Always use our own libtool.
- LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+--- configure.orig	Tue Apr 20 02:47:31 2004
++++ configure	Tue Apr 20 02:49:09 2004
+@@ -1514,7 +1514,7 @@
+ LIBGNOME_MAJOR_VERSION=2
+ LIBGNOME_MINOR_VERSION=6
+ LIBGNOME_MICRO_VERSION=1
+-LIBGNOME_INTERFACE_AGE=0
++LIBGNOME_INTERFACE_AGE=1
+ # If you need a modifier for the version number.
+ # Normally empty, but can be used to make "fixup" releases.
+ LIBGNOME_EXTRAVERSION=
diff --git a/x11/libgnome/pkg-plist b/x11/libgnome/pkg-plist
index 3f2d20d23f62..b57bbc70d402 100644
--- a/x11/libgnome/pkg-plist
+++ b/x11/libgnome/pkg-plist
@@ -122,6 +122,7 @@ share/locale/fi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/fr/LC_MESSAGES/libgnome-2.0.mo
 share/locale/ga/LC_MESSAGES/libgnome-2.0.mo
 share/locale/gl/LC_MESSAGES/libgnome-2.0.mo
+share/locale/gu/LC_MESSAGES/libgnome-2.0.mo
 share/locale/he/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hi/LC_MESSAGES/libgnome-2.0.mo
 share/locale/hr/LC_MESSAGES/libgnome-2.0.mo
@@ -140,6 +141,7 @@ share/locale/ms/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/nn/LC_MESSAGES/libgnome-2.0.mo
 share/locale/no/LC_MESSAGES/libgnome-2.0.mo
+share/locale/pa/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pl/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pt/LC_MESSAGES/libgnome-2.0.mo
 share/locale/pt_BR/LC_MESSAGES/libgnome-2.0.mo