Presenting GNOME 2.20.1 and all related works for FreeBSD. The official

GNOME 2.20 release notes can be found at
http://www.gnome.org/start/2.20/notes/en/ .  Beyond that, this update
includes the new GIMP 2.4 (courtesy of ahze).

The GNOME 2.20 update also includes a huge change in the FreeBSD GNOME
hierarchy.  We are now using the more standard DATADIR of ${PREFIX}/share
rather than ${PREFIX}/share/gnome. The result is that fewer patches and
hacks are needed to port GNOME components to FreeBSD.  This will mean some
user changes may be required, so be sure to read /usr/ports/UPDATING for
more details.

This release and the things we accomplished in it would not have been
possible without mezz's crazy idea to collapse DATADIR, and his persistence
to make it happen successfully.  Ahze and pav also deserve thanks for
their work on porting modules and testing the whole ball of wax on
pointyhat (respectively).

The FreeBSD GNOME team would also like to thank our various testers and
contributors:

Yasuda Keisuke
Frank Jahnke
Pawel Worach
Brian Gruber
Franz Klammer
Yuri Pankov
Nick Barkas
Cristian KLEIN
Tony Maher
Scot Hetzel
Martin Matuska (mm)
Benoit Dejean
Martin Wilke (miwi)
(And anyone else I may have missed)

PRs fixed in this release:

111272, 113470, 115995, 116338

5 files changed, 37 insertions, 304 deletions

diff --git a/accessibility/gnome-mag/Makefile b/accessibility/gnome-mag/Makefile
index e59d82b8d760..be0bfad94eec 100644
--- a/accessibility/gnome-mag/Makefile
+++ b/accessibility/gnome-mag/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.27 2007/03/11 06:58:01 marcus Exp $
+#   $MCom: ports/accessibility/gnome-mag/Makefile,v 1.37 2007/09/17 16:05:19 ahze Exp $
 #
 
 PORTNAME=	gnome-mag
-PORTVERSION=	0.14.4
+PORTVERSION=	0.14.10
 CATEGORIES=	accessibility gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}
@@ -23,8 +23,8 @@ USE_GMAKE=	yes
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
-CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
-		LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
 
 DOCSDIR=	${PREFIX}/share/doc/gnome-mag-${PORTVERSION}
 
