Update to 2.2.1.1. Changes since 1.116.0 include:

* Makefile.am (mydistcheck): use $(AMTAR) rather than $(TAR) which I guess it
  has been changed in automake
* libgnomeprintui/gnome-print-preview.c (gpp_stroke): Fix the second part of
  #104932. Spotted by jean.brefort@ac-dijon.fr
* configure.in (gtk_doc_min_version): don't need to check for "gtk-doc > 0.10".
  0.9 is good enough
* libgnomeprintui/gnome-printui-marshal.list (VOID): generate the right
  marshaler
* libgnomeprintui/gnome-print-copies.c
  (gnome_print_copies_selector_class_init): use the marshaler that matches the
  function prototype
* configure.in: Added am ar el fi fr ga gl hr hu it lt nl nn no pt_BR sk tr uk
  to ALL_LINGUAS
* libgnomeprintui/gpaui/gpa-transport-selector.c
  (gpa_transport_selector_construct): fix #104319
* configure.in: post release version bump to 2.2.2
* configure.in: Added "mn" to ALL_LINGUAS.
* configure.in: release 2.2.1 to match libgnomeprint
* This is the gnome-2-2 branch

4 files changed, 97 insertions, 50 deletions

diff --git a/print/libgnomeprintui/Makefile b/print/libgnomeprintui/Makefile
index 8f4f26574aa..c1301740b97 100644
--- a/print/libgnomeprintui/Makefile
+++ b/print/libgnomeprintui/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.6 2003/01/10 07:47:21 cjep Exp $
+# $NetBSD: Makefile,v 1.7 2003/02/14 20:20:46 jmmv Exp $
 #
 
-DISTNAME=		libgnomeprintui-1.116.0
-PKGREVISION=		2
+DISTNAME=		libgnomeprintui-2.2.1.1
 CATEGORIES=		print gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprintui/1.116/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgnomeprintui/2.2/}
+EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		jmmv@netbsd.org
 HOMEPAGE=		http://www.levien.com/gnome/print-arch.html
@@ -16,11 +16,14 @@ GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_GMAKE=		yes
-USE_GNU_GETTEXT=	yes
 USE_X11=		yes
-
 USE_LIBTOOL=		yes
+
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+PKGCONFIG_OVERRIDE=	${WRKSRC}/libgnomeprintui/libgnomeprintui-2.2.pc.in
+
+CONFIGURE_ARGS=		--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
diff --git a/print/libgnomeprintui/PLIST b/print/libgnomeprintui/PLIST
index 11fff13c9ec..2c7816c724e 100644
--- a/print/libgnomeprintui/PLIST
+++ b/print/libgnomeprintui/PLIST
@@ -1,36 +1,73 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2002/09/12 04:28:27 rh Exp $
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-font-dialog.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-copies.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-dialog.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-master-preview.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-paper-selector.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-print-preview.h
-include/libgnomeprintui-2.0/libgnomeprintui/gnome-printer-dialog.h
-lib/libgnomeprintui-2.a
-lib/libgnomeprintui-2.la
-lib/libgnomeprintui-2.so
-lib/libgnomeprintui-2.so.0
-lib/libgnomeprintui-2.so.0.0
-lib/pkgconfig/libgnomeprintui-2.0.pc
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/wa/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgnomeprintui.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgnomeprintui.mo
-@dirrm include/libgnomeprintui-2.0/libgnomeprintui
-@dirrm include/libgnomeprintui-2.0
+@comment $NetBSD: PLIST,v 1.2 2003/02/14 20:20:47 jmmv Exp $
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-font-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-dialog.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-job-preview.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-paper-selector.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-preview.h
+include/libgnomeprintui-2.2/libgnomeprintui/gnome-print-unit-selector.h
+lib/libgnomeprintui-2-2.a
+lib/libgnomeprintui-2-2.la
+lib/libgnomeprintui-2-2.so
+lib/libgnomeprintui-2-2.so.0
+lib/libgnomeprintui-2-2.so.0.0
+lib/pkgconfig/libgnomeprintui-2.2.pc
+share/doc/html/libgnomeprintui/c7.html
+share/doc/html/libgnomeprintui/index.html
+share/doc/html/libgnomeprintui/index.sgml
+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
+${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeprintui-2.2.mo
+${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/ca/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/lv/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/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
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ro/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/ta/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgnomeprintui-2.2.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgnomeprintui-2.2.mo
+${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 include/libgnomeprintui-2.2/libgnomeprintui
+@dirrm include/libgnomeprintui-2.2
diff --git a/print/libgnomeprintui/buildlink2.mk b/print/libgnomeprintui/buildlink2.mk
index 751da8a047b..6b1322a4ea6 100644
--- a/print/libgnomeprintui/buildlink2.mk
+++ b/print/libgnomeprintui/buildlink2.mk
@@ -1,17 +1,24 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:10:23 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:20:47 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use libgnomeprintui.
+#
+# This file was created automatically using createbuildlink 2.4.
+#
 
 .if !defined(LIBGNOMEPRINTUI_BUILDLINK2_MK)
 LIBGNOMEPRINTUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=			libgnomeprintui
-BUILDLINK_DEPENDS.libgnomeprintui?=	libgnomeprintui>=1.116.0nb2
+BUILDLINK_DEPENDS.libgnomeprintui?=	libgnomeprintui>=2.2.1.1
 BUILDLINK_PKGSRCDIR.libgnomeprintui?=	../../print/libgnomeprintui
 
-EVAL_PREFIX+=		BUILDLINK_PREFIX.libgnomeprintui=libgnomeprintui
+EVAL_PREFIX+=	BUILDLINK_PREFIX.libgnomeprintui=libgnomeprintui
 BUILDLINK_PREFIX.libgnomeprintui_DEFAULT=	${LOCALBASE}
-BUILDLINK_FILES.libgnomeprintui=	include/libgnomeprintui-2.0/libgnomeprintui/*
-BUILDLINK_FILES.libgnomeprintui+=	lib/libgnomeprintui-2.*
+BUILDLINK_FILES.libgnomeprintui+=	include/libgnomeprintui-2.2/libgnomeprintui/*
+BUILDLINK_FILES.libgnomeprintui+=	lib/libgnomeprintui-2-2.*
+BUILDLINK_FILES.libgnomeprintui+=	lib/pkgconfig/libgnomeprintui-2.2.pc
 
+.include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../devel/GConf2/buildlink2.mk"
 .include "../../devel/bonobo-activation/buildlink2.mk"
 .include "../../devel/libbonobo/buildlink2.mk"
diff --git a/print/libgnomeprintui/distinfo b/print/libgnomeprintui/distinfo
index 3421399b5ff..d34a8530541 100644
--- a/print/libgnomeprintui/distinfo
+++ b/print/libgnomeprintui/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1.1.1 2002/09/12 04:28:27 rh Exp $
+$NetBSD: distinfo,v 1.2 2003/02/14 20:20:47 jmmv Exp $
 
-SHA1 (libgnomeprintui-1.116.0.tar.gz) = ea5c69400f4cb1f930e797d42dd2df8be4319c2f
-Size (libgnomeprintui-1.116.0.tar.gz) = 371507 bytes
+SHA1 (libgnomeprintui-2.2.1.1.tar.bz2) = cf87606b7d5d20841a865c845e2e17cc34dd0a09
+Size (libgnomeprintui-2.2.1.1.tar.bz2) = 429211 bytes