Update to 2.6.1.

6 files changed, 30 insertions, 25 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index e214b6558af9..eade886cffc3 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgnomeprint
-PORTVERSION=	2.6.0
+PORTVERSION=	2.6.1
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index bd04e8a8d382..755d4c33b92d 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprint-2.6.0.tar.bz2) = f2010f398d12e9c589a8a7d05ef37d39
-SIZE (gnome2/libgnomeprint-2.6.0.tar.bz2) = 685974
+MD5 (gnome2/libgnomeprint-2.6.1.tar.bz2) = 76e8d5c410eb04ab4493a2f32cf375ac
+SIZE (gnome2/libgnomeprint-2.6.1.tar.bz2) = 699757
diff --git a/print/libgnomeprint/pkg-plist b/print/libgnomeprint/pkg-plist
index bc6bb735e7ef..693395f9761c 100644
--- a/print/libgnomeprint/pkg-plist
+++ b/print/libgnomeprint/pkg-plist
@@ -82,10 +82,12 @@ share/locale/en_CA/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/en_GB/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/es/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/et/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/eu/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/fa/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/fi/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/fr/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/ga/LC_MESSAGES/libgnomeprint-2.2.mo
+share/locale/gu/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/he/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/hr/LC_MESSAGES/libgnomeprint-2.2.mo
 share/locale/hu/LC_MESSAGES/libgnomeprint-2.2.mo
diff --git a/x11-toolkits/libgnomeprintui/Makefile b/x11-toolkits/libgnomeprintui/Makefile
index 601d9f2a2e2d..0ef14893b270 100644
--- a/x11-toolkits/libgnomeprintui/Makefile
+++ b/x11-toolkits/libgnomeprintui/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgnomeprintui
-PORTVERSION=	2.6.0
-PORTREVISION=	2
+PORTVERSION=	2.6.1
 CATEGORIES=	x11-toolkits gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/2.6
@@ -23,12 +22,13 @@ USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
-USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomecanvas lthack intlhack
+USE_GNOME=	gnomeprefix gnomehack libgnomeprint libgnomecanvas lthack \
+		intlhack
 USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL_VER=13
 USE_BISON=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib"
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 .include <bsd.port.mk>
diff --git a/x11-toolkits/libgnomeprintui/distinfo b/x11-toolkits/libgnomeprintui/distinfo
index 5364d1a70072..08c1ef7bd7ff 100644
--- a/x11-toolkits/libgnomeprintui/distinfo
+++ b/x11-toolkits/libgnomeprintui/distinfo
@@ -1,2 +1,2 @@
-MD5 (gnome2/libgnomeprintui-2.6.0.tar.bz2) = e6a84427a66f75137f3db735aaddacdc
-SIZE (gnome2/libgnomeprintui-2.6.0.tar.bz2) = 551097
+MD5 (gnome2/libgnomeprintui-2.6.1.tar.bz2) = cc0d51e8b4b188d22ed1d16e43a8a6bd
+SIZE (gnome2/libgnomeprintui-2.6.1.tar.bz2) = 562475
diff --git a/x11-toolkits/libgnomeprintui/pkg-plist b/x11-toolkits/libgnomeprintui/pkg-plist
index 8d90e43fa5b5..4189c2271501 100644
--- a/x11-toolkits/libgnomeprintui/pkg-plist
+++ b/x11-toolkits/libgnomeprintui/pkg-plist
@@ -9,21 +9,23 @@ lib/libgnomeprintui-2-2.a
 lib/libgnomeprintui-2-2.so
 lib/libgnomeprintui-2-2.so.1
 libdata/pkgconfig/libgnomeprintui-2.2.pc
-share/doc/libgnomeprintui/c7.html
-share/doc/libgnomeprintui/home.png
-share/doc/libgnomeprintui/index.html
-share/doc/libgnomeprintui/index.sgml
-share/doc/libgnomeprintui/left.png
-share/doc/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
-share/doc/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
-share/doc/libgnomeprintui/libgnomeprintui.html
-share/doc/libgnomeprintui/right.png
-share/doc/libgnomeprintui/up.png
+%%DOCSDIR%%/c7.html
+%%DOCSDIR%%/home.png
+%%DOCSDIR%%/index.html
+%%DOCSDIR%%/index.sgml
+%%DOCSDIR%%/left.png
+%%DOCSDIR%%/libgnomeprintui-gnome-font-dialog.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-copies.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-dialog.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-job-preview.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-paper-selector.html
+%%DOCSDIR%%/libgnomeprintui-gnome-print-preview.html
+%%DOCSDIR%%/libgnomeprintui-gnome-printer-selector.html
+%%DOCSDIR%%/libgnomeprintui.html
+%%DOCSDIR%%/right.png
+%%DOCSDIR%%/style.css
+%%DOCSDIR%%/up.png
+share/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -46,6 +48,7 @@ share/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo
+share/locale/gu/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/he/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/hi/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/hr/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -85,6 +88,6 @@ share/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
 share/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
-@dirrm share/doc/libgnomeprintui
+@dirrm %%DOCSDIR%%
 @dirrm include/libgnomeprintui-2.2/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2