Update to 0.10.6 and bl3ify. Changes:

2004-02-09  Bill Haneman <billh@gnome.org>

	* configure.in: Revved to 0.10.6.

	Re-dist to fix libtool problem.

2004-02-06  Robert Sedak  <robert.sedak@sk.htnet.hr>

        * configure.in: Added "hr" (Croatian) to ALL_LINGUAS.

2003-01-08  Brian Cameron <Brian.Cameron@sun.com>

	* magnifier/zoom-region.c: Fix pan test so that it does not
	call zoom_region_process_updates if the delta is 0.  This
	should fix the problem with Frame Rate being assigned
	unreasonable values.  Also fixed the counter so it exits
	the pan test after the correct number of iterations.

2003-01-06  Brian Cameron <Brian.Cameron@sun.com>

	* magnifier/zoom-region.c: Properly reset max totals.

2003-12-20  Arafat Medini <lumina@silverpen.de>

	* configure.in: Added Arabic locale "ar"  to ALL_LINGUAS

2003-12-17  Brian Cameron <Brian.Cameron@sun.com>

	* magnifier/zoom-region.c:
	Now cache gc's, so there is less X-traffic.
	* magnifier/magnifier-main.c:
	Properly abort if user specifies a pantest but does not supply
	a number of iterations via --timing-iterations.  Corrected bug
	with exit-magnifier property not being set properly during the
	update test.

2003-12-11  Bill Haneman <billh@gnome.org>

	* magnifier/magnifier.c:
	Fixed compile issue in magnifier_expose_filter.
	Thanks to Kaushal Kumar for catching the problem.

2003-12-10  Tõivo Leedjärv  <toivo@linux.ee>

	* configure.in: Added et to ALL_LINGUAS.

2003-12-10  Bill Haneman <billh@gnome.org>

	* magnifier/zoom-region.c:
	(zoom_region_update): Changed use of deprecated
	gdk_pixbuf_render_to_drawable to
	gdk_draw_pixbuf.

	* magnifier/magnifier.c:
	(magnifier_transform_cursor):
	Replaced gdk_pixbuf_render_to_drawable with gdk_draw_pixbuf (as above).

	* magnifier/magnifier-main.c, zoom-region.c, magnifier.c:
	Silenced some other compiler warnings introduced by timing patch.

2003-12-10  Bill Haneman <billh@gnome.org>

	* magnifier/zoom-region.c:
	Add #include <gdk/gdk.h>
	(zoom_region_clip_to_target): New function, clips a rectangle
	in the source screen to the zoom-region's target.  Used for
	processing expose/dirty notifications on the source.
	(impl_zoom_region_mark_dirty): Fixed implementation; it was
	using the wrong coordinate system for the 'dirty' notification.

	* idl/GNOME_Magnifier.idl:
	Improved docs for markDirty.

	* magnifier/magnifier.c:
	(magnifier_expose_filter): New  method, filters
	'GdkExpose' events that are passed in on a source
	window for which notifications are selected by the
	client.  Useful if we have the ability to 'snoop' exposes on
	the source.
	(magnifier_set_expose_listener):
	Add the expose filter (above) to a specified GdkWindow.
	(magnifier_realize): Add the expose filter (above) to the source root window
	on set_source_display.
	(impl_magnifier_add_zoom_region): Add the expose filter to the source
	root when the first zoom region is added.

2003-12-08  Brian Cameron <Brian.Cameron@sun.com>
	* magnifier/zoom-region.c
	Cleaned the timing report, now more code reuse.

2003-12-09  Åsmund Skjæveland  <aasmunds@fys.uio.no>

	* configure.in: Added nn to ALL_LNGUAS.
	* nn.po: Added Norwegian Nynorsk translation.

4 files changed, 47 insertions, 14 deletions

diff --git a/x11/gnome-mag/Makefile b/x11/gnome-mag/Makefile
index 89f94bc89d0..fd2e210d46d 100644
--- a/x11/gnome-mag/Makefile
+++ b/x11/gnome-mag/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 18:26:29 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/17 21:57:58 jmmv Exp $
 #
 
-DISTNAME=		gnome-mag-0.10.4
-PKGREVISION=		2
+DISTNAME=		gnome-mag-0.10.6
 CATEGORIES=		x11 gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/gnome-mag/0.10/}
 EXTRACT_SUFX=		.tar.bz2
@@ -13,7 +12,7 @@ COMMENT=		GNOME screen magnifier
 
 DEPENDS=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
-USE_BUILDLINK2=		yes
+USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
@@ -22,9 +21,13 @@ GNU_CONFIGURE=		yes
 
 PKGCONFIG_OVERRIDE+=    gnome-mag-1.0.pc.in
 
