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, 39 insertions, 15 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 2c4290392809..fb55b8177877 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.91 2006/10/05 06:55:34 mezz Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.105 2007/10/16 12:35:26 ahze Exp $
 #
 
 PORTNAME=	glib
-PORTVERSION=	2.12.13
+PORTVERSION=	2.14.2
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
@@ -28,6 +28,8 @@ USE_BZIP2=	yes
 
 .if !defined(REFERENCE_PORT)
 
+LIB_DEPENDS+=	pcre.0:${PORTSDIR}/devel/pcre
+
 USE_GETTEXT=	yes
 USE_AUTOTOOLS=	libtool:15
 USE_LDCONFIG=	yes
@@ -36,7 +38,8 @@ USE_GMAKE=	yes
 USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
-		--disable-man --without-xml-catalog
+		--disable-man --without-xml-catalog \
+		--with-pcre=system
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lintl" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 9c979acf47f9..650782e3bdcd 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/glib-2.12.13.tar.bz2) = d76124236e4e216e8c0861341e967a76
-SHA256 (gnome2/glib-2.12.13.tar.bz2) = 1253d563ca2e50292d924849fe3a23c3b7bc707ab8b79bda19319f9d192b0e8e
-SIZE (gnome2/glib-2.12.13.tar.bz2) = 2938164
+MD5 (gnome2/glib-2.14.2.tar.bz2) = fca5d26c8efea4e6e547c81c801bf67c
+SHA256 (gnome2/glib-2.14.2.tar.bz2) = bd6767cc7c8d9551df0fb3e6d40706746723f6daa0ecd4a78facffc40f9d8a97
+SIZE (gnome2/glib-2.14.2.tar.bz2) = 3340273
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index f5799d902c16..8a89b6e972e9 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,6 +1,6 @@
---- Makefile.in.orig	Tue May  1 20:39:42 2007
-+++ Makefile.in	Tue May  1 20:40:23 2007
-@@ -239,7 +239,7 @@ target_alias = @target_alias@
+--- Makefile.in.orig	Thu May  3 15:19:30 2007
++++ Makefile.in	Thu May  3 15:19:44 2007
+@@ -248,7 +248,7 @@ target_alias = @target_alias@
  
  AUTOMAKE_OPTIONS = 1.7
  
@@ -9,7 +9,7 @@
  
  bin_SCRIPTS = glib-gettextize
  
-@@ -292,8 +292,8 @@ BUILT_EXTRA_DIST = \
+@@ -301,8 +301,8 @@ BUILT_EXTRA_DIST = \
  	config.h.win32		\
  	gtk-doc.make
  
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
new file mode 100644
index 000000000000..ef7f0a87b9ff
--- /dev/null
+++ b/devel/glib20/files/patch-glib_gregex.c
@@ -0,0 +1,13 @@
+--- glib/gregex.c.orig	2007-09-09 18:35:32.000000000 -0400
++++ glib/gregex.c	2007-09-09 18:36:05.000000000 -0400
+@@ -164,8 +164,10 @@ match_error (gint errcode)
+     case PCRE_ERROR_DFA_RECURSE:
+     case PCRE_ERROR_RECURSIONLIMIT:
+       return _("recursion limit reached");
++#ifdef PCRE_ERROR_NULLWSLIMIT
+     case PCRE_ERROR_NULLWSLIMIT:
+       return _("workspace limit for empty substrings reached");
++#endif
+     case PCRE_ERROR_BADNEWLINE:
+       return _("invalid combination of newline flags");
+     default:
diff --git a/devel/glib20/files/patch-glib_gutils.c b/devel/glib20/files/patch-glib_gutils.c
index 8fd5f9ead041..95a02e475ac0 100644
--- a/devel/glib20/files/patch-glib_gutils.c
+++ b/devel/glib20/files/patch-glib_gutils.c
@@ -5,7 +5,7 @@
  
        if (!data_dirs || !data_dirs[0])
 -          data_dirs = "/usr/local/share/:/usr/share/";
-+          data_dirs = "/usr/local/share/gnome/:/usr/local/share/:/usr/share/";
++          data_dirs = "/usr/local/share/";
  
        data_dir_vector = g_strsplit (data_dirs, G_SEARCHPATH_SEPARATOR_S, 0);
  #endif
diff --git a/devel/glib20/files/patch-gmodule::gmodule-dl.c b/devel/glib20/files/patch-gmodule::gmodule-dl.c
index 47ca3e672044..586d7f80bd62 100644
--- a/devel/glib20/files/patch-gmodule::gmodule-dl.c
+++ b/devel/glib20/files/patch-gmodule::gmodule-dl.c
@@ -1,7 +1,3 @@
-
-$FreeBSD$
-  $MCom: ports/devel/glib20/files/patch-gmodule::gmodule-dl.c,v 1.19 2006/10/10 20:22:06 mezz Exp $
-
 --- gmodule/gmodule-dl.c.orig	Sat Feb 17 08:28:07 2001
 +++ gmodule/gmodule-dl.c	Fri Jan 18 09:48:45 2002
 @@ -104,6 +104,7 @@
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 55ee6cae4626..1caac4492aca 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -41,8 +41,10 @@ include/glib-2.0/glib/gqsort.h
 include/glib-2.0/glib/gquark.h
 include/glib-2.0/glib/gqueue.h
 include/glib-2.0/glib/grand.h
+include/glib-2.0/glib/gregex.h
 include/glib-2.0/glib/grel.h
 include/glib-2.0/glib/gscanner.h
+include/glib-2.0/glib/gsequence.h
 include/glib-2.0/glib/gshell.h
 include/glib-2.0/glib/gslice.h
 include/glib-2.0/glib/gslist.h
@@ -105,6 +107,7 @@ share/glib-2.0/gettext/mkinstalldirs
 share/glib-2.0/gettext/po/Makefile.in.in
 share/locale/am/LC_MESSAGES/glib20.mo
 share/locale/ar/LC_MESSAGES/glib20.mo
+share/locale/as/LC_MESSAGES/glib20.mo
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/be/LC_MESSAGES/glib20.mo
 share/locale/be@latin/LC_MESSAGES/glib20.mo
@@ -141,10 +144,12 @@ share/locale/is/LC_MESSAGES/glib20.mo
 share/locale/it/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
 share/locale/ka/LC_MESSAGES/glib20.mo
+share/locale/kn/LC_MESSAGES/glib20.mo
 share/locale/ko/LC_MESSAGES/glib20.mo
 share/locale/ku/LC_MESSAGES/glib20.mo
 share/locale/lt/LC_MESSAGES/glib20.mo
 share/locale/lv/LC_MESSAGES/glib20.mo
+share/locale/mg/LC_MESSAGES/glib20.mo
 share/locale/mk/LC_MESSAGES/glib20.mo
 share/locale/ml/LC_MESSAGES/glib20.mo
 share/locale/mn/LC_MESSAGES/glib20.mo
@@ -153,6 +158,7 @@ share/locale/nb/LC_MESSAGES/glib20.mo
 share/locale/ne/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
+share/locale/oc/LC_MESSAGES/glib20.mo
 share/locale/or/LC_MESSAGES/glib20.mo
 share/locale/pa/LC_MESSAGES/glib20.mo
 share/locale/pl/LC_MESSAGES/glib20.mo
@@ -204,6 +210,10 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/sr@ije
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/oc/LC_MESSAGES
+@dirrmtry share/locale/oc
+@dirrmtry share/locale/mg/LC_MESSAGES
+@dirrmtry share/locale/mg
 @dirrmtry share/locale/ku/LC_MESSAGES
 @dirrmtry share/locale/ku
 @dirrmtry share/locale/hy/LC_MESSAGES
@@ -214,3 +224,5 @@ share/locale/zh_TW/LC_MESSAGES/glib20.mo
 @dirrmtry share/locale/bn_IN
 @dirrmtry share/locale/be@latin/LC_MESSAGES
 @dirrmtry share/locale/be@latin
+@dirrmtry share/locale/as/LC_MESSAGES
+@dirrmtry share/locale/as