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

7 files changed, 143 insertions, 60 deletions

diff --git a/graphics/gimp-app/files/patch-aa b/graphics/gimp-app/files/patch-aa
deleted file mode 100644
index 411ac92c931b..000000000000
--- a/graphics/gimp-app/files/patch-aa
+++ /dev/null
@@ -1,20 +0,0 @@
---- app/main.c.orig	Sun Oct  5 09:16:02 2003
-+++ app/main.c	Mon Oct  6 12:14:34 2003
-@@ -23,6 +23,7 @@
- #include <signal.h>
- #include <string.h>
- #include <sys/types.h>
-+#include <floatingpoint.h>
- 
- #ifdef HAVE_SYS_WAIT_H
- #include <sys/wait.h>
-@@ -113,6 +114,9 @@
-   /* Initialize variables */
- 
-   full_prog_name = argv[0];
-+
-+  /* Ignore floating point exceptions */
-+  fpsetmask(0);
- 
-   /* Initialize i18n support */
- 
diff --git a/graphics/gimp-app/files/patch-configure b/graphics/gimp-app/files/patch-configure
index da42f67f8ca6..1a89a1cc26f4 100644
--- a/graphics/gimp-app/files/patch-configure
+++ b/graphics/gimp-app/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	Sun Mar  6 15:30:12 2005
-+++ configure	Sun Mar  6 15:33:57 2005
-@@ -25925,6 +25925,7 @@
+--- configure.orig	Thu Nov 23 15:16:53 2006
++++ configure	Sun Dec 31 19:29:32 2006
+@@ -29404,6 +29404,7 @@
      if test "x$enable_gtktest" = "xyes" ; then
        ac_save_CFLAGS="$CFLAGS"
        ac_save_LIBS="$LIBS"
@@ -8,9 +8,9 @@
        CFLAGS="$CFLAGS $GTK_CFLAGS"
        LIBS="$GTK_LIBS $LIBS"
        rm -f conf.gtktest
-@@ -33865,9 +33866,9 @@
+@@ -38514,9 +38515,9 @@
  fi
- fi;
+ 
  
 -gimpdatadir="$datadir/$PACKAGE/2.0"
 -gimpplugindir="$libdir/$PACKAGE/2.0"
@@ -19,5 +19,5 @@
 +gimpplugindir="$libexecdir/$PACKAGE/2.2"
 +gimpsysconfdir="$sysconfdir/$PACKAGE/2.2"
  
- localedir='${prefix}/${DATADIRNAME}/locale'
+ 
  
diff --git a/graphics/gimp-app/files/patch-desktop_Makefile.in b/graphics/gimp-app/files/patch-desktop_Makefile.in
new file mode 100644
index 000000000000..62da49282658
--- /dev/null
+++ b/graphics/gimp-app/files/patch-desktop_Makefile.in
@@ -0,0 +1,33 @@
+--- desktop/Makefile.in.orig	Mon Jan  1 02:31:10 2007
++++ desktop/Makefile.in	Mon Jan  1 02:33:44 2007
+@@ -65,8 +65,7 @@
+ 	"$(DESTDIR)$(icons16dir)" "$(DESTDIR)$(icons22dir)" \
+ 	"$(DESTDIR)$(icons24dir)" "$(DESTDIR)$(icons32dir)" \
+ 	"$(DESTDIR)$(icons48dir)" "$(DESTDIR)$(icons64dir)" \
+-	"$(DESTDIR)$(iconsscalabledir)" "$(DESTDIR)$(mimeinfodir)" \
+-	"$(DESTDIR)$(registrydir)"
++	"$(DESTDIR)$(iconsscalabledir)"
+ applicationsDATA_INSTALL = $(INSTALL_DATA)
+ icons16DATA_INSTALL = $(INSTALL_DATA)
+ icons22DATA_INSTALL = $(INSTALL_DATA)
+@@ -79,8 +78,7 @@
+ registryDATA_INSTALL = $(INSTALL_DATA)
+ DATA = $(applications_DATA) $(icons16_DATA) $(icons22_DATA) \
+ 	$(icons24_DATA) $(icons32_DATA) $(icons48_DATA) \
+-	$(icons64_DATA) $(iconsscalable_DATA) $(mimeinfo_DATA) \
+-	$(registry_DATA)
++	$(icons64_DATA) $(iconsscalable_DATA)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ AA = @AA@
+ ACLOCAL = @ACLOCAL@
+@@ -445,10 +443,6 @@
+ desktop_files = $(desktop_in_files:.desktop.in.in=.desktop)
+ @DESKTOP_DATADIR_TRUE@applicationsdir = $(DESKTOP_DATADIR)/applications
+ @DESKTOP_DATADIR_TRUE@applications_DATA = $(desktop_files)
+-@DESKTOP_DATADIR_TRUE@mimeinfodir = $(DESKTOP_DATADIR)/mime-info
+-@DESKTOP_DATADIR_TRUE@mimeinfo_DATA = gimp.keys
+-@DESKTOP_DATADIR_TRUE@registrydir = $(DESKTOP_DATADIR)/application-registry
+-@DESKTOP_DATADIR_TRUE@registry_DATA = gimp.applications
+ @DESKTOP_DATADIR_TRUE@icons16dir = $(DESKTOP_DATADIR)/icons/hicolor/16x16/apps
+ @DESKTOP_DATADIR_TRUE@icons16_DATA = 16x16/gimp.png
+ @DESKTOP_DATADIR_TRUE@icons22dir = $(DESKTOP_DATADIR)/icons/hicolor/22x22/apps
diff --git a/graphics/gimp-app/files/patch-am b/graphics/gimp-app/files/patch-libgimp_gimp.c
index 45c58cbe59fe..a1bb86bbfda6 100644
--- a/graphics/gimp-app/files/patch-am
+++ b/graphics/gimp-app/files/patch-libgimp_gimp.c
@@ -1,6 +1,6 @@
---- libgimp/gimp.c.orig	Fri May 12 12:37:27 2000
-+++ libgimp/gimp.c	Thu May 18 16:42:21 2000
-@@ -26,6 +26,7 @@
+--- libgimp/gimp.c.orig	Fri Sep  1 06:14:32 2006
++++ libgimp/gimp.c	Sun Dec 31 15:56:37 2006
+@@ -29,6 +29,7 @@
  #include <stdlib.h>
  #include <string.h>
  #include <sys/types.h>