-.include "../../devel/at-spi/buildlink2.mk"
-.include "../../devel/libbonobo/buildlink2.mk"
-.include "../../devel/pkgconfig/buildlink2.mk"
-.include "../../devel/popt/buildlink2.mk"
-.include "../../textproc/intltool/buildlink2.mk"
+.include "../../devel/at-spi/buildlink3.mk"
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../devel/glib2/buildlink3.mk"
+.include "../../devel/libbonobo/buildlink3.mk"
+.include "../../devel/pkgconfig/buildlink3.mk"
+.include "../../devel/popt/buildlink3.mk"
+.include "../../net/ORBit2/buildlink3.mk"
+.include "../../textproc/intltool/buildlink3.mk"
+.include "../../x11/gtk2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/x11/gnome-mag/PLIST b/x11/gnome-mag/PLIST
index 35c0c295404..1dec00c3bb9 100644
--- a/x11/gnome-mag/PLIST
+++ b/x11/gnome-mag/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2003/12/30 17:55:33 xtraeme Exp $
+@comment $NetBSD: PLIST,v 1.2 2004/02/17 21:57:58 jmmv Exp $
 bin/magnifier
 include/gnome-mag-1.0/magnifier/GNOME_Magnifier.h
 lib/bonobo/servers/GNOME_Magnifier.server
@@ -6,11 +6,12 @@ lib/libgnome-mag.a
 lib/libgnome-mag.la
 lib/libgnome-mag.so
 lib/libgnome-mag.so.1
-lib/libgnome-mag.so.1.4
+lib/libgnome-mag.so.1.6
 lib/pkgconfig/gnome-mag-1.0.pc
 share/gnome-mag/crosshair-cursor.xpm
 share/gnome-mag/default-cursor.xpm
 share/idl/gnome-mag-1.0/GNOME_Magnifier.idl
+${PKGLOCALEDIR}/locale/ar/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/az/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/be/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/bg/LC_MESSAGES/gnome-mag.mo
@@ -23,6 +24,7 @@ ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/el/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gnome-mag.mo
+${PKGLOCALEDIR}/locale/et/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/gnome-mag.mo
@@ -30,6 +32,7 @@ ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/he/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/hi/LC_MESSAGES/gnome-mag.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/is/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gnome-mag.mo
@@ -40,6 +43,7 @@ ${PKGLOCALEDIR}/locale/lv/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/mn/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/gnome-mag.mo
+${PKGLOCALEDIR}/locale/nn/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/gnome-mag.mo
@@ -56,6 +60,8 @@ ${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @dirrm share/idl/gnome-mag-1.0
+@comment in ORBit2: @dirrm share/idl
 @dirrm share/gnome-mag
+@comment in libbonobo: @dirrm lib/bonobo/servers
 @dirrm include/gnome-mag-1.0/magnifier
 @dirrm include/gnome-mag-1.0
diff --git a/x11/gnome-mag/buildlink3.mk b/x11/gnome-mag/buildlink3.mk
new file mode 100644
index 00000000000..a02cd3efdd2
--- /dev/null
+++ b/x11/gnome-mag/buildlink3.mk
@@ -0,0 +1,24 @@
+# $NetBSD: buildlink3.mk,v 1.1 2004/02/17 21:57:58 jmmv Exp $
+#
+# This Makefile fragment is included by packages that use gnome-mag.
+#
+# This file was created automatically using createbuildlink-3.0.
+#
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+GNOME_MAG_BUILDLINK3_MK:=	${GNOME_MAG_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	gnome-mag
+.endif
+
+.if !empty(GNOME_MAG_BUILDLINK3_MK:M+)
+BUILDLINK_PACKAGES+=			gnome-mag
+BUILDLINK_DEPENDS.gnome-mag?=		gnome-mag>=0.10.4nb1
+BUILDLINK_PKGSRCDIR.gnome-mag?=		../../x11/gnome-mag
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+
+.endif # GNOME_MAG_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/x11/gnome-mag/distinfo b/x11/gnome-mag/distinfo
index 50c5bde9ede..5fb28f592e9 100644
--- a/x11/gnome-mag/distinfo
+++ b/x11/gnome-mag/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2003/12/30 17:55:33 xtraeme Exp $
+$NetBSD: distinfo,v 1.2 2004/02/17 21:57:58 jmmv Exp $
 
-SHA1 (gnome-mag-0.10.4.tar.bz2) = ab4e555669804c4b73b1e083336c48dd9e5d87fd
-Size (gnome-mag-0.10.4.tar.bz2) = 275635 bytes
+SHA1 (gnome-mag-0.10.6.tar.bz2) = fceb52c3f24ae70bdbfa8fd2c613f41842673164
+Size (gnome-mag-0.10.6.tar.bz2) = 287517 bytes
 SHA1 (patch-aa) = 20ad89bfabb3f0804a5d18ad0d2004d27202e277