Update all components of the GNOME 2.0 to the versions included into GNOME

2.0-beta release.

4 files changed, 19 insertions, 18 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 8faeed832240..88f54d80fa65 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.13
+PORTVERSION=	1.3.14
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-alpha2,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -19,7 +19,8 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
-LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv \
+		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 NO_LATEST_LINK=	"Unstable, development version."
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 4e34b9225cd1..98f66c26ceb9 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-1.3.13.tar.bz2) = 6452c711661ec88b553040e87777ffeb
+MD5 (gnome2/glib-1.3.14.tar.bz2) = 8bf2f7584928ce5edef30542ee9407d7
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 87404113cbaf..eff5d0e563c9 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Jan 29 18:34:49 2002
-+++ configure	Tue Feb 12 10:13:56 2002
-@@ -16378,8 +16378,8 @@
+--- configure.orig	Fri Feb 15 18:43:40 2002
++++ configure	Wed Feb 27 09:37:41 2002
+@@ -16692,8 +16692,8 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  		fi
  		;;
@@ -14,7 +14,7 @@ $FreeBSD$
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -16457,13 +16457,13 @@
+@@ -16771,13 +16771,13 @@
             	fi
  		;;
               *)
@@ -31,13 +31,13 @@ $FreeBSD$
  			fi
  			if test x"$have_threads" = xposix; then
  				defattr=0
-@@ -17660,13 +17660,13 @@
+@@ -17974,13 +17974,13 @@
     #
     # Check for libiconv
     #
--   echo "$as_me:17663: checking for libiconv_open in -liconv" >&5
+-   echo "$as_me:17977: checking for libiconv_open in -liconv" >&5
 -echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+   echo "$as_me:17663: checking for libiconv_open in -lgiconv" >&5
++   echo "$as_me:17977: checking for libiconv_open in -lgiconv" >&5
 +echo $ECHO_N "checking for libiconv_open in -lgiconv... $ECHO_C" >&6
  if test "${ac_cv_lib_iconv_libiconv_open+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -46,9 +46,9 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 17671 "configure"
+ #line 17985 "configure"
  #include "confdefs.h"
-@@ -17728,7 +17728,7 @@
+@@ -18042,7 +18042,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index b581f40a3641..e8a251f0a9e3 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -68,16 +68,16 @@ include/glib-2.0/gobject/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
 lib/libglib-1.3.a
 lib/libglib-1.3.so
-lib/libglib-1.3.so.13
+lib/libglib-1.3.so.14
 lib/libgmodule-1.3.a
 lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.13
+lib/libgmodule-1.3.so.14
 lib/libgobject-1.3.a
 lib/libgobject-1.3.so
-lib/libgobject-1.3.so.13
+lib/libgobject-1.3.so.14
 lib/libgthread-1.3.a
 lib/libgthread-1.3.so
-lib/libgthread-1.3.so.13
+lib/libgthread-1.3.so.14
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -85,7 +85,6 @@ libdata/pkgconfig/gthread-2.0.pc
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
 share/glib-2.0/gettext/po/Makefile.in.in
-share/glib-2.0/gettext/po/po2tbl.sed.in
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/ca/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
@@ -94,6 +93,7 @@ share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo
 share/locale/gl/LC_MESSAGES/glib20.mo
 share/locale/ja/LC_MESSAGES/glib20.mo
+share/locale/ko/LC_MESSAGES/glib20.mo
 share/locale/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo