Update to 2.0.0.

PR:		35541
Submitted by:	Joe Marcus Clarke <marcus@marcuscom.com>

4 files changed, 102 insertions, 46 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 88f54d80fa65..b7edb142e8cf 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,9 +6,9 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.14
+PORTVERSION=	2.0.0
 CATEGORIES=	devel
-MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta,} \
+MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,pre-gnome2/releases/gnome-2.0-desktop-beta2,} \
 		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
 		http://www.ameth.org/gimp/%SUBDIR%/ \
@@ -29,6 +29,7 @@ USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+CONFIGURE_ARGS=	--enable-static
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 98f66c26ceb9..975a8bb391d0 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (gnome2/glib-1.3.14.tar.bz2) = 8bf2f7584928ce5edef30542ee9407d7
+MD5 (gnome2/glib-2.0.0.tar.bz2) = dd9d482ec739a41710080ee136f96444
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index eff5d0e563c9..9e3176622e51 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,9 +1,9 @@
 
 $FreeBSD$
 
---- configure.orig	Fri Feb 15 18:43:40 2002
-+++ configure	Wed Feb 27 09:37:41 2002
-@@ -16692,8 +16692,8 @@
+--- configure.orig	Fri Mar  8 17:54:21 2002
++++ configure	Mon Mar 11 10:21:32 2002
+@@ -16768,8 +16768,8 @@
  rm -f conftest.$ac_objext conftest.$ac_ext
  		fi
  		;;
@@ -14,30 +14,22 @@ $FreeBSD$
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -16771,13 +16771,13 @@
-            	fi
+@@ -16849,7 +16849,7 @@
+ 	     *-*-openbsd* | *-*-freebsd*)
+ 	        # FreeBSD and OpenBSD want us to use the -pthread flag
+                 # instead of linking to -lc_r and libtool enforces that.
+-		G_THREAD_LIBS="-pthread"
++		G_THREAD_LIBS="$PTHREAD_LIBS"
  		;;
               *)
--		for thread_lib in "" pthread pthread32 pthreads c_r thread dce; do
-+		for thread_lib in "$PTHREAD_LIBS" "" pthread pthread32 pthreads c_r thread dce; do
- 			if test x"$thread_lib" = x; then
- 				add_thread_lib=""
- 				IN=""
- 			else
--				add_thread_lib="-l$thread_lib"
--				IN=" in -l$thread_lib"
-+				add_thread_lib="$thread_lib"
-+				IN=" in $thread_lib"
- 			fi
- 			if test x"$have_threads" = xposix; then
- 				defattr=0
-@@ -17974,13 +17974,13 @@
-    #
-    # Check for libiconv
-    #
--   echo "$as_me:17977: checking for libiconv_open in -liconv" >&5
+ 		for thread_lib in "" pthread pthread32 pthreads thread dce; do
+@@ -18048,13 +18048,13 @@
+ 
+     # Check if we have GNU libiconv
+     if test $found_iconv = "no"; then
+-      echo "$as_me:18051: checking for libiconv_open in -liconv" >&5
 -echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
-+   echo "$as_me:17977: checking for libiconv_open in -lgiconv" >&5
++      echo "$as_me:18051: 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,14 +38,76 @@ $FreeBSD$
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
  cat >conftest.$ac_ext <<_ACEOF
- #line 17985 "configure"
+ #line 18059 "configure"
  #include "confdefs.h"
-@@ -18042,7 +18042,7 @@
+@@ -18108,15 +18108,15 @@
  fi
  
- if test "x$with_libiconv" = "xyes" ; then
--  ICONV_LIBS="-liconv"
-+  ICONV_LIBS="-lgiconv"
-   cat >>confdefs.h <<\_ACEOF
- #define USE_LIBICONV 1
+     fi
+-    # Check if we have a iconv in -liconv, possibly from vendor
++    # Check if we have a iconv in -lgiconv, possibly from vendor
+     if test $found_iconv = "no"; then
+-      echo "$as_me:18113: checking for iconv_open in -liconv" >&5
+-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
++      echo "$as_me:18113: checking for iconv_open in -lgiconv" >&5
++echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
++LIBS="-lgiconv  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 18121 "configure"
+ #include "confdefs.h"
+@@ -18242,13 +18242,13 @@
+ 
+     ;;
+   gnu|yes)
+-    echo "$as_me:18245: checking for libiconv_open in -liconv" >&5
+-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
++    echo "$as_me:18245: 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
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
++LIBS="-lgiconv  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 18253 "configure"
+ #include "confdefs.h"
+@@ -18303,13 +18303,13 @@
+ 
+     ;;
+   native)
+-    echo "$as_me:18306: checking for iconv_open in -liconv" >&5
+-echo $ECHO_N "checking for iconv_open in -liconv... $ECHO_C" >&6
++    echo "$as_me:18306: checking for iconv_open in -lgiconv" >&5
++echo $ECHO_N "checking for iconv_open in -lgiconv... $ECHO_C" >&6
+ if test "${ac_cv_lib_iconv_iconv_open+set}" = set; then
+   echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+   ac_check_lib_save_LIBS=$LIBS
+-LIBS="-liconv  $LIBS"
++LIBS="-lgiconv  $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 18314 "configure"
+ #include "confdefs.h"
+@@ -18373,14 +18373,14 @@
+ 
+ case $with_libiconv in
+   gnu)
+-    ICONV_LIBS="-liconv"
++    ICONV_LIBS="-lgiconv"
+     cat >>confdefs.h <<\_ACEOF
+ #define USE_LIBICONV_GNU Using GNU libiconv
+ _ACEOF
+ 
+     ;;
+   native)
+-    ICONV_LIBS="-liconv"
++    ICONV_LIBS="-lgiconv"
+     cat >>confdefs.h <<\_ACEOF
+ #define USE_LIBICONV_NATIVE Using a native implementation of iconv in a separate library
  _ACEOF
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index e8a251f0a9e3..0c54c02ff9c1 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -66,18 +66,18 @@ include/glib-2.0/gobject/gvalue.h
 include/glib-2.0/gobject/gvaluearray.h
 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.14
-lib/libgmodule-1.3.a
-lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.14
-lib/libgobject-1.3.a
-lib/libgobject-1.3.so
-lib/libgobject-1.3.so.14
-lib/libgthread-1.3.a
-lib/libgthread-1.3.so
-lib/libgthread-1.3.so.14
+lib/libglib-2.0.a
+lib/libglib-2.0.so
+lib/libglib-2.0.so.0
+lib/libgmodule-2.0.a
+lib/libgmodule-2.0.so
+lib/libgmodule-2.0.so.0
+lib/libgobject-2.0.a
+lib/libgobject-2.0.so
+lib/libgobject-2.0.so.0
+lib/libgthread-2.0.a
+lib/libgthread-2.0.so
+lib/libgthread-2.0.so.0
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
@@ -88,6 +88,7 @@ share/glib-2.0/gettext/po/Makefile.in.in
 share/locale/az/LC_MESSAGES/glib20.mo
 share/locale/ca/LC_MESSAGES/glib20.mo
 share/locale/de/LC_MESSAGES/glib20.mo
+share/locale/el/LC_MESSAGES/glib20.mo
 share/locale/es/LC_MESSAGES/glib20.mo
 share/locale/eu/LC_MESSAGES/glib20.mo
 share/locale/fr/LC_MESSAGES/glib20.mo