diff --git a/accessibility/gnome-mag/distinfo b/accessibility/gnome-mag/distinfo
index b8791627a169..4b5b1aa2692b 100644
--- a/accessibility/gnome-mag/distinfo
+++ b/accessibility/gnome-mag/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gnome-mag-0.14.4.tar.bz2) = 1e7a2259bc241e77a3959dd438d41777
-SHA256 (gnome2/gnome-mag-0.14.4.tar.bz2) = 0df7a60eb65f25c24eff505f0573a536df92a86680490bb45a067d053ec7d5f4
-SIZE (gnome2/gnome-mag-0.14.4.tar.bz2) = 796260
+MD5 (gnome2/gnome-mag-0.14.10.tar.bz2) = e3e498c7df873ecc7acabd52a7b4ddc7
+SHA256 (gnome2/gnome-mag-0.14.10.tar.bz2) = d610d637bd6006f2831f751a25ed77c371fcfebbe06104968524d5b78f3a155c
+SIZE (gnome2/gnome-mag-0.14.10.tar.bz2) = 505530
diff --git a/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in b/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in
deleted file mode 100644
index 7f8016433ddf..000000000000
--- a/accessibility/gnome-mag/files/patch-docs_reference_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- docs/reference/Makefile.in.orig	Fri Feb  3 00:25:58 2006
-+++ docs/reference/Makefile.in	Fri Feb  3 00:26:09 2006
-@@ -220,7 +220,7 @@
- target_alias = @target_alias@
- doxygen_configfile = Doxyfile
- EXTRA_DIST = README Doxyfile html
--referencetopdir = $(datadir)/doc/gnome-mag-$(VERSION)/reference
-+referencetopdir = $(prefix)/share/doc/gnome-mag-$(VERSION)/reference
- referencedir = $(referencetopdir)/html
- all: all-am
- 
diff --git a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c b/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c
deleted file mode 100644
index b8ab206a3dad..000000000000
--- a/accessibility/gnome-mag/files/patch-magnifier_zoom-region.c
+++ /dev/null
@@ -1,59 +0,0 @@
---- magnifier/zoom-region.c~	Tue Feb 14 22:37:24 2006
-+++ magnifier/zoom-region.c	Thu Mar 16 15:36:55 2006
-@@ -1794,10 +1794,10 @@
- 		gdk_window_end_paint (zoom_region->priv->w->window);
- 		g_timer_stop (mag_timing.scale);
- 		if (timing_test) {
--			mag_timing.num_scale_samples++;
--			
- 			gulong microseconds;
- 
-+			mag_timing.num_scale_samples++;
-+
- 			mag_timing.scale_val =
- 			        g_timer_elapsed (mag_timing.scale,
- 						 &microseconds);
-@@ -1971,12 +1971,11 @@
- 	float x_scroll_incr, y_scroll_incr;
- 	int width = magnifier->target_bounds.x2 - magnifier->target_bounds.x1;
- 	int height = magnifier->target_bounds.y2 - magnifier->target_bounds.y1;
-+	gulong microseconds;
- 
- 	mag_timing.num_frame_samples++;
- 	g_timer_stop (mag_timing.frame);
- 
--	gulong microseconds;
--
- 	mag_timing.frame_val = g_timer_elapsed (mag_timing.frame,
- 						&microseconds);
- 
-@@ -2094,10 +2093,10 @@
- 	g_timer_stop (mag_timing.idle);
- 
- 	if (timing_test) {
--		mag_timing.num_idle_samples++;
--
- 		gulong microseconds;
- 
-+		mag_timing.num_idle_samples++;
-+
- 		mag_timing.idle_val = g_timer_elapsed (mag_timing.idle,
- 						       &microseconds);
- 		mag_timing.idle_total += mag_timing.idle_val;
-@@ -2472,6 +2471,7 @@
- 	int screen_height, height;
- 	int pixel_position;
- 	int pixel_direction;
-+	gulong microseconds;
- 
- 	screen_height = gdk_screen_get_height (
- 		gdk_display_get_screen (magnifier->source_display,
-@@ -2484,8 +2484,6 @@
- 	roi.x2 = zoom_region->roi.x2;
- 
- 	g_timer_stop (mag_timing.process);
--
--	gulong microseconds;
- 
- 	total_time = g_timer_elapsed (mag_timing.process, &microseconds);
- 
diff --git a/accessibility/gnome-mag/pkg-plist b/accessibility/gnome-mag/pkg-plist
index cc46814caf8f..63d840a09aeb 100644
--- a/accessibility/gnome-mag/pkg-plist
+++ b/accessibility/gnome-mag/pkg-plist
@@ -9,230 +9,27 @@ lib/orbit-2.0/GNOME_Magnifier_module.la
 lib/orbit-2.0/GNOME_Magnifier_module.so
 libdata/bonobo/servers/GNOME_Magnifier.server
 libdata/pkgconfig/gnome-mag-1.0.pc
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-common_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-imodule_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-skels_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier-stubs_8c.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8h-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8h.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl-source.html
-%%DOCSDIR%%/reference/html/GNOME__Magnifier_8idl.html
-%%DOCSDIR%%/reference/html/annotated.html
-%%DOCSDIR%%/reference/html/dir_13ad882efed71f625fc815d9016b8292.html
-%%DOCSDIR%%/reference/html/dir_fb436069bdb66ac1a75ca6bf141af2e2.html
-%%DOCSDIR%%/reference/html/dirs.html
-%%DOCSDIR%%/reference/html/doxygen.css
-%%DOCSDIR%%/reference/html/doxygen.png
-%%DOCSDIR%%/reference/html/files.html
-%%DOCSDIR%%/reference/html/functions.html
-%%DOCSDIR%%/reference/html/functions_0x61.html
-%%DOCSDIR%%/reference/html/functions_0x62.html
-%%DOCSDIR%%/reference/html/functions_0x63.html
-%%DOCSDIR%%/reference/html/functions_0x64.html
-%%DOCSDIR%%/reference/html/functions_0x65.html
-%%DOCSDIR%%/reference/html/functions_0x66.html
-%%DOCSDIR%%/reference/html/functions_0x67.html
-%%DOCSDIR%%/reference/html/functions_0x68.html
-%%DOCSDIR%%/reference/html/functions_0x69.html
-%%DOCSDIR%%/reference/html/functions_0x6c.html
-%%DOCSDIR%%/reference/html/functions_0x6d.html
-%%DOCSDIR%%/reference/html/functions_0x6e.html
-%%DOCSDIR%%/reference/html/functions_0x6f.html
-%%DOCSDIR%%/reference/html/functions_0x70.html
-%%DOCSDIR%%/reference/html/functions_0x71.html
-%%DOCSDIR%%/reference/html/functions_0x72.html
-%%DOCSDIR%%/reference/html/functions_0x73.html
-%%DOCSDIR%%/reference/html/functions_0x74.html
-%%DOCSDIR%%/reference/html/functions_0x75.html
-%%DOCSDIR%%/reference/html/functions_0x76.html
-%%DOCSDIR%%/reference/html/functions_0x77.html
-%%DOCSDIR%%/reference/html/functions_0x78.html
-%%DOCSDIR%%/reference/html/functions_0x79.html
-%%DOCSDIR%%/reference/html/functions_0x7a.html
-%%DOCSDIR%%/reference/html/functions_enum.html
-%%DOCSDIR%%/reference/html/functions_eval.html
-%%DOCSDIR%%/reference/html/functions_func.html
-%%DOCSDIR%%/reference/html/functions_vars.html
-%%DOCSDIR%%/reference/html/functions_vars_0x61.html
-%%DOCSDIR%%/reference/html/functions_vars_0x62.html
-%%DOCSDIR%%/reference/html/functions_vars_0x63.html
-%%DOCSDIR%%/reference/html/functions_vars_0x64.html
-%%DOCSDIR%%/reference/html/functions_vars_0x65.html
-%%DOCSDIR%%/reference/html/functions_vars_0x66.html
-%%DOCSDIR%%/reference/html/functions_vars_0x67.html
-%%DOCSDIR%%/reference/html/functions_vars_0x68.html
-%%DOCSDIR%%/reference/html/functions_vars_0x69.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6c.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6d.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6e.html
-%%DOCSDIR%%/reference/html/functions_vars_0x6f.html
-%%DOCSDIR%%/reference/html/functions_vars_0x70.html
-%%DOCSDIR%%/reference/html/functions_vars_0x71.html
-%%DOCSDIR%%/reference/html/functions_vars_0x72.html
-%%DOCSDIR%%/reference/html/functions_vars_0x73.html
-%%DOCSDIR%%/reference/html/functions_vars_0x74.html
-%%DOCSDIR%%/reference/html/functions_vars_0x75.html
-%%DOCSDIR%%/reference/html/functions_vars_0x76.html
-%%DOCSDIR%%/reference/html/functions_vars_0x77.html
-%%DOCSDIR%%/reference/html/functions_vars_0x78.html
-%%DOCSDIR%%/reference/html/functions_vars_0x79.html
-%%DOCSDIR%%/reference/html/functions_vars_0x7a.html
-%%DOCSDIR%%/reference/html/globals.html
-%%DOCSDIR%%/reference/html/globals_0x61.html
-%%DOCSDIR%%/reference/html/globals_0x62.html
-%%DOCSDIR%%/reference/html/globals_0x63.html
-%%DOCSDIR%%/reference/html/globals_0x64.html
-%%DOCSDIR%%/reference/html/globals_0x65.html
-%%DOCSDIR%%/reference/html/globals_0x66.html
-%%DOCSDIR%%/reference/html/globals_0x67.html
-%%DOCSDIR%%/reference/html/globals_0x69.html
-%%DOCSDIR%%/reference/html/globals_0x6c.html
-%%DOCSDIR%%/reference/html/globals_0x6d.html
-%%DOCSDIR%%/reference/html/globals_0x6e.html
-%%DOCSDIR%%/reference/html/globals_0x6f.html
-%%DOCSDIR%%/reference/html/globals_0x70.html
-%%DOCSDIR%%/reference/html/globals_0x72.html
-%%DOCSDIR%%/reference/html/globals_0x73.html
-%%DOCSDIR%%/reference/html/globals_0x74.html
-%%DOCSDIR%%/reference/html/globals_0x75.html
-%%DOCSDIR%%/reference/html/globals_0x7a.html
-%%DOCSDIR%%/reference/html/globals_defs.html
-%%DOCSDIR%%/reference/html/globals_defs_0x62.html
-%%DOCSDIR%%/reference/html/globals_defs_0x63.html
-%%DOCSDIR%%/reference/html/globals_defs_0x64.html
-%%DOCSDIR%%/reference/html/globals_defs_0x65.html
-%%DOCSDIR%%/reference/html/globals_defs_0x67.html
-%%DOCSDIR%%/reference/html/globals_defs_0x69.html
-%%DOCSDIR%%/reference/html/globals_defs_0x6d.html
-%%DOCSDIR%%/reference/html/globals_defs_0x6f.html
-%%DOCSDIR%%/reference/html/globals_defs_0x70.html
-%%DOCSDIR%%/reference/html/globals_defs_0x74.html
-%%DOCSDIR%%/reference/html/globals_defs_0x7a.html
-%%DOCSDIR%%/reference/html/globals_enum.html
-%%DOCSDIR%%/reference/html/globals_eval.html
-%%DOCSDIR%%/reference/html/globals_func.html
-%%DOCSDIR%%/reference/html/globals_func_0x62.html
-%%DOCSDIR%%/reference/html/globals_func_0x63.html
-%%DOCSDIR%%/reference/html/globals_func_0x67.html
-%%DOCSDIR%%/reference/html/globals_func_0x69.html
-%%DOCSDIR%%/reference/html/globals_func_0x6d.html
-%%DOCSDIR%%/reference/html/globals_func_0x70.html
-%%DOCSDIR%%/reference/html/globals_func_0x72.html
-%%DOCSDIR%%/reference/html/globals_func_0x74.html
-%%DOCSDIR%%/reference/html/globals_func_0x7a.html
-%%DOCSDIR%%/reference/html/globals_type.html
-%%DOCSDIR%%/reference/html/globals_vars.html
-%%DOCSDIR%%/reference/html/globals_vars_0x61.html
-%%DOCSDIR%%/reference/html/globals_vars_0x62.html
-%%DOCSDIR%%/reference/html/globals_vars_0x63.html
-%%DOCSDIR%%/reference/html/globals_vars_0x64.html
-%%DOCSDIR%%/reference/html/globals_vars_0x66.html
-%%DOCSDIR%%/reference/html/globals_vars_0x67.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6c.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6d.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6e.html
-%%DOCSDIR%%/reference/html/globals_vars_0x6f.html
-%%DOCSDIR%%/reference/html/globals_vars_0x70.html
-%%DOCSDIR%%/reference/html/globals_vars_0x72.html
-%%DOCSDIR%%/reference/html/globals_vars_0x73.html
-%%DOCSDIR%%/reference/html/globals_vars_0x74.html
-%%DOCSDIR%%/reference/html/globals_vars_0x75.html
-%%DOCSDIR%%/reference/html/globals_vars_0x7a.html
-%%DOCSDIR%%/reference/html/gmag-events_8c-source.html
-%%DOCSDIR%%/reference/html/gmag-events_8c.html
-%%DOCSDIR%%/reference/html/gmag-events_8h-source.html
-%%DOCSDIR%%/reference/html/gmag-events_8h.html
-%%DOCSDIR%%/reference/html/index.html
-%%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1Magnifier.html
-%%DOCSDIR%%/reference/html/interfaceGNOME_1_1Magnifier_1_1ZoomRegion.html
-%%DOCSDIR%%/reference/html/magnifier-main_8c-source.html
-%%DOCSDIR%%/reference/html/magnifier-main_8c.html
-%%DOCSDIR%%/reference/html/magnifier-private_8h-source.html
-%%DOCSDIR%%/reference/html/magnifier-private_8h.html
-%%DOCSDIR%%/reference/html/magnifier_8c-source.html
-%%DOCSDIR%%/reference/html/magnifier_8c.html
-%%DOCSDIR%%/reference/html/magnifier_8h-source.html
-%%DOCSDIR%%/reference/html/magnifier_8h.html
-%%DOCSDIR%%/reference/html/namespaceGNOME.html
-%%DOCSDIR%%/reference/html/namespaceGNOME_1_1Magnifier.html
-%%DOCSDIR%%/reference/html/namespacemembers.html
-%%DOCSDIR%%/reference/html/namespacemembers_type.html
-%%DOCSDIR%%/reference/html/namespaces.html
-%%DOCSDIR%%/reference/html/structBonobo__EventSource__UnknownListener__type.html
-%%DOCSDIR%%/reference/html/structBonobo__Pair__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__BackendFailed__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__InvalidType__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__NotFound__type.html
-%%DOCSDIR%%/reference/html/structBonobo__PropertyBag__ReadOnly__type.html
-%%DOCSDIR%%/reference/html/structCORBA__sequence__Bonobo__Pair.html
-%%DOCSDIR%%/reference/html/structCORBA__sequence__CORBA__Object.html
-%%DOCSDIR%%/reference/html/structCORBA__sequence__CORBA__string.html
-%%DOCSDIR%%/reference/html/structGNOME_1_1Magnifier_1_1Point.html
-%%DOCSDIR%%/reference/html/structGNOME_1_1Magnifier_1_1RectBounds.html
-%%DOCSDIR%%/reference/html/structGNOME__Magnifier__Point__type.html
-%%DOCSDIR%%/reference/html/structGNOME__Magnifier__RectBounds__type.html
-%%DOCSDIR%%/reference/html/structMagLoginHelper.html
-%%DOCSDIR%%/reference/html/structMagLoginHelperClass.html
-%%DOCSDIR%%/reference/html/structMagnifier.html
-%%DOCSDIR%%/reference/html/structMagnifierClass.html
-%%DOCSDIR%%/reference/html/structMagnifierOptions.html
-%%DOCSDIR%%/reference/html/structMagnifierZoomRegionSaveProps.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__ConfigDatabase.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__ConfigDatabase____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__ConfigDatabase____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__EventSource.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__EventSource____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__EventSource____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__Listener.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__Listener____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__Listener____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__PropertyBag.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__PropertyBag____epv.html
-%%DOCSDIR%%/reference/html/structPOA__Bonobo__PropertyBag____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__Magnifier.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__Magnifier____epv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__Magnifier____vepv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____epv.html
-%%DOCSDIR%%/reference/html/structPOA__GNOME__Magnifier__ZoomRegion____vepv.html
-%%DOCSDIR%%/reference/html/structZoomRegion.html
-%%DOCSDIR%%/reference/html/structZoomRegionClass.html
-%%DOCSDIR%%/reference/html/struct__GmagWin.html
-%%DOCSDIR%%/reference/html/struct__MagnifierPrivate.html
-%%DOCSDIR%%/reference/html/struct__ZoomRegionPrivate.html
-%%DOCSDIR%%/reference/html/structtiming.html
-%%DOCSDIR%%/reference/html/tabs.css
-%%DOCSDIR%%/reference/html/zoom-region-private_8h-source.html
-%%DOCSDIR%%/reference/html/zoom-region-private_8h.html
-%%DOCSDIR%%/reference/html/zoom-region_8c-source.html
-%%DOCSDIR%%/reference/html/zoom-region_8c.html
-%%DOCSDIR%%/reference/html/zoom-region_8h-source.html
-%%DOCSDIR%%/reference/html/zoom-region_8h.html
-share/gnome/gnome-mag/1_32/appstart.xpm
-share/gnome/gnome-mag/1_32/bottom_left_corner.xpm
-share/gnome/gnome-mag/1_32/bottom_side.xpm
-share/gnome/gnome-mag/1_32/busy.xpm
-share/gnome/gnome-mag/1_32/crosshair.xpm
-share/gnome/gnome-mag/1_32/default.xpm
-share/gnome/gnome-mag/1_32/fleur.xpm
-share/gnome/gnome-mag/1_32/hand.xpm
-share/gnome/gnome-mag/1_32/left_ptr.xpm
-share/gnome/gnome-mag/1_32/left_side.xpm
-share/gnome/gnome-mag/1_32/no.xpm
-share/gnome/gnome-mag/1_32/right_side.xpm
-share/gnome/gnome-mag/1_32/sb_h_double_arrow.xpm
-share/gnome/gnome-mag/1_32/sb_v_double_arrow.xpm
-share/gnome/gnome-mag/1_32/top_left_corner.xpm
-share/gnome/gnome-mag/1_32/top_right_corner.xpm
-share/gnome/gnome-mag/1_32/top_side.xpm
-share/gnome/gnome-mag/1_32/up.xpm
-share/gnome/gnome-mag/1_32/xterm.xpm
-share/gnome/gnome-mag/default-cursor.xpm
-share/gnome/idl/gnome-mag-1.0/GNOME_Magnifier.idl
+%%DATADIR%%/1_32/appstart.xpm
+%%DATADIR%%/1_32/bottom_left_corner.xpm
+%%DATADIR%%/1_32/bottom_side.xpm
+%%DATADIR%%/1_32/busy.xpm
+%%DATADIR%%/1_32/crosshair.xpm
+%%DATADIR%%/1_32/default.xpm
+%%DATADIR%%/1_32/fleur.xpm
+%%DATADIR%%/1_32/hand.xpm
+%%DATADIR%%/1_32/left_ptr.xpm
+%%DATADIR%%/1_32/left_side.xpm
+%%DATADIR%%/1_32/no.xpm
+%%DATADIR%%/1_32/right_side.xpm
+%%DATADIR%%/1_32/sb_h_double_arrow.xpm
+%%DATADIR%%/1_32/sb_v_double_arrow.xpm
+%%DATADIR%%/1_32/top_left_corner.xpm
+%%DATADIR%%/1_32/top_right_corner.xpm
+%%DATADIR%%/1_32/top_side.xpm
+%%DATADIR%%/1_32/up.xpm
+%%DATADIR%%/1_32/xterm.xpm
+%%DATADIR%%/default-cursor.xpm
+share/idl/gnome-mag-1.0/GNOME_Magnifier.idl
 share/locale/ang/LC_MESSAGES/gnome-mag.mo
 share/locale/ar/LC_MESSAGES/gnome-mag.mo
 share/locale/as/LC_MESSAGES/gnome-mag.mo
@@ -289,6 +86,7 @@ share/locale/nb/LC_MESSAGES/gnome-mag.mo
 share/locale/ne/LC_MESSAGES/gnome-mag.mo
 share/locale/nl/LC_MESSAGES/gnome-mag.mo
 share/locale/nn/LC_MESSAGES/gnome-mag.mo
+share/locale/oc/LC_MESSAGES/gnome-mag.mo
 share/locale/or/LC_MESSAGES/gnome-mag.mo
 share/locale/pa/LC_MESSAGES/gnome-mag.mo
 share/locale/pl/LC_MESSAGES/gnome-mag.mo
@@ -305,6 +103,7 @@ share/locale/sr/LC_MESSAGES/gnome-mag.mo
 share/locale/sr@Latn/LC_MESSAGES/gnome-mag.mo
 share/locale/sv/LC_MESSAGES/gnome-mag.mo
 share/locale/ta/LC_MESSAGES/gnome-mag.mo
+share/locale/te/LC_MESSAGES/gnome-mag.mo
 share/locale/th/LC_MESSAGES/gnome-mag.mo
 share/locale/tk/LC_MESSAGES/gnome-mag.mo
 share/locale/tr/LC_MESSAGES/gnome-mag.mo
@@ -314,9 +113,9 @@ share/locale/vi/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_CN/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_HK/LC_MESSAGES/gnome-mag.mo
 share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
-@dirrm share/gnome/idl/gnome-mag-1.0
-@dirrm share/gnome/gnome-mag/1_32
-@dirrm share/gnome/gnome-mag
+@dirrm share/idl/gnome-mag-1.0
+@dirrm %%DATADIR%%/1_32
+@dirrm %%DATADIR%%
 @dirrm %%DOCSDIR%%/reference/html
 @dirrm %%DOCSDIR%%/reference
 @dirrm %%DOCSDIR%%
@@ -326,10 +125,14 @@ share/locale/zh_TW/LC_MESSAGES/gnome-mag.mo
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/ug/LC_MESSAGES
 @dirrmtry share/locale/ug
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
 @dirrmtry share/locale/si/LC_MESSAGES
 @dirrmtry share/locale/si
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
 @dirrmtry share/locale/mr/LC_MESSAGES
 @dirrmtry share/locale/mr
 @dirrmtry share/locale/mi/LC_MESSAGES