Update to 2.8.0. This version corresponds to GNOME 2.8.0.

While here, convert to the bsd.options.mk framework to handle the cups
functionality.

libgnomeprint 2.8.0

Jody
	* Bump automake req to 1.7
	* clean up some improperly namespaced private symbols
	* Recognize .ttc files as truetype

J.H.M. Dassen
	* Explicitly require gmodule

------------------------------------------------------------------------------
libgnomeprint 2.7.90

Jody
	http://bugzilla.gnome.org/show_bug.cgi?id=147349
	* Improve test for zlib
	http://bugzilla.gnome.org/show_bug.cgi?id=133924
	* Fix transformations of text in pdf backend

Kmaraas
	* Patch some warnings from sparse

Owen
	http://bugzilla.gnome.org/show_bug.cgi?id=143878
	* Fix gnome_font_find_closest to call gnome_font_face_find_closest

Morten
	* Keep more private symbols from polluting the global namespace.

Suresh Chandrasekharan
	http://bugzilla.gnome.org/show_bug.cgi?id=149858
	* Don't modify the global font table

------------------------------------------------------------------------------
libgnomeprint 2.7.2

Andreas
	* Fix 1#49160
	* Fix #149161

Jody
	* #Fix 149452
	* more portability

Suresh Chandrasekharan
	* Fix #148674
	* Fix #149858

------------------------------------------------------------------------------
libgnomeprint 2.7.1

Andreas
	* Add module to scan /etc/printcap

Colin Walters :
	* Support for new gnomeprintui printer list (state polling)

Jody
	* Some win32 build fixes
	* Build fixes for sft code from glib

J.H.M. Dassen (Ray) :
	* link fixes

Matthias Clasen:
	* fix handling of no cups printers

------------------------------------------------------------------------------
libgnomeprint 2.7.0

Andreas
	* Improve handling of multiple instances of a cups printer.
	* Add all paper sizes to PDF writer

Grzegorz Golawski
	* Use G_MODULE_SUFFIX

Owen Taylor :
	* Improved pango integration (Requires Pango 1.5.0)

Suresh Chandrasekharan :
	* Improved font subsetting for PS and PDF backends

Dom Lachowicz :
	* Fix win32 compilation

Jody Goldberg :
	* Fix pdf generation

J.H.M. Dassen (Ray):
	* Fixed unresolved symbols in the CUPS module.

8 files changed, 39 insertions, 24 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index 5b55d7683ad..56440ecd660 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.31 2004/06/28 18:24:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.32 2004/09/21 16:49:04 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprint-2.6.2
+DISTNAME=	libgnomeprint-2.8.0
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprint/2.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
@@ -26,12 +26,13 @@ PKGCONFIG_OVERRIDE=	libgnomeprint/libgnomeprint-2.2.pc.in
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
 
-.include "../../mk/bsd.prefs.mk"
+PKG_OPTIONS_VAR=	PKG_OPTIONS.libgnomeprint
+PKG_SUPPORTED_OPTIONS=	cups
 
-BUILD_DEFS+=		USE_CUPS
+.include "../../mk/bsd.options.mk"
 
-.if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
-.include "../../print/cups/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mcups)
+.include "../../print/libgnomecups/buildlink3.mk"
 CONFIGURE_ARGS+=	--with-cups
 PLIST_SUBST+=		USE_CUPS=
 .else
@@ -39,6 +40,8 @@ CONFIGURE_ARGS+=	--without-cups
 PLIST_SUBST+=		USE_CUPS="@comment "
 .endif
 
+.include "../../mk/bsd.prefs.mk"
+
 .if ${OPSYS} == "Darwin"
 # AC_LTDL_SHLIBEXT doesn't work on Darwin (and would give the wrong
 # answer here even if it did).
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index fb539bcd32c..2416f62799a 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,10 +1,11 @@
-@comment $NetBSD: PLIST,v 1.10 2004/06/28 18:24:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.11 2004/09/21 16:49: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-pango.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-paper.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print-unit.h
 include/libgnomeprint-2.2/libgnomeprint/gnome-print.h
@@ -15,7 +16,6 @@ include/libgnomeprint-2.2/libgnomeprint/private/gnome-font-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-fontmap.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-glyphlist-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-config-private.h
-include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-pango.h
 include/libgnomeprint-2.2/libgnomeprint/private/gnome-print-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gp-gc-private.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-config.h
@@ -29,6 +29,7 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-printer.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-reference.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-root.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-settings.h
+include/libgnomeprint-2.2/libgnomeprint/private/gpa-state.h
 include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.la
