Update gnome-print to 0.36

	Fix #80407 in parseAFM.c
	Fix #80415 in gnome-font-face.c
	Fix #78662 fix gp_ctx_new bug
	Fix #80417 in gnome-rfont.c
	Fix #80416 in gnome-rfont.c
	Fix #76610 in gfft2_move_to and gp_path_close_all
	gp_ps2_set_font_private fix s/=/==/ (Lauris)

5 files changed, 62 insertions, 59 deletions

diff --git a/print/gnome-print/Makefile b/print/gnome-print/Makefile
index c7f11799a22..f82524bd94e 100644
--- a/print/gnome-print/Makefile
+++ b/print/gnome-print/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.47 2002/04/10 01:59:14 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2002/08/26 19:39:29 mjl Exp $
 #
 
-DISTNAME=		gnome-print-0.35
+DISTNAME=		gnome-print-0.36
 CATEGORIES=		print gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=stable/sources/gnome-print/}
 
@@ -11,6 +11,9 @@ COMMENT=		Prototype implementation of the Gnome Printing Architecture
 
 DEPENDS+=		ghostscript{,-nox11}-[6-9]*:../../print/ghostscript
 
+BUILDLINK_DEPENDS.libxml=	libxml>=1.8.8
+BUILDLINK_DEPENDS.gdk-pixbuf=	gdk-pixbuf>=0.7.0
+
 USE_BUILDLINK_ONLY=	YES
 USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
diff --git a/print/gnome-print/PLIST b/print/gnome-print/PLIST
index 9c89398a757..6ba715a5578 100644
--- a/print/gnome-print/PLIST
+++ b/print/gnome-print/PLIST
@@ -1,4 +1,39 @@
-@comment $NetBSD: PLIST,v 1.2 2002/03/26 09:20:44 rh Exp $
+@comment $NetBSD: PLIST,v 1.3 2002/08/26 19:39:29 mjl Exp $
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-print.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-print.mo
 bin/gnome-font-install
 etc/gnome/fonts/gnome-print-ghostscript.fontmap
 etc/gnome/fonts/gnome-print-x11.fontmap
@@ -80,41 +115,6 @@ 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
-share/locale/hr/LC_MESSAGES/gnome-print.mo
-share/locale/hu/LC_MESSAGES/gnome-print.mo
-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/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
-share/locale/zh_TW/LC_MESSAGES/gnome-print.mo
 @dirrm share/gnome/fonts
 @dirrm share/gnome-print/profiles
 @dirrm share/gnome-print
diff --git a/print/gnome-print/distinfo b/print/gnome-print/distinfo
index 1493e8906f6..1d253f0477f 100644
--- a/print/gnome-print/distinfo
+++ b/print/gnome-print/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2002/04/10 01:59:15 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/08/26 19:39:30 mjl Exp $
 
-SHA1 (gnome-print-0.35.tar.gz) = 287f008c99925c662526f644a17cdb05c7533507
-Size (gnome-print-0.35.tar.gz) = 991657 bytes
-SHA1 (patch-aa) = c29847ea6059b8e9275176273c007a16b20c3a83
-SHA1 (patch-ac) = 74f5800e867c941f7fd5d054f28fe575fb5579da
+SHA1 (gnome-print-0.36.tar.gz) = a1b2ada6b8ce432731233607ac2e3567ccae675e
+Size (gnome-print-0.36.tar.gz) = 1003090 bytes
+SHA1 (patch-aa) = 3565dad38a67e5e684f05a9608bb8daed7cdcccf
+SHA1 (patch-ac) = 8a9e69c00e4c9440d7a57d86c3ee28d914a9f3ce
diff --git a/print/gnome-print/patches/patch-aa b/print/gnome-print/patches/patch-aa
index 45b7a516fdf..a4785015dd2 100644
--- a/print/gnome-print/patches/patch-aa
+++ b/print/gnome-print/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.13 2002/04/10 01:59:15 jlam Exp $
+$NetBSD: patch-aa,v 1.14 2002/08/26 19:39:30 mjl Exp $
 
---- configure.orig	Mon Jan 28 14:58:57 2002
-+++ configure
-@@ -5866,8 +5866,8 @@
+--- configure.orig	Sun Jun  2 18:44:20 2002
++++ configure	Sun Jun  9 00:30:57 2002
+@@ -5674,8 +5674,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -13,7 +13,7 @@ $NetBSD: patch-aa,v 1.13 2002/04/10 01:59:15 jlam Exp $
  		
  		
  	else
-@@ -5884,8 +5884,8 @@
+@@ -5692,8 +5692,8 @@
    
  		gnome_cv_gnorba_found=no
  		if test x$gnome_cv_orbit_found = xyes; then
@@ -24,7 +24,7 @@ $NetBSD: patch-aa,v 1.13 2002/04/10 01:59:15 jlam Exp $
  			if test -n "$GNORBA_LIBS"; then
  				gnome_cv_gnorba_found=yes
  			fi
-@@ -5905,8 +5905,8 @@
+@@ -5713,8 +5713,8 @@
  fi
  	if test x$gnome_cv_orbit_found = xyes; then
  		
@@ -35,10 +35,10 @@ $NetBSD: patch-aa,v 1.13 2002/04/10 01:59:15 jlam Exp $
  		
  		
  	else
-@@ -8897,8 +8897,8 @@
+@@ -8718,8 +8718,8 @@
           
              echo $ac_n "checking for Glade libraries >= 0.13""... $ac_c" 1>&6
- echo "configure:8900: checking for Glade libraries >= 0.13" >&5
+ echo "configure:8721: checking for Glade libraries >= 0.13" >&5
 -   if gnome-config --libs libglade > /dev/null 2>&1; then 
 -      vers=`gnome-config --modversion libglade | awk 'BEGIN { FS = "."; } { print $1 * 1000 + $2;}'`
 +   if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then 
diff --git a/print/gnome-print/patches/patch-ac b/print/gnome-print/patches/patch-ac
index 40eba05c29b..b45f36947a2 100644
--- a/print/gnome-print/patches/patch-ac
+++ b/print/gnome-print/patches/patch-ac
@@ -1,13 +1,13 @@
-$NetBSD: patch-ac,v 1.1 1999/08/01 18:57:08 tron Exp $
+$NetBSD: patch-ac,v 1.2 2002/08/26 19:39:30 mjl Exp $
 
---- po/Makefile.in.in.orig	Fri Jul  9 07:51:25 1999
-+++ po/Makefile.in.in	Sun Aug  1 20:48:32 1999
-@@ -19,7 +19,7 @@
+--- po/Makefile.in.in.orig	Sun Jun  2 18:44:16 2002
++++ po/Makefile.in.in	Sun Jun  9 00:33:10 2002
+@@ -23,7 +23,7 @@
  prefix = @prefix@
  exec_prefix = @exec_prefix@
- datadir = $(prefix)/@DATADIRNAME@
+ datadir = @datadir@
 -localedir = $(datadir)/locale
 +localedir = $(prefix)/share/locale
- gnulocaledir = $(prefix)/share/locale
- gettextsrcdir = $(prefix)/share/gettext/po
- subdir = po
+ gettextsrcdir = $(datadir)/gettext/po
+ 
+ INSTALL = @INSTALL@