@@ -8,12 +8,13 @@
  
  #ifdef HAVE_SYS_TIME_H
  #include <sys/time.h>
-@@ -211,6 +212,9 @@
-     }
+@@ -291,6 +292,9 @@
+   gimp_env_init (TRUE);
  
    progname = argv[0];
 +
 +  /* Ignore floating point exceptions */
 +  fpsetmask(0);
  
-   g_set_prgname (g_basename (progname));
+   basename = g_path_get_basename (progname);
+ 
diff --git a/graphics/gimp-app/files/patch-plug-ins_common_url.c b/graphics/gimp-app/files/patch-plug-ins_common_url.c
deleted file mode 100644
index bceff6df101c..000000000000
--- a/graphics/gimp-app/files/patch-plug-ins_common_url.c
+++ /dev/null
@@ -1,17 +0,0 @@
---- plug-ins/common/url.c.orig	Wed Dec 28 13:56:48 2005
-+++ plug-ins/common/url.c	Wed Dec 28 13:58:33 2005
-@@ -186,10 +186,10 @@
-       putenv ("LANG=C");
- #endif
- 
--      execlp ("wget",
--              "wget", "-v", "-e", "server-response=off", "-T", TIMEOUT,
--              filename, "-O", tmpname, NULL);
--      g_message ("exec() failed: wget: %s", g_strerror (errno));
-+      execlp ("fetch",
-+              "fetch", "-T", TIMEOUT,
-+              filename, "-p", "-o", tmpname, NULL);
-+      g_message ("exec() failed: fetch: %s", g_strerror (errno));
-       g_free (tmpname);
-       _exit (127);
-     }
diff --git a/graphics/gimp-app/files/patch-plug-ins_print_print.c b/graphics/gimp-app/files/patch-plug-ins_print_print.c
deleted file mode 100644
index 36f4bf7148cf..000000000000
--- a/graphics/gimp-app/files/patch-plug-ins_print_print.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- plug-ins/print/print.c.orig	Tue Dec 26 07:43:54 2000
-+++ plug-ins/print/print.c	Tue Dec 26 07:44:07 2000
-@@ -1417,7 +1417,7 @@
- 
-     if (i < (sizeof(lpcs) / sizeof(lpcs[0])))
-     {
--      strcat(command, " status < /dev/null");
-+      strcat(command, " status all < /dev/null");
-       type = PRINTERS_LPC;
-     }
-     else
diff --git a/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
new file mode 100644
index 000000000000..efc3a8b311fe
--- /dev/null
+++ b/graphics/gimp-app/files/patch-plug-ins_pygimp_Makefile.in
@@ -0,0 +1,97 @@
+--- plug-ins/pygimp/Makefile.in.orig	Sun Dec 31 22:19:08 2006
++++ plug-ins/pygimp/Makefile.in	Sun Dec 31 22:22:17 2006
+@@ -64,10 +64,9 @@
+ 	"$(DESTDIR)$(pygimpdir)"
+ pygimpLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(pygimp_LTLIBRARIES)
+-am__DEPENDENCIES_1 =  \
+-	$(top_builddir)/libgimp/libgimp-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_2 = $(top_builddir)/libgimpcolor/libgimpcolor-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_3 = $(top_builddir)/libgimpbase/libgimpbase-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_1 = 
++am__DEPENDENCIES_2 = 
++am__DEPENDENCIES_3 = 
+ am__DEPENDENCIES_4 =
+ _gimpenums_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+ 	$(am__DEPENDENCIES_2) $(am__DEPENDENCIES_3) \
+@@ -75,11 +74,10 @@
+ 	$(am__DEPENDENCIES_4)
+ am__gimpenums_la_OBJECTS = gimpenumsmodule.lo
+ _gimpenums_la_OBJECTS = $(am__gimpenums_la_OBJECTS)
+-am__DEPENDENCIES_5 =  \
+-	$(top_builddir)/libgimp/libgimpui-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_6 = $(top_builddir)/libgimpwidgets/libgimpwidgets-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_7 = $(top_builddir)/libgimpconfig/libgimpconfig-$(GIMP_API_VERSION).la
+-am__DEPENDENCIES_8 = $(top_builddir)/libgimpmath/libgimpmath-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_5 =
++am__DEPENDENCIES_6 = 
++am__DEPENDENCIES_7 = 
++am__DEPENDENCIES_8 = 
+ _gimpui_la_DEPENDENCIES = $(am__DEPENDENCIES_5) $(am__DEPENDENCIES_6) \
+ 	$(am__DEPENDENCIES_7) $(am__DEPENDENCIES_8) \
+ 	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_2) \
+@@ -99,7 +97,7 @@
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
+ am_gimpcolor_la_OBJECTS = gimpcolormodule.lo pygimp-colors.lo
+ gimpcolor_la_OBJECTS = $(am_gimpcolor_la_OBJECTS)
+-am__DEPENDENCIES_9 = $(top_builddir)/libgimpthumb/libgimpthumb-$(GIMP_API_VERSION).la
++am__DEPENDENCIES_9 = 
+ gimpthumb_la_DEPENDENCIES = $(am__DEPENDENCIES_9) \
+ 	$(am__DEPENDENCIES_4) $(am__DEPENDENCIES_4)
+ am_gimpthumb_la_OBJECTS = gimpthumbmodule.lo gimpthumb.lo
+@@ -531,9 +529,7 @@
+ 	-export-symbols-regex initgimp
+ 
+ gimp_la_LIBADD = \
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)
+@@ -545,9 +541,7 @@
+ 	-export-symbols-regex init_gimpenums
+ 
+ _gimpenums_la_LIBADD = \
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)
+@@ -562,7 +556,7 @@
+ 	-export-symbols-regex initgimpcolor
+ 
+ gimpcolor_la_LIBADD = \
+-	$(libgimpcolor)		\
++	%%GIMP_LIBS%%		\
+ 	$(GLIB_LIBS)		\
+ 	$(PYLINK_LIBS)
+ 
+@@ -574,13 +568,8 @@
+ 	-export-symbols-regex init_gimpui
+ 
+ _gimpui_la_LIBADD = \
+-	$(libgimpui)		\
+-	$(libgimpwidgets)	\
+-	$(libgimpconfig)	\
+-	$(libgimpmath)		\
+-	$(libgimp)		\
+-	$(libgimpcolor)		\
+-	$(libgimpbase)		\
++	%%GIMP_LIBS%%		\
++	%%GIMP_UI_LIBS%%	\
+ 	$(GTK_LIBS)		\
+ 	$(PYLINK_LIBS)		\
+ 	$(RT_LIBS)		\
+@@ -594,7 +583,7 @@
+ 	-export-symbols-regex initgimpthumb
+ 
+ gimpthumb_la_LIBADD = \
+-	$(libgimpthumb)		\
++	%%GIMP_THUMB_LIBS%%	\
+ 	$(GDK_PIXBUF_LIBS)	\
+ 	$(PYLINK_LIBS)
+