Updated to 2.2.0.1. Changes from 2.0.6:

* configure.in (LIBGNOMEUI_AGE): Add EXTRAVERSION and set to .1
* libgnomeui/Makefile.am (libgnomeui_2_la_LDFLAGS): Correct version number bug
* configure.in: Added "mn" to ALL_LINGUAS.
* configure.in: Fixup libtool versioning and release 2.2.0
* configure.in: Added Amharic (am), Arabic (ar), Macedonian (mk) and Dutch
  (nl) to ALL_LINGUAS.
* libgnomeui/gnome-icon-theme.c (theme_lookup_icon): Don't scale up unless we
  have to. Scaling down gives much better results.
* libgnomeui/gnome-uidefs.h (GNOME_KEY_MOD_PAUSE_GAME): Use GDK_Pause as the
  pause key. #92358.
* libgnomeui/gnome-app-helper.c: (gnome_app_install_statusbar_menu_hints):
  Apply fix for #102812, by Tom Ball.
* libgnomeui/gnome-popup-menu.c: (gnome_popup_menu_do_popup_modal): Apply fix
  for #96899, by Erwann Chenede.

devel/libgnomeui/Makefile

@@ -1,17 +1,17 @@
-# $NetBSD: Makefile,v 1.7 2003/01/04 11:38:28 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2003/02/14 20:16:19 jmmv Exp $
 #
 
-DISTNAME=	libgnomeui-2.0.6
+DISTNAME=	libgnomeui-2.2.0.1
 CATEGORIES=	devel gnome
-MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.0/}
+MASTER_SITES=	${MASTER_SITE_GNOME:=sources/libgnomeui/2.2/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	jmmv@netbsd.org
 HOMEPAGE=	http://www.gnome.org/
 COMMENT=	Core GNOME2 graphical libraries
 
-BUILD_DEPENDS+=		gtk-doc>=0.6:../../textproc/gtk-doc
 BUILD_USES_MSGFMT=	yes
+DEPENDS=		gnome2-dirs>=1.0:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
@@ -20,6 +20,9 @@ USE_GMAKE=		yes
 USE_PERL5=		yes
 USE_X11=		yes
 
+CONFIGURE_ARGS+=	--enable-gtk-doc=no
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
+
 USE_LIBTOOL=		yes
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 

devel/libgnomeui/PLIST

@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2003/01/04 11:38:28 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.4 2003/02/14 20:16:19 jmmv Exp $
 include/libgnomeui-2.0/gnome.h
 include/libgnomeui-2.0/libgnomeui/gnome-about.h
 include/libgnomeui-2.0/libgnomeui/gnome-app-helper.h
@@ -22,7 +22,9 @@ include/libgnomeui-2.0/libgnomeui/gnome-ice.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-entry.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-item.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-list.h
+include/libgnomeui-2.0/libgnomeui/gnome-icon-lookup.h
 include/libgnomeui-2.0/libgnomeui/gnome-icon-sel.h
+include/libgnomeui-2.0/libgnomeui/gnome-icon-theme.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-child.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-generic-child.h
 include/libgnomeui-2.0/libgnomeui/gnome-mdi-session.h
@@ -34,6 +36,8 @@ include/libgnomeui-2.0/libgnomeui/gnome-popup-menu.h
 include/libgnomeui-2.0/libgnomeui/gnome-propertybox.h
 include/libgnomeui-2.0/libgnomeui/gnome-scores.h
 include/libgnomeui-2.0/libgnomeui/gnome-stock-icons.h
+include/libgnomeui-2.0/libgnomeui/gnome-theme-parser.h
+include/libgnomeui-2.0/libgnomeui/gnome-thumbnail.h
 include/libgnomeui-2.0/libgnomeui/gnome-types.h
 include/libgnomeui-2.0/libgnomeui/gnome-ui-init.h
 include/libgnomeui-2.0/libgnomeui/gnome-uidefs.h
@@ -48,57 +52,108 @@ lib/libglade/2.0/libgnome.so
 lib/libgnomeui-2.a
 lib/libgnomeui-2.la
 lib/libgnomeui-2.so
-lib/libgnomeui-2.so.0
-lib/libgnomeui-2.so.0.0
+lib/libgnomeui-2.so.200
+lib/libgnomeui-2.so.200.0
 lib/pkgconfig/libgnomeui-2.0.pc
 libexec/gnome_segv2
-share/gtk-doc/html/libgnomeui/c4.html
-share/gtk-doc/html/libgnomeui/gnomeabout.html
-share/gtk-doc/html/libgnomeui/gnomeapp.html
-share/gtk-doc/html/libgnomeui/gnomeappbar.html
-share/gtk-doc/html/libgnomeui/gnomeclient.html
-share/gtk-doc/html/libgnomeui/gnomecolorpicker.html
-share/gtk-doc/html/libgnomeui/gnomedateedit.html
-share/gtk-doc/html/libgnomeui/gnomedialog.html
-share/gtk-doc/html/libgnomeui/gnomedruid.html
-share/gtk-doc/html/libgnomeui/gnomedruidpage.html
-share/gtk-doc/html/libgnomeui/gnomedruidpageedge.html
-share/gtk-doc/html/libgnomeui/gnomedruidpagestandard.html
-share/gtk-doc/html/libgnomeui/gnomeentry.html
-share/gtk-doc/html/libgnomeui/gnomefileentry.html
-share/gtk-doc/html/libgnomeui/gnomefontpicker.html
-share/gtk-doc/html/libgnomeui/gnomehref.html
-share/gtk-doc/html/libgnomeui/gnomeiconentry.html
-share/gtk-doc/html/libgnomeui/gnomeiconlist.html
-share/gtk-doc/html/libgnomeui/gnomeiconselection.html
-share/gtk-doc/html/libgnomeui/gnomemdi.html
-share/gtk-doc/html/libgnomeui/gnomemdichild.html
-share/gtk-doc/html/libgnomeui/gnomemdigenericchild.html
-share/gtk-doc/html/libgnomeui/gnomemessagebox.html
-share/gtk-doc/html/libgnomeui/gnomepixmap.html
-share/gtk-doc/html/libgnomeui/gnomepixmapentry.html
-share/gtk-doc/html/libgnomeui/gnomepropertybox.html
-share/gtk-doc/html/libgnomeui/gnomescores.html
-share/gtk-doc/html/libgnomeui/index.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-app-helper.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-app-util.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-dialog-util.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-mdi-session.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-popup-menu.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-stock-icons.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-types.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-ui-init.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-uidefs.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-vfs-util.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnome-window.html
-share/gtk-doc/html/libgnomeui/libgnomeui-gnometypebuiltins.html
-share/gtk-doc/html/libgnomeui/libgnomeui-objects.html
-share/gtk-doc/html/libgnomeui/x1495.html
-share/gtk-doc/html/libgnomeui/x15980.html
-share/gtk-doc/html/libgnomeui/x18473.html
-share/gtk-doc/html/libgnomeui/x6263.html
-share/gtk-doc/html/libgnomeui/x8080.html
+share/doc/html/libgnomeui/application-mgmt.html
+share/doc/html/libgnomeui/c4.html
+share/doc/html/libgnomeui/deprecated.html
+share/doc/html/libgnomeui/druids.html
+share/doc/html/libgnomeui/fixme.html
+share/doc/html/libgnomeui/gnomeabout.html
+share/doc/html/libgnomeui/gnomeapp.html
+share/doc/html/libgnomeui/gnomeappbar.html
+share/doc/html/libgnomeui/gnomeclient.html
+share/doc/html/libgnomeui/gnomecolorpicker.html
+share/doc/html/libgnomeui/gnomedateedit.html
+share/doc/html/libgnomeui/gnomedialog.html
+share/doc/html/libgnomeui/gnomedruid.html
+share/doc/html/libgnomeui/gnomedruidpage.html
+share/doc/html/libgnomeui/gnomedruidpageedge.html
+share/doc/html/libgnomeui/gnomedruidpagestandard.html
+share/doc/html/libgnomeui/gnomeentry.html
+share/doc/html/libgnomeui/gnomefileentry.html
+share/doc/html/libgnomeui/gnomefontpicker.html
+share/doc/html/libgnomeui/gnomehref.html
+share/doc/html/libgnomeui/gnomeiconentry.html
+share/doc/html/libgnomeui/gnomeiconlist.html
+share/doc/html/libgnomeui/gnomeiconselection.html
+share/doc/html/libgnomeui/gnomemdi.html
+share/doc/html/libgnomeui/gnomemdichild.html
+share/doc/html/libgnomeui/gnomemdigenericchild.html
+share/doc/html/libgnomeui/gnomemessagebox.html
+share/doc/html/libgnomeui/gnomepixmap.html
+share/doc/html/libgnomeui/gnomepixmapentry.html
+share/doc/html/libgnomeui/gnomepropertybox.html
+share/doc/html/libgnomeui/gnomescores.html
+share/doc/html/libgnomeui/index.html
+share/doc/html/libgnomeui/index.sgml
+share/doc/html/libgnomeui/libgnomeui-gnome-app-helper.html
+share/doc/html/libgnomeui/libgnomeui-gnome-app-util.html
+share/doc/html/libgnomeui/libgnomeui-gnome-dialog-util.html
+share/doc/html/libgnomeui/libgnomeui-gnome-gconf-ui.html
+share/doc/html/libgnomeui/libgnomeui-gnome-ice.html
+share/doc/html/libgnomeui/libgnomeui-gnome-macros.html
+share/doc/html/libgnomeui/libgnomeui-gnome-mdi-session.html
+share/doc/html/libgnomeui/libgnomeui-gnome-popup-menu.html
+share/doc/html/libgnomeui/libgnomeui-gnome-stock-icons.html
+share/doc/html/libgnomeui/libgnomeui-gnome-types.html
+share/doc/html/libgnomeui/libgnomeui-gnome-ui-init.html
+share/doc/html/libgnomeui/libgnomeui-gnome-uidefs.html
+share/doc/html/libgnomeui/libgnomeui-gnome-vfs-util.html
+share/doc/html/libgnomeui/libgnomeui-gnome-window.html
+share/doc/html/libgnomeui/libgnomeui-gnomeabout.html
+share/doc/html/libgnomeui/libgnomeui-gnomeapp.html
+share/doc/html/libgnomeui/libgnomeui-gnomeappbar.html
+share/doc/html/libgnomeui/libgnomeui-gnomeclient.html
+share/doc/html/libgnomeui/libgnomeui-gnomecolorpicker.html
+share/doc/html/libgnomeui/libgnomeui-gnomedateedit.html
+share/doc/html/libgnomeui/libgnomeui-gnomedialog.html
+share/doc/html/libgnomeui/libgnomeui-gnomedruid.html
+share/doc/html/libgnomeui/libgnomeui-gnomedruidpage.html
+share/doc/html/libgnomeui/libgnomeui-gnomedruidpageedge.html
+share/doc/html/libgnomeui/libgnomeui-gnomedruidpagestandard.html
+share/doc/html/libgnomeui/libgnomeui-gnomeentry.html
+share/doc/html/libgnomeui/libgnomeui-gnomefileentry.html
+share/doc/html/libgnomeui/libgnomeui-gnomefontpicker.html
+share/doc/html/libgnomeui/libgnomeui-gnomehref.html
+share/doc/html/libgnomeui/libgnomeui-gnomeiconentry.html
+share/doc/html/libgnomeui/libgnomeui-gnomeiconlist.html
+share/doc/html/libgnomeui/libgnomeui-gnomeiconlookup.html
+share/doc/html/libgnomeui/libgnomeui-gnomeiconselection.html
+share/doc/html/libgnomeui/libgnomeui-gnomeicontheme.html
+share/doc/html/libgnomeui/libgnomeui-gnomemdi.html
+share/doc/html/libgnomeui/libgnomeui-gnomemdichild.html
+share/doc/html/libgnomeui/libgnomeui-gnomemdigenericchild.html
+share/doc/html/libgnomeui/libgnomeui-gnomemessagebox.html
+share/doc/html/libgnomeui/libgnomeui-gnomepixmap.html
+share/doc/html/libgnomeui/libgnomeui-gnomepixmapentry.html
+share/doc/html/libgnomeui/libgnomeui-gnomepropertybox.html
+share/doc/html/libgnomeui/libgnomeui-gnomescores.html
+share/doc/html/libgnomeui/libgnomeui-gnomethemefile.html
+share/doc/html/libgnomeui/libgnomeui-gnomethumbnail.html
+share/doc/html/libgnomeui/libgnomeui-gnometypebuiltins.html
+share/doc/html/libgnomeui/libgnomeui-objects.html
+share/doc/html/libgnomeui/miscellaneous.html
+share/doc/html/libgnomeui/x1427.html
+share/doc/html/libgnomeui/x1495.html
+share/doc/html/libgnomeui/x15441.html
+share/doc/html/libgnomeui/x15454.html
+share/doc/html/libgnomeui/x15523.html
+share/doc/html/libgnomeui/x15980.html
+share/doc/html/libgnomeui/x17879.html
+share/doc/html/libgnomeui/x17892.html
+share/doc/html/libgnomeui/x17961.html
+share/doc/html/libgnomeui/x18473.html
+share/doc/html/libgnomeui/x6079.html
+share/doc/html/libgnomeui/x6088.html
+share/doc/html/libgnomeui/x6263.html
+share/doc/html/libgnomeui/x7838.html
+share/doc/html/libgnomeui/x7859.html
+share/doc/html/libgnomeui/x8080.html
 ${PKGLOCALEDIR}/locale/am/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/libgnomeui-2.0.mo
@@ -112,6 +167,7 @@ ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/et/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/he/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgnomeui-2.0.mo
@@ -119,7 +175,10 @@ ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/lt/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/mk/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgnomeui-2.0.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgnomeui-2.0.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgnomeui-2.0.mo
@@ -143,7 +202,7 @@ share/pixmaps/gnome-error.png
 share/pixmaps/gnome-info.png
 share/pixmaps/gnome-question.png
 share/pixmaps/gnome-warning.png
-@dirrm share/gtk-doc/html/libgnomeui
-@unexec ${RMDIR} -p %D/share/gtk-doc/html 2>/dev/null || ${TRUE}
-@dirrm include/libgnomeui-2.0/libgnomeui
-@dirrm include/libgnomeui-2.0
+@dirrm share/doc/html/libgnomeui
+@comment in libglade2: @dirrm lib/libglade/2.0
+@comment in gnome2-dirs: @dirrm include/libgnomeui-2.0/libgnomeui
+@comment in gnome2-dirs: @dirrm include/libgnomeui-2.0

devel/libgnomeui/buildlink2.mk

@@ -1,10 +1,10 @@
-# $NetBSD: buildlink2.mk,v 1.4 2002/12/24 06:09:57 wiz Exp $
+# $NetBSD: buildlink2.mk,v 1.5 2003/02/14 20:16:20 jmmv Exp $
 
 .if !defined(LIBGNOMEUI_BUILDLINK2_MK)
 LIBGNOMEUI_BUILDLINK2_MK=	# defined
 
 BUILDLINK_PACKAGES+=		libgnomeui
-BUILDLINK_DEPENDS.libgnomeui?=	libgnomeui>=2.0.5nb2
+BUILDLINK_DEPENDS.libgnomeui?=	libgnomeui>=2.2.0.1
 BUILDLINK_PKGSRCDIR.libgnomeui?=	../../devel/libgnomeui
 
 EVAL_PREFIX+=			BUILDLINK_PREFIX.libgnomeui=libgnomeui
@@ -13,6 +13,7 @@ BUILDLINK_FILES.libgnomeui=	include/libgnomeui-2.0/libgnomeui/*
 BUILDLINK_FILES.libgnomeui+=	include/libgnomeui-2.0/*
 BUILDLINK_FILES.libgnomeui+=	lib/libglade/2.0/libgnome.*
 BUILDLINK_FILES.libgnomeui+=	lib/libgnomeui-2.*
+BUILDLINK_FILES.libgnomeui+=	lib/pkgconfig/libgnomeui-2.0.pc
 
 .include "../../audio/esound/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"

devel/libgnomeui/distinfo

@@ -1,6 +1,4 @@
-$NetBSD: distinfo,v 1.2 2003/01/04 11:38:28 jmmv Exp $
+$NetBSD: distinfo,v 1.3 2003/02/14 20:16:20 jmmv Exp $
 
-SHA1 (libgnomeui-2.0.6.tar.bz2) = feb691206743714df19df0cf33f5a986f6395da1
-Size (libgnomeui-2.0.6.tar.bz2) = 1002552 bytes
-SHA1 (patch-aa) = 691778ec52bdeeb2ba5916a871862ad9dfd62908
-SHA1 (patch-ab) = 00a81e9a2c81da1926c7a5bfcad615186debe7b5
+SHA1 (libgnomeui-2.2.0.1.tar.bz2) = 1f9a404a09764c99d55d26b24e7fa5df42d259ac
+Size (libgnomeui-2.2.0.1.tar.bz2) = 1129048 bytes

devel/libgnomeui/patches/patch-aa

@@ -1,24 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2002/09/12 01:21:58 rh Exp $
-
---- doc/reference/Makefile.am.orig	Fri Sep  6 17:41:00 2002
-+++ doc/reference/Makefile.am	Fri Sep  6 17:41:21 2002
-@@ -150,8 +150,8 @@
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+	  echo '-- Installing $(srcdir)/html/index.html' ; \
-+	  $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- 	fi)
- 
- #
-@@ -171,7 +171,7 @@
- 	mkdir $(distdir)/html
- 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
--	-cp $(srcdir)/html/index.sgml $(distdir)/html
-+	-cp $(srcdir)/html/index.html $(distdir)/html
- 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
- 
- 	images=$(HTML_IMAGES) ;    	      \

devel/libgnomeui/patches/patch-ab

@@ -1,24 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2002/09/12 01:21:58 rh Exp $
-
---- doc/reference/Makefile.in.orig	Fri Sep  6 17:41:03 2002
-+++ doc/reference/Makefile.in	Fri Sep  6 17:41:33 2002
-@@ -359,8 +359,8 @@
- 	    echo '-- Installing '$$i ; \
- 	    $(INSTALL_DATA) $$i $(DESTDIR)$(TARGET_DIR); \
- 	  done; \
--	  echo '-- Installing $(srcdir)/html/index.sgml' ; \
--	  $(INSTALL_DATA) $(srcdir)/html/index.sgml $(DESTDIR)$(TARGET_DIR); \
-+	  echo '-- Installing $(srcdir)/html/index.html' ; \
-+	  $(INSTALL_DATA) $(srcdir)/html/index.html $(DESTDIR)$(TARGET_DIR); \
- 	fi)
- 
- #
-@@ -377,7 +377,7 @@
- 	mkdir $(distdir)/html
- 	-cp $(srcdir)/tmpl/*.sgml $(distdir)/tmpl
- 	-cp $(srcdir)/sgml/*.sgml $(distdir)/sgml
--	-cp $(srcdir)/html/index.sgml $(distdir)/html
-+	-cp $(srcdir)/html/index.html $(distdir)/html
- 	-cp $(srcdir)/html/*.html $(srcdir)/html/*.css $(distdir)/html
- 
- 	images=$(HTML_IMAGES) ;    	      \