Update libgnomeprint and libgnomeprintui to 2.6.2:

http://bugzilla.gnome.org/show_bug.cgi?id=130814
* invalid fonts in pdf files when locale uses comma for decimal
* invalid line widths in pdf

6 files changed, 54 insertions, 53 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 2f97e9f6ced..5b55d7683ad 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.30 2004/05/04 21:39:44 jmmv Exp $
+# $NetBSD: Makefile,v 1.31 2004/06/28 18:24:07 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprint-2.6.1
+DISTNAME=	libgnomeprint-2.6.2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -24,7 +24,7 @@ BUILDLINK_DEPENDS.freetype2+=	freetype2>=2.1.4
 PKGCONFIG_OVERRIDE=	libgnomeprint/libgnomeprint-2.2.pc.in
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index 580f0d33285..fb539bcd32c 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2004/05/04 21:39:44 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.10 2004/06/28 18:24:07 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
@@ -48,27 +48,28 @@ lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.a
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so
 lib/pkgconfig/libgnomeprint-2.2.pc
-share/doc/html/libgnomeprint/home.png
-share/doc/html/libgnomeprint/index.html
-share/doc/html/libgnomeprint/index.sgml
-share/doc/html/libgnomeprint/left.png
-share/doc/html/libgnomeprint/libgnomeprint-building.html
-share/doc/html/libgnomeprint/libgnomeprint-compiling.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-font-face.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-font.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-glyphlist.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-pgl.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-print-config.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-print-job.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-print-paper.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-print-unit.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-print.html
-share/doc/html/libgnomeprint/libgnomeprint-gnome-rfont.html
-share/doc/html/libgnomeprint/libgnomeprint-resources.html
-share/doc/html/libgnomeprint/libgnomeprint.html
-share/doc/html/libgnomeprint/libgnomeprintunsorted.html
-share/doc/html/libgnomeprint/right.png
-share/doc/html/libgnomeprint/up.png
+share/doc/libgnomeprint/home.png
+share/doc/libgnomeprint/index.html
+share/doc/libgnomeprint/index.sgml
+share/doc/libgnomeprint/left.png
+share/doc/libgnomeprint/libgnomeprint-building.html
+share/doc/libgnomeprint/libgnomeprint-compiling.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
+share/doc/libgnomeprint/libgnomeprint-gnome-font.html
+share/doc/libgnomeprint/libgnomeprint-gnome-glyphlist.html
+share/doc/libgnomeprint/libgnomeprint-gnome-pgl.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-config.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-job.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-paper.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print-unit.html
+share/doc/libgnomeprint/libgnomeprint-gnome-print.html
+share/doc/libgnomeprint/libgnomeprint-gnome-rfont.html
+share/doc/libgnomeprint/libgnomeprint-resources.html
+share/doc/libgnomeprint/libgnomeprint.html
+share/doc/libgnomeprint/libgnomeprintunsorted.html
+share/doc/libgnomeprint/right.png
+share/doc/libgnomeprint/style.css
+share/doc/libgnomeprint/up.png
 share/libgnomeprint/${PKGVERSION}/globals.xml
 share/libgnomeprint/${PKGVERSION}/models/GNOME-GENERIC-PS.xml
 share/libgnomeprint/${PKGVERSION}/models/GNOME-PDF-WRITER.xml
@@ -143,7 +144,7 @@ ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
 @dirrm share/libgnomeprint/${PKGVERSION}/models
 @dirrm share/libgnomeprint/${PKGVERSION}
 @dirrm share/libgnomeprint
-@dirrm share/doc/html/libgnomeprint
+@dirrm share/doc/libgnomeprint
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules/transports
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules
 @dirrm lib/libgnomeprint/${PKGVERSION}
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index cb632f4c881..925d1311e49 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2004/05/04 21:39:44 jmmv Exp $
+$NetBSD: distinfo,v 1.11 2004/06/28 18:24:07 jmmv Exp $
 
-SHA1 (libgnomeprint-2.6.1.tar.bz2) = e567ee12095807c753693fd94ba3beb0207e9fe5
-Size (libgnomeprint-2.6.1.tar.bz2) = 699757 bytes
+SHA1 (libgnomeprint-2.6.2.tar.bz2) = b377269a25f5e0c27c6dac277017c332ee67504e
+Size (libgnomeprint-2.6.2.tar.bz2) = 701216 bytes
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 1a4d706db09..8783f968243 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.25 2004/05/04 21:42:24 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/06/28 18:24:07 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprintui-2.6.1
+DISTNAME=	libgnomeprintui-2.6.2
 CATEGORIES=	print gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.6/}
 EXTRACT_SUFX=	.tar.bz2
@@ -22,7 +22,7 @@ USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libgnomeprintui/libgnomeprintui-2.2.pc.in
 
 CONFIGURE_ARGS=		--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/GConf2/buildlink3.mk"
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index a76fc0a3616..f7f15f1ad68 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2004/05/04 21:42:24 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.8 2004/06/28 18:24:07 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
@@ -12,22 +12,22 @@ lib/libgnomeprintui-2-2.so
 lib/libgnomeprintui-2-2.so.1
 lib/libgnomeprintui-2-2.so.1.0
 lib/pkgconfig/libgnomeprintui-2.2.pc
-share/doc/html/libgnomeprintui/c7.html
-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/style.css
-share/doc/html/libgnomeprintui/up.png
+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/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
@@ -91,6 +91,6 @@ ${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/html/libgnomeprintui
+@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 50e04213c9d..37fe05bed52 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.8 2004/05/04 21:42:24 jmmv Exp $
+$NetBSD: distinfo,v 1.9 2004/06/28 18:24:07 jmmv Exp $
 
-SHA1 (libgnomeprintui-2.6.1.tar.bz2) = 612d75d655726538b0bd018d1c4126e4302e99c3
-Size (libgnomeprintui-2.6.1.tar.bz2) = 562475 bytes
+SHA1 (libgnomeprintui-2.6.2.tar.bz2) = 3064c377d8905a25ab093fa6f2ea388a373283a3
+Size (libgnomeprintui-2.6.2.tar.bz2) = 562712 bytes