Update libgnomeprint and libgnomeprintui to 2.10.0:

Dom Lachowicz:
	* Some pdf fixes.
	* Support alpha in pdf images

Jody:
	* Some AIX build fixes [#160861]

Lutz Mueller:
	* Misc cleanup
	* Prep for D&D support

Matthias Clasen:
	* Async ppd loading

Suresh Chandrasekharan:
	* Handle subfonts in ttf according to spec [#158027]

6 files changed, 24 insertions, 35 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 171ee779366..40577f709ec 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.36 2005/02/26 17:23:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.37 2005/03/22 16:03:04 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprint-2.8.2
+DISTNAME=	libgnomeprint-2.10.0
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -55,7 +55,9 @@ PRINT_PLIST_AWK+=	/cups/ { print "$${USE_CUPS}" $$0; next; }
 .include "../../devel/libbonobo/buildlink3.mk"
 .include "../../devel/pango/buildlink3.mk"
 .include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../fonts/fontconfig/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/libart2/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
+.include "../../textproc/libxml2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index 12255d7caed..2d7b5398622 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.13 2005/02/26 17:23:54 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.14 2005/03/22 16:03:04 jmmv Exp $
 include/libgnomeprint-2.2/libgnomeprint/gnome-font-face.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-font.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-glyphlist.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-pgl.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-config.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-job.h
+include/libgnomeprint-2.2/libgnomeprint/gnome-print-meta.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-pango.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-transport.h
@@ -110,6 +111,7 @@ ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/mr/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeprint-2.2.mo
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 7ff842be227..cba8a027060 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.16 2005/02/26 17:23:54 jmmv Exp $
+$NetBSD: distinfo,v 1.17 2005/03/22 16:03:04 jmmv Exp $
 
-SHA1 (libgnomeprint-2.8.2.tar.bz2) = e5542fe2813299b439015aaea0f37bfcdb07e35c
-RMD160 (libgnomeprint-2.8.2.tar.bz2) = 999b79f88be379410b8418a3523929ee61a426c0
-Size (libgnomeprint-2.8.2.tar.bz2) = 766574 bytes
+SHA1 (libgnomeprint-2.10.0.tar.bz2) = af6b71aae70dd68d9abeb05b637e534a42572380
+RMD160 (libgnomeprint-2.10.0.tar.bz2) = 9b89680d0a86f6422a6897363b1054bb026305a3
+Size (libgnomeprint-2.10.0.tar.bz2) = 723285 bytes
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 0c7c8008b2f..36b343dc158 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.30 2005/02/26 17:23:54 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2005/03/22 16:03:04 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprintui-2.8.2
+DISTNAME=	libgnomeprintui-2.10.0
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.8/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.10/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -24,7 +24,7 @@ PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.pc.in
 CONFIGURE_ARGS=		--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
+BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.10.0
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
@@ -37,4 +37,5 @@ BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.2
 .include "../../graphics/libgnomecanvas/buildlink3.mk"
 .include "../../print/libgnomeprint/buildlink3.mk"
 .include "../../textproc/libxml2/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index feae59e9761..73a059ce9f9 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2004/09/22 08:09:51 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2005/03/22 16:03:04 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
@@ -6,25 +6,9 @@ include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h
 include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
+include/libgnomeprintui-2.2/libgnomeprintui/libgnomeprintui-enum-types.h
 lib/libgnomeprintui-2-2.la
 lib/pkgconfig/libgnomeprintui-2.2.pc
-share/doc/libgnomeprintui/ch02.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.devhelp
-share/doc/libgnomeprintui/libgnomeprintui.html
-share/doc/libgnomeprintui/right.png
-share/doc/libgnomeprintui/style.css
-share/doc/libgnomeprintui/up.png
 ${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -63,6 +47,7 @@ ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/li/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -91,6 +76,5 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprintui-2.2.mo
-@dirrm share/doc/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2/libgnomeprintui
 @dirrm include/libgnomeprintui-2.2
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 2a04cc07c10..1172062c9b9 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.13 2005/02/26 17:23:54 jmmv Exp $
+$NetBSD: distinfo,v 1.14 2005/03/22 16:03:04 jmmv Exp $
 
-SHA1 (libgnomeprintui-2.8.2.tar.bz2) = 05a16145834c8a128c4aa553c72ea4b2c28034b2
-RMD160 (libgnomeprintui-2.8.2.tar.bz2) = 326052797645f0ee4d1e6649e3fa9d42cd0a55fc
-Size (libgnomeprintui-2.8.2.tar.bz2) = 583090 bytes
+SHA1 (libgnomeprintui-2.10.0.tar.bz2) = 0f00bc497fb216d2d16b0595804670e88f000d7f
+RMD160 (libgnomeprintui-2.10.0.tar.bz2) = d89d7766ed1830ef0243973c4935282f82f3a668
+Size (libgnomeprintui-2.10.0.tar.bz2) = 615209 bytes