Update to 2.6.0:

libgnomeprint 2.5.3
	* Some GtkFileChooser adjustments
	* Fix leak (133415)
	* Fix printing crash under cups if no ppd file available (132872)
	* Use g_get_tmp_dir rather than hard coding directory (133926)
	* Fix header order (required for Darwin) (134806)
	* Fix PDF locale bug
	* Accessibility fixes

libgnomeprint 2.5.2
	* Various fixes
	* Remove setlocale invocations where they change the
	  locale (109446)
	* Fix leak and erroneous model names (131359)
	* Fix encoding mismatch for cups ppd files
	* Fix mishandling of font weights (89580)
	* Fix unconfimed overwriting of files (assuming people use
	  gnome_print_dialog_run)
	* Switch to GtkFileChooser
	* Make the print preview theme-able

libgnomeprint 2.5.1
	* Handle ttc files
	* Handle duplex and tumble in postscript files
	* Improve handling of duplex printing (#128036)
	* HIGify print dialog (#128614)
	* Add delayed printing support in cups module
	* Remove modifying calls to setlocale
	* Remove markup from translatable text
	* Offer users the possibility to display several
	  pages together (#113956).
	* add source (tray) selector to paper selector (for
	  cups module)

libgnomeprint 2.5.0.1
	http://bugzilla.gnome.org/show_bug.cgi?id=126046
	* make gnumeric work correctly with cups via gnome-print.
	* handle fonts with spaces in postscript export
	* Change cups module to load ppd files on demand
	http://bugzilla.gnome.org/show_bug.cgi?id=115566
	* Protect against libcups changing the locale
	http://bugzilla.gnome.org/show_bug.cgi?id=125836
	* Implement a better fallback than first font.
	* Replace filename entry field with file selector.
	* Adjust Preview windo size
	http://bugzilla.gnome.org/show_bug.cgi?id=124307
	* Make ctl-q and ctl-w close the preview window
	* Reduce the usage of setlocale

libgnomeprint 2.5.0
	http://bugzilla.gnome.org/show_bug.cgi?id=125828
	* Apply patch (by bland@mail.ru) to improve performance
          exporting large images.
	http://bugzilla.gnome.org/show_bug.cgi?id=122741
	* Work around unreliable cupsGetDefault
	* Fix some leaks
	* Fix locating the lpr command.
	http://bugzilla.gnome.org/show_bug.cgi?id=120954
	* Use Sans Regular rather than Helvetica as fallback
	http://bugzilla.gnome.org/show_bug.cgi?id=120910
	* Fix clipping

5 files changed, 23 insertions, 37 deletions

diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 86604d11ab2..92c676c5ee6 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:50 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2004/04/01 18:29:40 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprintui-2.4.2
-PKGREVISION=	2
+DISTNAME=	libgnomeprintui-2.6.0
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.4/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.6/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -31,6 +30,7 @@ CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index 397070dd242..f42496231f9 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/18 11:05:25 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/04/01 18:29:40 jmmv Exp $
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-config-dialog.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
@@ -16,6 +17,13 @@ share/doc/html/libgnomeprintui/home.png
 share/doc/html/libgnomeprintui/index.html
 share/doc/html/libgnomeprintui/index.sgml
 share/doc/html/libgnomeprintui/left.png
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-font-dialog.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-copies.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-dialog.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-job-preview.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-paper-selector.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-print-preview.html
+share/doc/html/libgnomeprintui/libgnomeprintui-gnome-printer-selector.html
 share/doc/html/libgnomeprintui/libgnomeprintui.html
 share/doc/html/libgnomeprintui/right.png
 share/doc/html/libgnomeprintui/up.png
@@ -31,6 +39,8 @@ ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -58,6 +68,7 @@ ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/pa/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -70,6 +81,7 @@ ${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 277a42f8d69..2fbd4ca77f2 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.3 2004/03/18 09:12:14 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:29:40 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINTUI_BUILDLINK3_MK:=	${LIBGNOMEPRINTUI_BUILDLINK3_MK}+
@@ -11,7 +11,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeprintui}
 BUILDLINK_PACKAGES+=	libgnomeprintui
 
 .if !empty(LIBGNOMEPRINTUI_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.4.2nb1
+BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.6.0
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .endif	# LIBGNOMEPRINTUI_BUILDLINK3_MK
 
@@ -20,6 +20,7 @@ BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/libglade2/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
+.include "../../graphics/gnome-icon-theme/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 0efd5e38172..2a4e98140d7 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,5 +1,4 @@
-$NetBSD: distinfo,v 1.6 2003/12/18 11:05:25 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/04/01 18:29:40 jmmv Exp $
 
-SHA1 (libgnomeprintui-2.4.2.tar.bz2) = acb256ac0ad4ad5d064cdc5ea2e23c3aae4746a0
-Size (libgnomeprintui-2.4.2.tar.bz2) = 509655 bytes
-SHA1 (patch-aa) = 08d8651239974915cb515ac94e13d7705295f367
+SHA1 (libgnomeprintui-2.6.0.tar.bz2) = 0c82f3dc8c657a6a9852dc926c91f1519c512a85
+Size (libgnomeprintui-2.6.0.tar.bz2) = 551097 bytes
diff --git a/print/libgnomeprintui/patches/patch-aa b/print/libgnomeprintui/patches/patch-aa
deleted file mode 100644
index f4e51afcd07..00000000000
--- a/print/libgnomeprintui/patches/patch-aa
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2003/12/18 11:05:25 adam Exp $
-
---- libgnomeprintui/gpaui/Makefile.in.orig	2003-11-26 20:41:53.000000000 +0000
-+++ libgnomeprintui/gpaui/Makefile.in
-@@ -54,11 +54,6 @@ CCDEPMODE = @CCDEPMODE@
- CFLAGS = @CFLAGS@
- CPP = @CPP@
- 
--CPPFLAGS = \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
--	-DBINDIR=\""$(bindir)"\" \
--	-DDATADIR=\""$(datadir)"\" 
--
- CXX = @CXX@
- CXXCPP = @CXXCPP@
- CXXDEPMODE = @CXXDEPMODE@
-@@ -192,6 +187,9 @@ INCLUDES = \
- 	-I$(top_srcdir)/libgnomeprintui \
- 	-DWE_ARE_LIBGNOMEPRINT_INTERNALS \
- 	$(LIBGNOMEPRINTUI_CFLAGS) \
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-+	-DBINDIR=\""$(bindir)"\"			\
-+	-DDATADIR=\""$(datadir)"\"			\
- 	-DG_DISABLE_DEPRECATED				\
- 	-DGDK_DISABLE_DEPRECATED				\
- 	-DGDK_PIXBUF_DISABLE_DEPRECATED