Update to 2.4.0, based on work done by xtraeme@:

2003-09-26  Jody Goldberg <jody@gnome.org>

	* Release 2.4.0

2003-09-26  Jody Goldberg <jody@gnome.org>

	* configure.in : bump to 2.4.0 to sync with desktop, and prepare to
	  branch.

2003-09-23  Balamurali Viswanathan <balamurali.viswanathan@wipro.com>

	* libgnomeprint/transports/gp-transport-file.c (gp_transport_file_open)
	When a file is printed to another file (*.ps), set the permission of the
	new file in accordance with the umask set. (bug #115836)

2003-09-04  Laurent Dhima  <laurenti@alblinux.net>

	* configure.in: Added "sq" to ALL_LINGUAS.

2003-09-02  Gediminas Paulauskas  <menesis@delfi.lt>

	* configure.in: Added lt to ALL_LINGUAS.

2003-08-12  Jody Goldberg <jody@gnome.org>

	* configure.in : post release version bump

2003-08-11  Jody Goldberg <jody@gnome.org>

	* Release 2.3.1

2003-08-11  Jody Goldberg <jody@gnome.org>

	* gtk-doc.make : add
	* doc/reference/Makefile.am : tweak uninstall to placate automake-1.7

2003-08-11  Paisa Seeluangsawat <paisa@users.sf.net>

	* th.po: Added Thai translation.
	* configure.in: (ALL_LINGUAS) Added Thai (th).

2003-08-06  Thomas Vander Stichele  <thomas at apestaart dot org>

	* configure.in:
          set ACLOCAL_AMFLAGS to make maintainer builds work
	* libgnomeprint/Makefile.am:
	* libgnomeprint/transports/Makefile.am:
	* tests/Makefile.am:
          Use AM_* instead of * to not override user flags

2003-06-21  Dafydd Harries  <daf@parnassus.ath.cx>

	* configure.in: Added "cy" (Welsh) to ALL_LINGUAS.

2003-06-25  Martin Kretzschmar  <m_kretzschmar@gmx.net>

	* libgnomeprint/libgnomeprint-2.2.pc.in (privateincludedir): fix
	path (add a missing libgnomeprint/).

2003-06-20  Abel Cheung  <maddog@linux.org.hk>

	* configure.in: Added "mk" to ALL_LINGUAS.

2003-06-19  Martin Kretzschmar  <m_kretzschmar@gmx.net>

	Bug #115320

	* libgnomeprint/libgnomeprint-2.2.pc.in (privateincludedir): new
	variable pointing to the private headers directory.

	* libgnomeprint/gnome-font-private.h: include "gnome-font.h" from
	<libgnomeprint/gnome-font.h>, likewise for gnome-rfont.h.

	* libgnomeprint/Makefile.am (font_sources, font_private_headers):
	install gnome-fontmap.h to libgnomeprint/private.

2003-06-12  Frederic Crozat  <fcrozat@mandrakesoft.com>

	* libgnomeprint/modules/cups/Makefile.am:
	* libgnomeprint/transports/Makefile.am:
	use -avoid-version for dynamically loaded modules (bug #114561)

2003-05-06  Danilo Šegan  <dsegan@gmx.net>

	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS.

2003-04-25  Masahiro Sakai  <sakai@tom.sfc.keio.ac.jp>

	* configure.in: call AC_LIBTOOL_WIN32_DLL.

	* libgnomeprint/Makefile.am:
	* libgnomeprint/modules/cups/Makefile.am:
	* libgnomeprint/transports/Makefile.am: add -no-undefined
	to _la_LDFLAGS.

	* libgnomeprint/transports/Makefile.am: add $(LIBGNOMEPRINT_LIBS)
	to _la_LIBADD.

2003-03-28  Chema Celorio  <chema@celorio.com>

	* autogen.sh (REQUIRED_AUTOMAKE_VERSION): require automake 1.6
	(filed as bug #109366)

	* data/models/Makefile.am: fix automake warning "automake does not
	support conditional definition of modelsprivate_DATA".
	* data/printers/Makefile.am: for printers too.
	(filed as bug #109438)

	* libgnomeprint/gnome-print-config.c (gnome_print_config_get_boolean): "yes"
	was duplicated in the if.

2003-03-27  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-pdf.c (gnome_print_pdf_clip): Fix bug #107160

2003-03-13  Christian Rose  <menthos@menthos.com>

	* configure.in: Added "ml" to ALL_LINGUAS.

2003-03-12  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gpa/gpa-node-private.h: the signature of the "modified" signal
	was missing a "gint flags" argument, add

	* libgnomeprint/gpa/gpa-root.h: remove globals printers_list & models_dict
	add _GPARoot

	* libgnomeprint/gpa/gpa-root.c: make gpa_root a class in itself so that
	we can browse the whole tree.
	(gpa_init): attach globals and printers_list to gpa_root.

	* libgnomeprint/gpa/gpa-printer.c (gpa_printer_list_load)
	(gpa_printer_get_default, gpa_printer_get_by_id): change printers_list
	from a global to gpa_root->printers_list.

	* libgnomeprint/gpa/gpa-node.c (gpa_node_lookup): cast the gpa_root
	to a GPA_NODE

	* libgnomeprint/gpa/gpa-model.c: move models_dict here, is no longer
	on an .h file. s/models_dict/gpa_models_dict/g to prevent a symbol clash

	* tests/gpa-test.c: you can now pass a path to dump the tree in the console for
	added --dump-root and renamed --dump to --dump-config

2003-03-12  Chema Celorio  <chema@celorio.com>

	* configure.in: post release version bump to 2.3.1

2003-03-12  Chema Celorio  <chema@celorio.com>

	* 2.3.0 he we go. No other reason to make a release other than having
	a point of reference

2003-03-12  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-job.c (gnome_print_job_metadata_printer):
	implement. Prints the metadata to a file
	(gnome_print_job_print): use here

	* libgnomeprint/gnome-print.c: typo in function documentation
	(gnome_print_context_new): g_warn if the context could not be created

	* configure.in (metadata_printer): add --with-metadata-printer
	* data/printers/Makefile.am (privateprinters_DATA): install META.xml
	* data/models/Makefile.am: install GNOME-META.xml

2003-03-11  Chema Celorio  <chema@celorio.com>

	* tests/run-test.pl (my_check_output): bump max to accomodate for new
          test.

	* tests/generate.c (my_clip_region): implement. Triggers bug #107160.

2003-03-05  Samúel Jón Gunnarsson <sammi@techattack.nu>

	* configure.in: Added "is" in ALL_LINGUAS

2003-03-05  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-unit.c (gnome_print_unit_get_identity): don't
	return FALSE on error, return NULL since the retval is a GnomePrintUnit*

	* tests/fonts.c (check_options): don't use == TRUE, fixes bug #107644

2003-02-28  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-job.c (job_parse_config_data): fetch page
	layout transforms in order. Fixes bug #105904

2003-02-28  Chema Celorio  <chema@celorio.com>

	* configure.in (GNOME_PRINT_MODULES/DATA_DIR): don't mess with the paths
	use datadir & libdir directly. Fixes bug #105096
	(DISPLAY_DATA_DIR): resolve the actual installation datadir to display it
	at the end of configure.

2003-02-28  Chema Celorio  <chema@celorio.com>

	* configure.in: don't use DATADIR to compose GNOME_PRINT_DATA_DIR as it is
	defined by the glib-gettext aclocal macro and thus breaks if gettext is
	not installed. Fixes bug #105089

2003-02-28  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gpa/gpa-root.c (gpa_initialized): if we are initializing
	return TRUE
	(gpa_init): set the initializing flag on and off while we are initializing

2003-02-27  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gpa/gpa-root.c (gpa_initialized): having a models_dict
	does not mean that we are initialized, having a valid printers_list does

	* libgnomeprint/gpa/gpa-printer.c (gpa_printer_new): check for
	the return value of gpa_initialized not for the function pointer
	(was missing the parenthesis)

	* libgnomeprint/gpa/gpa-key.c (gpa_key_merge_from_key): allow merging
	from syntetic keys (Settings.Application)

2003-02-27  Chema Celorio  <chema@celorio.com>

	libgnomeprint part of bug #106162

	* libgnomeprint/gnome-print-unit.c (gnome_print_unit_get_name): implement
	* libgnomeprint/gnome-print-unit.h: add get_name guarded by _UNSTABLE_API
	as we don't want apps to use it since this entry point was added after 2.2.0
	we _need_ this function if we want to get translated unit names.

	* libgnomeprint/gpa/gpa-option.c (gpa_option_get_name): implement
	* libgnomeprint/gpa/gpa-option.h: add _get_name

	* libgnomeprint/gpa/gpa-utils.c (gpa_utils_dump_tree_with_level): print
	option->value for GPA_OPTION_TYPE_ITEM

2003-02-26  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/modules/cups/gnome-print-cups.c:
	(option_list_new_with_default): implement
	(load_paper_sources, load_paper_sizes): use here
	fixes #106984, reported and patch by Owen Taylor <otaylor@redhat.com>

2003-02-26  Taneem Ahmed  <taneem@eyetap.org>

	* configure.in: Added "bn" to ALL_LINGUAS.

2003-02-18  Christian Rose  <menthos@menthos.com>

	* configure.in: Added "ga" to ALL_LINGUAS.

2003-02-18  Roozbeh Pournader  <roozbeh@sharif.edu>

	* configure.in: Added "fa" to ALL_LINGUAS.

2003-02-14  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-job.c (gnome_print_job_get_pages):
	g_return_val_if_fail if the job has not been closed.

2003-02-13  Chema Celorio  <chema@celorio.com>

	* configure.in: add check for zlib, fixes #105819

	* libgnomeprint/gnome-fontmap.h: add ->is_alias to GPFamilyEntry

	* libgnomeprint/gnome-fontmap.c (gp_fontmap_sort): make Families
	as alias/non-alias entries.
	(gnome_font_family_list): don't append entries

2003-02-11  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-config.c (gnome_print_config_get_option):
	implement

2003-02-11  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-config.c (gnome_print_config_insert_options):
	Implement

2003-02-11  Christopher James Lahey <clahey@ximian.com>

	* libgnomeprint/modules/cups/gnome-print-cups-transport.c (gp_transport_cups_print_file):
	implement

	* libgnomeprint/gnome-print-transport.h: add a print_file method to
	TransportClass

	* libgnomeprint/gnome-print-transport.c (gnome_print_transport_print_file):
	implement.
	(gnome_print_transport_real_print_file): implement.

	* libgnomeprint/gnome-print-job.h: add set file, guarded by
	GNOME_PRINT_UNSTABLE_API

	* libgnomeprint/gnome-print-job.c (gnome_print_job_set_file):
	implement.
	* add g_return_val_if_fails to make sure apps do not mix usage
	of gnome_print_job_set_file and gnome-print postscript like commands.

	* libgnomeprint/gnome-print-job-private.h: add ->input_file

2003-02-11  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print.c (gnome_print_context_close): we know
	the error type if something failed. Return ret rather than _ERR_UNKNOWN

2003-02-11  Chema Celorio  <chema@celorio.com>

	* configure.in: add libtool versioning

	* libgnomeprint/Makefile.am (LDFLAGS): add -version-info

	* libgnomeprint/modules/cups/Makefile.am (libgnomeprintcups_la_LDFLAGS):
	remove PLUGIN_LIBTOOL_CFLAGS from _la_LDFLAGS

2003-02-10  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gpa/gpa-settings.c (gpa_settings_append_stock_nodes):
	implement.
	(gpa_settings_new): and use here

	* libgnomeprint/gpa/gpa-option.c (gpa_option_duplicate): copy
	the LOCKED_FLAG when duplicating an option
	(gpa_option_create_key): handle _LOCKED_FLAG
	(gpa_option_new_from_tree): read "Locked" from xml tree

	* libgnomeprint/gpa/gpa-node-private.h: fix LOCKED_FLAG

	* libgnomeprint/gpa/gpa-key.c (gpa_key_duplicate): if the option
	had FLAG_LOCKED, the key should have it too
	(gpa_key_set_value): add support for synthetic keys needed
	for gnome_print_config_add_{type}
	(gpa_key_insert): implement

	* libgnomeprint/gpa/gpa-config.c (gpa_config_new): don't duplicate
	settings as multiple settings are not supported. We are not using
	gpa_list (of settings) correctly. We need not only _default for lists
	but _active or _selected. We are using _default to tag both defaults
	and selected settings.

	* libgnomeprint/gnome-print-config.h: add g-p-c-insert-boolean,
	remove duplicated GnomePrintConfig key. Update G_P_C_K_OUTPUT_FILENAME

	* libgnomeprint/gnome-print-config.c (gnome_print_config_keys_compat):
	implement to keep backward compatibility with keys.
	(gnome_print_config_get): use compat
	(gnome_print_config_insert_boolean): implement. Experimental at this
	point and guarded with GNOME_PRINT_UNSTABLE_API in .h file. Allows
	applications to insert nodes into a GnomePrintConfig

2003-02-10  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-transport.c (gnome_print_transport_new): if PrintToFile
	is true, set module to libgnomeprint-file.so.

	* libgnomeprint/transports/gp-transport-file.c (gp_transport_file_construct):
	get filename from Settings.Output.Job.FileName

	* libgnomeprint/modules/cups/gnome-print-cups.c: add Output.Job.FileName
	& Output.Job.PrintToFile
	* data/models/GNOME-GENERIC-PS.xml.in: ditto
	* data/models/GNOME-PDF-WRITER.xml.in: ditto

2003-02-07  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/modules/cups/gnome-print-cups.c: Don't append the
	Document subtree as gpa_settings_new does it for all settings.

2003-02-06  Christian Rose  <menthos@menthos.com>

	* configure.in: Added "id" to ALL_LINGUAS.

2003-02-02  Chema Celorio  <chema@celorio.com>

	* Makefile.am (mydistcheck): use $(AMTAR) rather than $(TAR) which
	I guess is needed because I am using a newer automake.

	* libgnomeprint/gnome-fontmap.c (fcpattern_to_gp_font_entry_alias):
	Fix #105006

2003-02-02  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gpa/gpa-settings.c (gpa_settings_finalize): only
	gpa_node_unref settings->printer when it is not NULL. Settings can
	be unatached to a printer in some cases

2003-02-02  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-print-ps2.c: allow us to embed two fonts
	who happen to have the same Postscript name. See #105063.
	(gnome_print_ps2_init): create fonts_hash
	(gnome_print_ps2_finalize): destroy fonts_hash
	(gnome_print_ps2_set_font_real): when creating PSOs, specify
	which instance of the psname the font is for.

	* libgnomeprint/gnome-font-face.c (gnome_font_face_pso_new):
	add a "instance" argument that allows us to embed to fonts
	who happen to have the same postscript name. Set ->encodedname
	accordingly to the instance

	* libgnomeprint/gnome-print-pdf.c (gnome_print_pdf_set_font_real):
	when creating a pso, pass 0 as the instance.

	* libgnomeprint/gnome-font-private.h: update _pso_new's prototype,
	update the description of GnomeFontPsObject->encodedname.

	* tests/simple.c: add file used for simple code to test or
	replicate a bug.
	* tests/Makefile.am: add simple to Makefile

2003-02-01  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gnome-font-family.c (gnome_font_family_style_list):
	Don't return duplicated styles, the font-dialog no longer displays
	duplicated styles.

2003-01-31  Chema Celorio  <chema@celorio.com>

	* libgnomeprint/gp-gc.c (gp_gc_get_linecap): Fix the first
	part of #104932. Spotted by jean.brefort@ac-dijon.fr

	* libgnomeprint/gnome-font-face.c (gff_load_outline):
	Fix #104754

	* libgnomeprint/gnome-fontmap.c (fcpattern_to_gp_font_entry):
	Fix #104710, patch from Akira TAGOH

	* configure.in (gtk_doc_min_version): don't need to check
	for "gtk-doc > 0.10". 0.9 is good enough

	* libgnomeprint/modules/cups/gnome-print-cups.c: add
	Output.Job.Copies & Output.Job.Collate
	* data/models/GNOME-PDF-WRITER.xml: same here

	* libgnomeprint/gpa/gpa-list.[ch]: fix a typo s/defalt/default/
	* libgnomeprint/gpa/gpa-printer.c: here too

2003-01-31  Chema Celorio  <chema@celorio.com>

	* configure.in (cups_msg): make the "cups not installed" message a little
	bit more explicit

2003-01-28  Chema Celorio  <chema@celorio.com>

	* doc/reference/Makefile.am: install API docs in
	$(HTML_DIR)/libgnomeprint-2.2 so that it parallel installs with
	libgnomeprint-devel (1.116.x)

2003-01-27  Chema Celorio  <chema@celorio.com>

	* configure.in: bump version to 2.3.0.

	* libgnomeprint/gnome-print-pdf-t1.c (gnome_print_pdf_t1_determine_lengths_pfa):
	remove a compile time warning that might break non gcc compilations. Spotted
	by Chris Lahey <clahey@ximian.com>

5 files changed, 63 insertions, 62 deletions

diff --git a/print/libgnomeprint/Makefile b/print/libgnomeprint/Makefile
index ebcefa8772d..a96cfa08b31 100644
--- a/print/libgnomeprint/Makefile
+++ b/print/libgnomeprint/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.19 2003/11/14 11:48:57 adam Exp $
+# $NetBSD: Makefile,v 1.20 2003/12/14 19:51:04 jmmv Exp $
 #
 
-DISTNAME=		libgnomeprint-2.2.1.2
-PKGREVISION=		3
+DISTNAME=		libgnomeprint-2.4.0
 CATEGORIES=		print gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprint/2.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprint/2.4/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@NetBSD.org
@@ -33,8 +32,10 @@ BUILD_DEFS+=		USE_CUPS
 .if defined(USE_CUPS) && !empty(USE_CUPS:M[Yy][Ee][Ss])
 .include "../../print/cups/buildlink2.mk"
 CONFIGURE_ARGS+=	--with-cups
+PLIST_SUBST+=		USE_CUPS=
 .else
 CONFIGURE_ARGS+=	--without-cups
+PLIST_SUBST+=		USE_CUPS="@comment "
 .endif
 
 .if ${OPSYS} == "Darwin"
@@ -43,10 +44,11 @@ CONFIGURE_ARGS+=	--without-cups
 CONFIGURE_ENV+=		libltdl_cv_shlibext=so
 .endif
 
-.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
+.include "../../devel/pkgconfig/buildlink2.mk"
+.include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/libgnomeprint/PLIST b/print/libgnomeprint/PLIST
index c5c0d62f5f2..7de56ec5a87 100644
--- a/print/libgnomeprint/PLIST
+++ b/print/libgnomeprint/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2003/03/12 13:03:30 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.6 2003/12/14 19:51: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
@@ -12,6 +12,7 @@ include/libgnomeprint-2.2/libgnomeprint/gnome-rfont.h
 include/libgnomeprint-2.2/libgnomeprint/gp-gc.h
 include/libgnomeprint-2.2/libgnomeprint/libgnomeprint-enum-types.h
 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-private.h
@@ -31,46 +32,49 @@ include/libgnomeprint-2.2/libgnomeprint/private/gpa-utils.h
 lib/libgnomeprint-2-2.a
 lib/libgnomeprint-2-2.la
 lib/libgnomeprint-2-2.so
-lib/libgnomeprint-2-2.so.0
-lib/libgnomeprint-2-2.so.0.0
+lib/libgnomeprint-2-2.so.1
+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/transports/libgnomeprint-custom.a
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so
-lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so.0
-lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.so.0.0
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.a
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.la
 lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so
-lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so.0
-lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.so.0.0
 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/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so.0
-lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.so.0.0
 lib/pkgconfig/libgnomeprint-2.2.pc
-share/doc/html/libgnomeprint-2.2/index.html
-share/doc/html/libgnomeprint-2.2/index.sgml
-share/doc/html/libgnomeprint-2.2/libgnomeprint-building.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-compiling.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-font-face.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-font.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-glyphlist.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-pgl.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-config.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-job.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-paper.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print-unit.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-print.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-gnome-rfont.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint-resources.html
-share/doc/html/libgnomeprint-2.2/libgnomeprint.html
-share/doc/html/libgnomeprint-2.2/libgnomeprintunsorted.html
+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/libgnomeprint/${PKGVERSION}/globals.xml
 share/libgnomeprint/${PKGVERSION}/models/GNOME-GENERIC-PS.xml
 share/libgnomeprint/${PKGVERSION}/models/GNOME-PDF-WRITER.xml
+share/libgnomeprint/${PKGVERSION}/models/uninstalled/GNOME-META.xml
 share/libgnomeprint/${PKGVERSION}/printers/GENERIC.xml
 share/libgnomeprint/${PKGVERSION}/printers/PDF-WRITER.xml
+share/libgnomeprint/${PKGVERSION}/printers/uninstalled/META.xml
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -79,6 +83,7 @@ ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/bn/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
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -96,7 +101,10 @@ ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeprint-2.2.mo
@@ -109,19 +117,25 @@ ${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprint-2.2.mo
+${PKGLOCALEDIR}/locale/th/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprint-2.2.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprint-2.2.mo
+@dirrm share/libgnomeprint/${PKGVERSION}/printers/uninstalled
 @dirrm share/libgnomeprint/${PKGVERSION}/printers
+@dirrm share/libgnomeprint/${PKGVERSION}/models/uninstalled
 @dirrm share/libgnomeprint/${PKGVERSION}/models
 @dirrm share/libgnomeprint/${PKGVERSION}
 @dirrm share/libgnomeprint
-@dirrm share/doc/html/libgnomeprint-2.2
+@dirrm share/doc/html/libgnomeprint
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules/transports
 @dirrm lib/libgnomeprint/${PKGVERSION}/modules
 @dirrm lib/libgnomeprint/${PKGVERSION}
diff --git a/print/libgnomeprint/buildlink2.mk b/print/libgnomeprint/buildlink2.mk
index 9657f13aee5..53fc46cc493 100644
--- a/print/libgnomeprint/buildlink2.mk
+++ b/print/libgnomeprint/buildlink2.mk
@@ -1,33 +1,35 @@
-# $NetBSD: buildlink2.mk,v 1.10 2003/11/12 01:31:51 salo Exp $
+# $NetBSD: buildlink2.mk,v 1.11 2003/12/14 19:51:04 jmmv Exp $
 #
 # This Makefile fragment is included by packages that use libgnomeprint.
 #
-# This file was created automatically using createbuildlink 2.4.
+# This file was created automatically using createbuildlink 2.8.
 #
 
 .if !defined(LIBGNOMEPRINT_BUILDLINK2_MK)
 LIBGNOMEPRINT_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgnomeprint
-BUILDLINK_DEPENDS.libgnomeprint?=	libgnomeprint>=2.2.1.2nb3
-BUILDLINK_PKGSRCDIR.libgnomeprint?=	../../print/libgnomeprint
+BUILDLINK_DEPENDS.libgnomeprint?=		libgnomeprint>=2.4.0
+BUILDLINK_PKGSRCDIR.libgnomeprint?=		../../print/libgnomeprint
 
 EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomeprint=libgnomeprint
 BUILDLINK_PREFIX.libgnomeprint_DEFAULT=	${LOCALBASE}
 BUILDLINK_FILES.libgnomeprint+=	include/libgnomeprint-2.2/libgnomeprint/*
 BUILDLINK_FILES.libgnomeprint+=	include/libgnomeprint-2.2/libgnomeprint/private/*
 BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint-2-2.*
-BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint/2.2.1.1/modules/transports/libgnomeprint-custom.*
-BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint/2.2.1.1/modules/transports/libgnomeprint-file.*
-BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint/2.2.1.1/modules/transports/libgnomeprint-lpr.*
-BUILDLINK_FILES.libgnomeprint+=	lib/pkgconfig/libgnomeprint-2.2.pc
+BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-custom.*
+BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-file.*
+BUILDLINK_FILES.libgnomeprint+=	lib/libgnomeprint/${PKGVERSION}/modules/transports/libgnomeprint-lpr.*
 
 .include "../../devel/gettext-lib/buildlink2.mk"
+.include "../../devel/glib2/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
 .include "../../devel/pango/buildlink2.mk"
-.include "../../devel/glib2/buildlink2.mk"
 .include "../../graphics/freetype2/buildlink2.mk"
 .include "../../graphics/libart2/buildlink2.mk"
+.if !empty(USE_CUPS:M[Yy][Ee][Ss])
+.include "../../print/cups/buildlink2.mk"
+.endif
 
 BUILDLINK_TARGETS+=	libgnomeprint-buildlink
 
diff --git a/print/libgnomeprint/distinfo b/print/libgnomeprint/distinfo
index f3e870ade2b..64f29e3a5ce 100644
--- a/print/libgnomeprint/distinfo
+++ b/print/libgnomeprint/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.5 2003/09/27 21:05:22 danw Exp $
+$NetBSD: distinfo,v 1.6 2003/12/14 19:51:04 jmmv Exp $
 
-SHA1 (libgnomeprint-2.2.1.2.tar.bz2) = f70ccfa4d0dc009dbaba4aea8e16df3086da7c85
-Size (libgnomeprint-2.2.1.2.tar.bz2) = 555140 bytes
+SHA1 (libgnomeprint-2.4.0.tar.bz2) = 397698448ccd377307b7e5620cd59912aafbe980
+Size (libgnomeprint-2.4.0.tar.bz2) = 652182 bytes
 SHA1 (patch-aa) = 54cf15d9caa7834f06cae48a792fc4716bc8a3f9
 SHA1 (patch-ab) = f7ac5151f12e25fa0a4a616a32a5abac963d7a03
diff --git a/print/libgnomeprint/patches/patch-ab b/print/libgnomeprint/patches/patch-ab
deleted file mode 100644
index 8bfde53b060..00000000000
--- a/print/libgnomeprint/patches/patch-ab
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2003/09/27 21:05:22 danw Exp $
-
---- libgnomeprint/transports/Makefile.in.orig	Mon Sep  1 10:27:21 2003
-+++ libgnomeprint/transports/Makefile.in	Mon Sep  1 10:27:41 2003
-@@ -144,11 +144,8 @@
- 	$(CUSTOM_LIB)
- 
- 
--CPPFLAGS = \
--	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"
--
--
- INCLUDES = \
-+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
- 	-I$(top_srcdir) \
- 	$(LIBGNOMEPRINT_CFLAGS)
-