@@ -38,6 +39,9 @@ lib/libgnomeprint-2-2.so.1.0
 ${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.a
 ${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.la
 ${USE_CUPS}lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintcups.so
+lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintlpd.a
+lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintlpd.la
+lib/libgnomeprint/${PKGVERSION}/modules/libgnomeprintlpd.so
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.a
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so
@@ -52,6 +56,7 @@ share/doc/libgnomeprint/home.png
 share/doc/libgnomeprint/index.html
 share/doc/libgnomeprint/index.sgml
 share/doc/libgnomeprint/left.png
+share/doc/libgnomeprint/libgnomeprint-Pango-Integration.html
 share/doc/libgnomeprint/libgnomeprint-building.html
 share/doc/libgnomeprint/libgnomeprint-compiling.html
 share/doc/libgnomeprint/libgnomeprint-gnome-font-face.html
@@ -65,6 +70,7 @@ 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.devhelp
 share/doc/libgnomeprint/libgnomeprint.html
 share/doc/libgnomeprint/libgnomeprintunsorted.html
 share/doc/libgnomeprint/right.png
@@ -83,6 +89,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -115,6 +122,7 @@ ${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomeprint-2.2.mo
 ${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/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/buildlink3.mk b/print/libgnomeprint/buildlink3.mk
index 731bb063e93..dcaeb6cbb86 100644
--- a/print/libgnomeprint/buildlink3.mk
+++ b/print/libgnomeprint/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:29:40 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:49:04 jmmv Exp $
 
 BUILDLINK_DEPTH:=		${BUILDLINK_DEPTH}+
 LIBGNOMEPRINT_BUILDLINK3_MK:=	${LIBGNOMEPRINT_BUILDLINK3_MK}+
@@ -13,7 +13,7 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgnomeprint}
 BUILDLINK_PACKAGES+=	libgnomeprint
 
 .if !empty(LIBGNOMEPRINT_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.6.0
+BUILDLINK_DEPENDS.libgnomeprint+=	libgnomeprint>=2.8.0
 BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
 .endif	# LIBGNOMEPRINT_BUILDLINK3_MK
 
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index 925d1311e49..632aa600fca 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.11 2004/06/28 18:24:07 jmmv Exp $
+$NetBSD: distinfo,v 1.12 2004/09/21 16:49:04 jmmv Exp $
 
-SHA1 (libgnomeprint-2.6.2.tar.bz2) = b377269a25f5e0c27c6dac277017c332ee67504e
-Size (libgnomeprint-2.6.2.tar.bz2) = 701216 bytes
+SHA1 (libgnomeprint-2.8.0.tar.bz2) = 41a756e69dd68d82e6c2ecb59b414af1a8730613
+Size (libgnomeprint-2.8.0.tar.bz2) = 749976 bytes
diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 8783f968243..6e96183b5ac 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.26 2004/06/28 18:24:07 jmmv Exp $
+# $NetBSD: Makefile,v 1.27 2004/09/21 16:49:04 jmmv Exp $
 #
 
-DISTNAME=	libgnomeprintui-2.6.2
+DISTNAME=	libgnomeprintui-2.8.0
 CATEGORIES=	print gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.6/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.8/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@NetBSD.org
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index f7f15f1ad68..f7e58ffcb43 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2004/06/28 18:24:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.9 2004/09/21 16:49: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
@@ -12,7 +12,7 @@ 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/libgnomeprintui/c7.html
+share/doc/libgnomeprintui/ch02.html
 share/doc/libgnomeprintui/home.png
 share/doc/libgnomeprintui/index.html
 share/doc/libgnomeprintui/index.sgml
@@ -24,6 +24,7 @@ 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
@@ -35,6 +36,7 @@ ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/bn/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/bs/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
 ${PKGLOCALEDIR}/locale/cy/LC_MESSAGES/libgnomeprintui-2.2.mo
@@ -68,6 +70,8 @@ ${PKGLOCALEDIR}/locale/lv/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
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ne/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
diff --git a/print/libgnomeprintui/buildlink3.mk b/print/libgnomeprintui/buildlink3.mk
index 2fbd4ca77f2..3f9a9912b5f 100644
--- a/print/libgnomeprintui/buildlink3.mk
+++ b/print/libgnomeprintui/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.4 2004/04/01 18:29:40 jmmv Exp $
+# $NetBSD: buildlink3.mk,v 1.5 2004/09/21 16:49:04 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.6.0
+BUILDLINK_DEPENDS.libgnomeprintui+=	libgnomeprintui>=2.8.0
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 .endif	# LIBGNOMEPRINTUI_BUILDLINK3_MK
 
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 37fe05bed52..09f6bb9e674 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2004/06/28 18:24:07 jmmv Exp $
+$NetBSD: distinfo,v 1.10 2004/09/21 16:49:04 jmmv Exp $
 
-SHA1 (libgnomeprintui-2.6.2.tar.bz2) = 3064c377d8905a25ab093fa6f2ea388a373283a3
-Size (libgnomeprintui-2.6.2.tar.bz2) = 562712 bytes
+SHA1 (libgnomeprintui-2.8.0.tar.bz2) = da5242f8aa767e46fe642cf5364c43a1cca3d293
+Size (libgnomeprintui-2.8.0.tar.bz2) = 580677 bytes