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, 25 insertions, 26 deletions

diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index e0fdc6263b20..b733ebd0294b 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -3,11 +3,11 @@
 # Whom:                 		Adam Weinberger <adamw@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glibmm/Makefile,v 1.39 2006/12/30 18:56:48 marcus Exp $
+#   $MCom: ports/devel/glibmm/Makefile,v 1.48 2007/10/06 21:15:01 mezz Exp $
 #
 
 PORTNAME=	glibmm
-PORTVERSION=	2.12.10
+PORTVERSION=	2.14.1
 PORTREVISION?=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
diff --git a/devel/glibmm/distinfo b/devel/glibmm/distinfo
index 9da3ca6bf376..74627bfd2c14 100644
--- a/devel/glibmm/distinfo
+++ b/devel/glibmm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glibmm-2.12.10.tar.bz2) = 85830693d669f0d86d6e64db3b57f581
-SHA256 (gnome2/glibmm-2.12.10.tar.bz2) = 21b760b1567f9fcd9ea5244f02fdb0583852f7f4c513ab83726a1a076093320b
-SIZE (gnome2/glibmm-2.12.10.tar.bz2) = 2360587
+MD5 (gnome2/glibmm-2.14.1.tar.bz2) = b75877e454afa956a1e86a89ab1fa9b0
+SHA256 (gnome2/glibmm-2.14.1.tar.bz2) = 963b47b530a0cead2148295d8929b957db53578ca80dee362d1dbd675ea1b2d5
+SIZE (gnome2/glibmm-2.14.1.tar.bz2) = 9273164
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.cc b/devel/glibmm/files/patch-glib_glibmm_date.cc
index 66c85602135e..539778d9a9b1 100644
--- a/devel/glibmm/files/patch-glib_glibmm_date.cc
+++ b/devel/glibmm/files/patch-glib_glibmm_date.cc
@@ -1,19 +1,16 @@
---- glib/glibmm/date.cc.orig	Sun Apr 22 12:28:36 2007
-+++ glib/glibmm/date.cc	Sun Apr 22 12:28:48 2007
-@@ -73,7 +73,7 @@
- 
+--- glib/glibmm/date.cc.orig	Sun May  6 00:19:51 2007
++++ glib/glibmm/date.cc	Sun May  6 00:21:36 2007
+@@ -72,12 +72,14 @@ void Date::set_parse(const Glib::ustring
+ }
  
  #ifndef GLIBMM_DISABLE_DEPRECATED
--
 +#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
  
- //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
- //That would make the set_time() method overload impossible.
-@@ -84,7 +84,7 @@
+ void Date::set_time(GTime time)
+ {
+   //This method, and the C function that it wraps, are deprecated.
    g_date_set_time(&gobject_, time);
  }
- #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
--
 +#endif
  #endif // GLIBMM_DISABLE_DEPRECATED
  
diff --git a/devel/glibmm/files/patch-glib_glibmm_date.h b/devel/glibmm/files/patch-glib_glibmm_date.h
index fdf6ccc9e525..12a66044f382 100644
--- a/devel/glibmm/files/patch-glib_glibmm_date.h
+++ b/devel/glibmm/files/patch-glib_glibmm_date.h
@@ -1,19 +1,17 @@
---- glib/glibmm/date.h.orig	Sun Apr 22 12:29:49 2007
-+++ glib/glibmm/date.h	Sun Apr 22 12:30:39 2007
-@@ -121,7 +121,7 @@
- 
+--- glib/glibmm/date.h.orig	Sun May  6 00:22:03 2007
++++ glib/glibmm/date.h	Sun May  6 00:22:31 2007
+@@ -120,6 +120,7 @@ enum DMY
+   void set_parse (const Glib::ustring& str);
  
    #ifndef GLIBMM_DISABLE_DEPRECATED
--
 +#if GLIB_SIZEOF_LONG != 4 && !defined(__alpha__)
-   
-   //Avoid a build problem in the case that time_t is equivalent to guint32 (GTime is also guint32)
-   //That would make the set_time() method overload impossible.
-@@ -134,7 +134,7 @@
+ 
+   /** Sets the value of a date from a GTime (time_t) value. 
+    *
+@@ -128,6 +129,7 @@ enum DMY
+    * @deprecated Please use set_time(time_t) or set_time(const GTimeVal&).
     */
    void set_time(GTime time);
-   #endif //GLIBMM_HAVE_C_STD_TIME_T_IS_NOT_INT32
--
 +#endif
    #endif // GLIBMM_DISABLE_DEPRECATED
  
diff --git a/devel/glibmm/pkg-plist b/devel/glibmm/pkg-plist
index 324f5d42bd96..f816389349f0 100644
--- a/devel/glibmm/pkg-plist
+++ b/devel/glibmm/pkg-plist
@@ -16,6 +16,7 @@ include/glibmm-%%API_VERSION%%/glibmm/i18n.h
 include/glibmm-%%API_VERSION%%/glibmm/init.h
 include/glibmm-%%API_VERSION%%/glibmm/interface.h
 include/glibmm-%%API_VERSION%%/glibmm/iochannel.h
+include/glibmm-%%API_VERSION%%/glibmm/keyfile.h
 include/glibmm-%%API_VERSION%%/glibmm/listhandle.h
 include/glibmm-%%API_VERSION%%/glibmm/main.h
 include/glibmm-%%API_VERSION%%/glibmm/markup.h
@@ -32,12 +33,14 @@ include/glibmm-%%API_VERSION%%/glibmm/private/date_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/fileutils_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/interface_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/iochannel_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/keyfile_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/markup_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/module_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/object_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/optioncontext_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/optionentry_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/optiongroup_p.h
+include/glibmm-%%API_VERSION%%/glibmm/private/regex_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/shell_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/spawn_p.h
 include/glibmm-%%API_VERSION%%/glibmm/private/thread_p.h
@@ -48,6 +51,7 @@ include/glibmm-%%API_VERSION%%/glibmm/propertyproxy_base.h
 include/glibmm-%%API_VERSION%%/glibmm/quark.h
 include/glibmm-%%API_VERSION%%/glibmm/random.h
 include/glibmm-%%API_VERSION%%/glibmm/refptr.h
+include/glibmm-%%API_VERSION%%/glibmm/regex.h
 include/glibmm-%%API_VERSION%%/glibmm/sarray.h
 include/glibmm-%%API_VERSION%%/glibmm/shell.h
 include/glibmm-%%API_VERSION%%/glibmm/signalproxy.h