Update gnome-print to 0.35. This is mainly a bug-fix release, but also

includes the following changes:

- Print preview clips now all graphics, including text and bitmaps -
  it makes gnumeric and sodipodi previews much nicer

- Fontmaps can contain per-locale default entries now, so unknown
  font names do not fall uniformly back to Helvetica any more

- Added --dir flag to gnome-font-install (Tambet)

5 files changed, 60 insertions, 57 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index 18fe7deff0f..60a95f074ee 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.44 2002/03/13 17:37:35 fredb Exp $
+# $NetBSD: Makefile,v 1.45 2002/03/26 09:20:44 rh Exp $
 #
 
-DISTNAME=		gnome-print-0.29
-PKGREVISION=		1
+DISTNAME=		gnome-print-0.35
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-print/}
 
diff --git a/print/gnome-print/PLIST b/print/gnome-print/PLIST
index 7f87d4b115e..9c89398a757 100644
--- a/print/gnome-print/PLIST
+++ b/print/gnome-print/PLIST
@@ -1,33 +1,38 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:27:43 zuntum Exp $
+@comment $NetBSD: PLIST,v 1.2 2002/03/26 09:20:44 rh Exp $
 bin/gnome-font-install
-include/libgnomeprint/gnome-font-dialog.h
-include/libgnomeprint/gnome-font-face.h
-include/libgnomeprint/gnome-font.h
-include/libgnomeprint/gnome-glyphlist.h
-include/libgnomeprint/gnome-pgl.h
-include/libgnomeprint/gnome-print-copies.h
-include/libgnomeprint/gnome-print-dialog.h
-include/libgnomeprint/gnome-print-encode.h
-include/libgnomeprint/gnome-print-frgba.h
-include/libgnomeprint/gnome-print-master-preview.h
-include/libgnomeprint/gnome-print-master.h
-include/libgnomeprint/gnome-print-meta.h
-include/libgnomeprint/gnome-print-multipage.h
-include/libgnomeprint/gnome-print-pdf.h
-include/libgnomeprint/gnome-print-pixbuf.h
-include/libgnomeprint/gnome-print-preview.h
-include/libgnomeprint/gnome-print-rbuf.h
-include/libgnomeprint/gnome-print.h
-include/libgnomeprint/gnome-printer-dialog.h
-include/libgnomeprint/gnome-printer.h
-include/libgnomeprint/gnome-rfont.h
-include/libgnomeprint/gnome-text.h
+etc/gnome/fonts/gnome-print-ghostscript.fontmap
+etc/gnome/fonts/gnome-print-x11.fontmap
+etc/gnome/fonts/gnome-print.fontmap
+include/gnome-1.0/libgnomeprint/gnome-font-dialog.h
+include/gnome-1.0/libgnomeprint/gnome-font-face-private.h
+include/gnome-1.0/libgnomeprint/gnome-font-face.h
+include/gnome-1.0/libgnomeprint/gnome-font.h
+include/gnome-1.0/libgnomeprint/gnome-glyphlist.h
+include/gnome-1.0/libgnomeprint/gnome-pgl.h
+include/gnome-1.0/libgnomeprint/gnome-print-copies.h
+include/gnome-1.0/libgnomeprint/gnome-print-dialog.h
+include/gnome-1.0/libgnomeprint/gnome-print-encode.h
+include/gnome-1.0/libgnomeprint/gnome-print-frgba.h
+include/gnome-1.0/libgnomeprint/gnome-print-master-preview.h
+include/gnome-1.0/libgnomeprint/gnome-print-master.h
+include/gnome-1.0/libgnomeprint/gnome-print-meta.h
+include/gnome-1.0/libgnomeprint/gnome-print-multipage.h
+include/gnome-1.0/libgnomeprint/gnome-print-pdf.h
+include/gnome-1.0/libgnomeprint/gnome-print-pixbuf.h
+include/gnome-1.0/libgnomeprint/gnome-print-preview.h
+include/gnome-1.0/libgnomeprint/gnome-print-rbuf.h
+include/gnome-1.0/libgnomeprint/gnome-print.h
+include/gnome-1.0/libgnomeprint/gnome-printer-dialog.h
+include/gnome-1.0/libgnomeprint/gnome-printer.h
+include/gnome-1.0/libgnomeprint/gnome-rfont.h
+include/gnome-1.0/libgnomeprint/gnome-text.h
 lib/libgnomeprint.a
 lib/libgnomeprint.la
 lib/libgnomeprint.so
 lib/libgnomeprint.so.16
