Index: Makefile
===================================================================
RCS file: /usr2/ncvs/ports/devel/glib20/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- Makefile	27 Feb 2002 11:20:56 -0000	1.50
+++ Makefile	11 Mar 2002 03:32:42 -0000
@@ -6,19 +6,22 @@
 #
 
 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,} \
-		ftp://ftp.gimp.org/pub/%SUBDIR%/ \
-		ftp://ftp.cs.umn.edu/pub/gimp/%SUBDIR%/ \
-		http://www.ameth.org/gimp/%SUBDIR%/ \
-		${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,}
-MASTER_SITE_SUBDIR=	gtk/v${PORTVERSION:R}
+
+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%/ \
+               ${MASTER_SITE_RINGSERVER:S,%SUBDIR%,graphics/gimp/%SUBDIR%,} \
+	       ftp://ftp.gtk.org/pub/
+MASTER_SITE_SUBDIR=    gtk/v${PORTVERSION:R}
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 
-BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
+BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig \
+		autoconf:${PORTSDIR}/devel/autoconf
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv \
 		intl.1:${PORTSDIR}/devel/gettext
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
@@ -29,11 +32,14 @@
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
+USE_AUTOCONF=	yes
+AUTOCONF=	autoconf
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
 		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL}
+CONFIGURE_TARGET=	--target=${MACHINE_ARCH}-unknown-freebsd${OSREL} \
+		--enable-static=yes
 
 MAN1=		glib-genmarshal.1 glib-mkenums.1
 
Index: distinfo
===================================================================
RCS file: /usr2/ncvs/ports/devel/glib20/distinfo,v
retrieving revision 1.29
diff -u -r1.29 distinfo
--- distinfo	27 Feb 2002 11:20:56 -0000	1.29
+++ distinfo	11 Mar 2002 02:12:50 -0000
@@ -1 +1 @@
-MD5 (gnome2/glib-1.3.14.tar.bz2) = 8bf2f7584928ce5edef30542ee9407d7
+MD5 (gnome2/glib-2.0.0.tar.bz2) = dd9d482ec739a41710080ee136f96444
Index: pkg-plist
===================================================================
RCS file: /usr2/ncvs/ports/devel/glib20/pkg-plist,v
retrieving revision 1.30
diff -u -r1.30 pkg-plist
--- pkg-plist	27 Feb 2002 11:20:57 -0000	1.30
+++ pkg-plist	11 Mar 2002 03:28:06 -0000
@@ -1,7 +1,8 @@
-bin/glib-genmarshal
 bin/glib-gettextize
-bin/glib-mkenums
 bin/gobject-query
+bin/glib-genmarshal
+bin/glib-mkenums
+include/glib-2.0/glibconfig.h
 include/glib-2.0/glib-object.h
 include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
@@ -47,14 +48,10 @@
 include/glib-2.0/glib/gunicode.h
 include/glib-2.0/glib/gutils.h
 include/glib-2.0/glib/gwin32.h
-include/glib-2.0/glibconfig.h
-include/glib-2.0/gmodule.h
 include/glib-2.0/gobject/gboxed.h
 include/glib-2.0/gobject/gclosure.h
 include/glib-2.0/gobject/genums.h
-include/glib-2.0/gobject/gmarshal.h
 include/glib-2.0/gobject/gobject.h
-include/glib-2.0/gobject/gobjectnotifyqueue.c
 include/glib-2.0/gobject/gparam.h
 include/glib-2.0/gobject/gparamspecs.h
 include/glib-2.0/gobject/gsignal.h
@@ -66,28 +63,27 @@
 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
-libdata/pkgconfig/glib-2.0.pc
-libdata/pkgconfig/gmodule-2.0.pc
-libdata/pkgconfig/gobject-2.0.pc
-libdata/pkgconfig/gthread-2.0.pc
+include/glib-2.0/gobject/gobjectnotifyqueue.c
+include/glib-2.0/gobject/gmarshal.h
+include/glib-2.0/gmodule.h
+lib/libglib-2.0.a
+lib/libglib-2.0.so.0
+lib/libglib-2.0.so
+lib/libgobject-2.0.a
+lib/libgobject-2.0.so.0
+lib/libgobject-2.0.so
+lib/libgmodule-2.0.a
+lib/libgmodule-2.0.so.0
+lib/libgmodule-2.0.so
+lib/libgthread-2.0.a
+lib/libgthread-2.0.so.0
+lib/libgthread-2.0.so
 share/aclocal/glib-2.0.m4
 share/aclocal/glib-gettext.m4
-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
@@ -109,9 +105,15 @@
 share/locale/uk/LC_MESSAGES/glib20.mo
 share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
+share/glib-2.0/gettext/po/Makefile.in.in
+libdata/pkgconfig/glib-2.0.pc
+libdata/pkgconfig/gobject-2.0.pc
+libdata/pkgconfig/gmodule-2.0.pc
+libdata/pkgconfig/gthread-2.0.pc
+libdata/charset.alias
+@dirrm include/glib-2.0/glib
+@dirrm include/glib-2.0/gobject
+@dirrm include/glib-2.0
 @dirrm share/glib-2.0/gettext/po
 @dirrm share/glib-2.0/gettext
 @dirrm share/glib-2.0
-@dirrm include/glib-2.0/gobject
-@dirrm include/glib-2.0/glib
-@dirrm include/glib-2.0
Index: files/patch-configure.in
===================================================================
RCS file: files/patch-configure.in
diff -N files/patch-configure.in
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ files/patch-configure.in	11 Mar 2002 02:21:31 -0000
@@ -0,0 +1,42 @@
+--- configure.in.orig	Sun Mar 10 21:14:44 2002
++++ configure.in	Sun Mar 10 21:21:13 2002
+@@ -1204,7 +1204,7 @@
+ 		G_THREAD_LIBS="-pthread"
+ 		;;
+              *)
+-		for thread_lib in "" pthread pthread32 pthreads thread dce; do
++		for thread_lib in "" "$PTHREAD_LIBS" pthread pthread32 pthreads thread dce; do
+ 			if test x"$thread_lib" = x; then
+ 				add_thread_lib=""
+ 				IN=""
+@@ -1538,6 +1538,9 @@
+     if test $found_iconv = "no"; then
+       AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
+     fi
++    if test $found_iconv = "no"; then
++      AC_CHECK_LIB(giconv, libiconv_open, with_libiconv=ggnu; found_iconv=yes)
++    fi
+     # Check if we have a iconv in -liconv, possibly from vendor
+     if test $found_iconv = "no"; then
+       AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
+@@ -1548,6 +1551,9 @@
+     ;;
+   gnu|yes)
+     AC_CHECK_LIB(iconv, libiconv_open, with_libiconv=gnu; found_iconv=yes)
++    if test $found_iconv = "no"; then
++      AC_CHECK_LIB(giconv, libiconv_open, with_libiconv=ggnu; found_iconv=yes)
++    fi
+     ;;
+   native)
+     AC_CHECK_LIB(iconv, iconv_open, with_libiconv=native; found_iconv=yes)
+@@ -1561,6 +1567,10 @@
+ case $with_libiconv in
+   gnu)
+     ICONV_LIBS="-liconv"
++    AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
++    ;;
++  ggnu)
++    ICONV_LIBS="-lgiconv"
+     AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
+     ;;
+   native)