-lib/libgnomeprint.so.16.9
+lib/libgnomeprint.so.16.11
 lib/printConf.sh
+share/fonts/README.binaries
 share/fonts/README.installer
 share/fonts/afms/adobe/pagd8a.afm
 share/fonts/afms/adobe/pagdo8a.afm
@@ -70,16 +75,20 @@ share/fonts/afms/adobe/putr8a.afm
 share/fonts/afms/adobe/putri8a.afm
 share/fonts/afms/adobe/pzcmi8a.afm
 share/fonts/afms/adobe/pzdr.afm
-share/fonts/fontmap2
-share/gnome-print/0.29/profiles/PostscriptOptimized.profile
-share/gnome-print/0.29/profiles/pdf.profile
-share/gnome-print/0.29/profiles/fax-g3.profile
+share/gnome-print/profiles/PostscriptOptimized.profile
+share/gnome-print/profiles/fax-g3.profile
+share/gnome-print/profiles/pdf.profile
+share/gnome/fonts/adobe-urw.font
+share/gnome/fonts/defaults.fontmap
 share/locale/az/LC_MESSAGES/gnome-print.mo
+share/locale/bg/LC_MESSAGES/gnome-print.mo
+share/locale/ca/LC_MESSAGES/gnome-print.mo
 share/locale/da/LC_MESSAGES/gnome-print.mo
 share/locale/de/LC_MESSAGES/gnome-print.mo
 share/locale/el/LC_MESSAGES/gnome-print.mo
 share/locale/es/LC_MESSAGES/gnome-print.mo
 share/locale/et/LC_MESSAGES/gnome-print.mo
+share/locale/eu/LC_MESSAGES/gnome-print.mo
 share/locale/fi/LC_MESSAGES/gnome-print.mo
 share/locale/fr/LC_MESSAGES/gnome-print.mo
 share/locale/gl/LC_MESSAGES/gnome-print.mo
@@ -89,22 +98,29 @@ share/locale/it/LC_MESSAGES/gnome-print.mo
 share/locale/ja/LC_MESSAGES/gnome-print.mo
 share/locale/ko/LC_MESSAGES/gnome-print.mo
 share/locale/lt/LC_MESSAGES/gnome-print.mo
+share/locale/lv/LC_MESSAGES/gnome-print.mo
 share/locale/nl/LC_MESSAGES/gnome-print.mo
+share/locale/nn/LC_MESSAGES/gnome-print.mo
 share/locale/no/LC_MESSAGES/gnome-print.mo
 share/locale/pl/LC_MESSAGES/gnome-print.mo
+share/locale/pt/LC_MESSAGES/gnome-print.mo
 share/locale/pt_BR/LC_MESSAGES/gnome-print.mo
 share/locale/ro/LC_MESSAGES/gnome-print.mo
 share/locale/ru/LC_MESSAGES/gnome-print.mo
 share/locale/sk/LC_MESSAGES/gnome-print.mo
 share/locale/sl/LC_MESSAGES/gnome-print.mo
 share/locale/sv/LC_MESSAGES/gnome-print.mo
-share/locale/uk/LC_MESSAGES/gnome-print.mo
-share/locale/ca/LC_MESSAGES/gnome-print.mo
 share/locale/tr/LC_MESSAGES/gnome-print.mo
+share/locale/uk/LC_MESSAGES/gnome-print.mo
+share/locale/wa/LC_MESSAGES/gnome-print.mo
 share/locale/zh_CN.GB2312/LC_MESSAGES/gnome-print.mo
-@dirrm share/gnome-print/0.29/profiles
-@dirrm share/gnome-print/0.29
+share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
+@dirrm share/gnome/fonts
+@dirrm share/gnome-print/profiles
 @dirrm share/gnome-print
 @dirrm share/fonts/afms/adobe
 @dirrm share/fonts/afms
-@dirrm include/libgnomeprint
+@dirrm include/gnome-1.0/libgnomeprint
+@unexec ${RMDIR} %D/include/gnome-1.0 2>/dev/null || true
+@dirrm etc/gnome/fonts
+@dirrm etc/gnome
diff --git a/print/gnome-print/buildlink.mk b/print/gnome-print/buildlink.mk
index d5d09427dd2..bcbbb121c51 100644
--- a/print/gnome-print/buildlink.mk
+++ b/print/gnome-print/buildlink.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink.mk,v 1.4 2002/03/13 17:37:35 fredb Exp $
+# $NetBSD: buildlink.mk,v 1.5 2002/03/26 09:20:44 rh Exp $
 #
 # This Makefile fragment is included by packages that use gnome-print.
 #
@@ -22,7 +22,7 @@ DEPENDS+=	${BUILDLINK_DEPENDS.gnome-print}:../../print/gnome-print
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.gnome-print=gnome-print
 BUILDLINK_PREFIX.gnome-print_DEFAULT=	${X11PREFIX}
-BUILDLINK_FILES.gnome-print+=	include/libgnomeprint/*
+BUILDLINK_FILES.gnome-print+=	include/gnome-1.0/libgnomeprint/*
 BUILDLINK_FILES.gnome-print+=	lib/libgnomeprint.*
 
 .include "../../graphics/gdk-pixbuf-gnome/buildlink.mk"
@@ -35,7 +35,10 @@ BUILDLINK_TARGETS+=		${BUILDLINK_TARGETS.gnome-print}
 BUILDLINK_CONFIG.gnome-print=		${BUILDLINK_PREFIX.gnome-print}/lib/printConf.sh
 BUILDLINK_CONFIG_WRAPPER.gnome-print=	${BUILDLINK_DIR}/lib/printConf.sh
 REPLACE_BUILDLINK_SED+=	\
-	-e "s|${BUILDLINK_CONFIG_WRAPPER.gnome-print}|${BUILDLINK_CONFIG.gnome-print}|g"
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gnome-print}|${BUILDLINK_CONFIG.gnome-print}|g"	\
+	-e "s|-I${BUILDLINK_DIR}/\(include/gnome-1.0\)|-I${BUILDLINK_PREFIX.gnome-print}/\1|g"
+BUILDLINK_CONFIG_WRAPPER_SED+=	\
+	-e "s|-I${BUILDLINK_PREFIX.gnome-print}/\(include/gnome-1.0\)|-I${BUILDLINK_DIR}/\1|g"
 
 .if defined(USE_CONFIG_WRAPPER)
 GNOME_PRINT_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gnome-print}
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 5b34cbdf3a6..87d900373ca 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.3 2001/08/11 18:24:16 rh Exp $
+$NetBSD: distinfo,v 1.4 2002/03/26 09:20:44 rh Exp $
 
-SHA1 (gnome-print-0.29.tar.gz) = d3be6b7e16b95d4aca5415c9086384af95116c09
-Size (gnome-print-0.29.tar.gz) = 918325 bytes
-SHA1 (patch-ab) = 040e3fcb7309aaab3c2ab38c9b1f6a06afa74242
+SHA1 (gnome-print-0.35.tar.gz) = 287f008c99925c662526f644a17cdb05c7533507
+Size (gnome-print-0.35.tar.gz) = 991657 bytes
 SHA1 (patch-ac) = 74f5800e867c941f7fd5d054f28fe575fb5579da
diff --git a/print/gnome-print/patches/patch-ab b/print/gnome-print/patches/patch-ab
deleted file mode 100644
index 4190729fbe2..00000000000
--- a/print/gnome-print/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.5 2001/04/06 22:12:55 rh Exp $
-
---- installer/gf-pfb.c.orig	Fri Apr  6 12:38:56 2001
-+++ installer/gf-pfb.c
-@@ -4,8 +4,8 @@
-  * fixme: We should relly do some parsing here
-  */
- 
--#include <sys/mman.h>
- #include <sys/types.h>
-+#include <sys/mman.h>
- #include <sys/stat.h>
- #include <unistd.h>
- #include <fcntl.h>