Index: head/devel/glib13/Makefile
===================================================================
--- head/devel/glib13/Makefile	(revision 53290)
+++ head/devel/glib13/Makefile	(revision 53291)
@@ -1,44 +1,45 @@
 # New ports collection makefile for:   glib13
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.12
 CATEGORIES=	devel
 MASTER_SITES=	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}
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 NO_LATEST_LINK=	"Unstable, development version."
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 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}
 
 MAN1=		glib-genmarshal.1 glib-mkenums.1
 
 pre-patch:
 	@find ${WRKSRC} -type f | xargs ${GREP} -l iconv.h | \
 		xargs ${PERL} -pi -e "s|iconv\.h|giconv.h|g"
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/glibconfig.h ${PREFIX}/include/glib-2.0
 
 .include <bsd.port.mk>

Property changes on: head/devel/glib13/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.46
\ No newline at end of property
+1.47
\ No newline at end of property
Index: head/devel/glib13/distinfo
===================================================================
--- head/devel/glib13/distinfo	(revision 53290)
+++ head/devel/glib13/distinfo	(revision 53291)
@@ -1 +1 @@
-MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0
+MD5 (glib-1.3.12.tar.gz) = ef5be630496f3b3078a042f265ef07d3

Property changes on: head/devel/glib13/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/devel/glib13/files/patch-ae
===================================================================
--- head/devel/glib13/files/patch-ae	(revision 53290)
+++ head/devel/glib13/files/patch-ae	(revision 53291)
@@ -1,81 +1,59 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Sep 25 18:36:39 2001
-+++ configure	Wed Oct 24 10:00:12 2001
-@@ -9924,6 +9924,12 @@
- 	  linux*)
- 	    G_MODULE_LDFLAGS='-rdynamic'
- 	    ;;
-+	  freebsd*)
-+	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+	    if test $objformat = "elf"; then
-+	      G_MODULE_LDFLAGS='-Wl,-E'
-+	    fi
-+	    ;;
- 	esac
- 	LIBS_orig="$LIBS"
- 	LDFLAGS_orig="$LDFLAGS"
-@@ -10472,8 +10478,8 @@
+--- configure.orig	Mon Dec 24 00:50:12 2001
++++ configure	Fri Jan 18 09:40:30 2002
+@@ -16354,8 +16354,8 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
 -	*-freebsd2.2*)
 -		G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
 +	*-freebsd*)
 +		G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -10553,13 +10559,13 @@
-            	fi	
+@@ -16433,13 +16433,13 @@
+            	fi
  		;;
               *)
 -		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
-@@ -11058,6 +11064,7 @@
- 		if test "$cross_compiling" = yes; then
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-+#  LIBS="-lgiconv  $LIBS"
-   cat > conftest.$ac_ext <<EOF
- #line 11063 "configure"
- #include "confdefs.h"
-@@ -11516,14 +11523,14 @@
+@@ -17636,13 +17636,13 @@
     #
     # Check for libiconv
     #
--   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:11521: checking for libiconv_open in -liconv" >&5
-+   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:11521: checking for libiconv_open in -lgiconv" >&5
- ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+-   echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
+-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
++   echo "$as_me:17639: 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_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 11529 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 17647 "configure"
  #include "confdefs.h"
-@@ -11563,7 +11570,7 @@
+@@ -17704,7 +17704,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
 -  ICONV_LIBS="-liconv"
 +  ICONV_LIBS="-lgiconv"
-   cat >> confdefs.h <<\EOF
+   cat >>confdefs.h <<\_ACEOF
  #define USE_LIBICONV 1
- EOF
+ _ACEOF

Property changes on: head/devel/glib13/files/patch-ae
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/devel/glib13/files/patch-ag
===================================================================
--- head/devel/glib13/files/patch-ag	(revision 53290)
+++ head/devel/glib13/files/patch-ag	(revision 53291)
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Wed Oct 24 10:00:39 2001
-+++ Makefile.in	Wed Oct 24 10:01:07 2001
-@@ -147,7 +147,7 @@
+--- Makefile.in.orig	Fri Jan 18 09:43:54 2002
++++ Makefile.in	Fri Jan 18 09:45:49 2002
+@@ -149,7 +149,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
--SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po
-+SUBDIRS = . m4macros glib gobject gmodule gthread docs build po
+-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
++SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
  
- INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ 	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+ bin_SCRIPTS = glib-gettextize
  
-@@ -159,7 +159,7 @@
- BUILT_EXTRA_DIST =  	glibconfig.h.win32		config.h.win32			glib.spec
+@@ -191,7 +191,7 @@
+ 	glib-zip
  
  
 -configexecincludedir = $(libdir)/glib-2.0/include
 +configexecincludedir = $(glibincludedir)
  
  CONFIGURE_DEPENDENCIES = acglib.m4
  

Property changes on: head/devel/glib13/files/patch-ag
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/devel/glib13/files/patch-glib::libcharset::Makefile.in
===================================================================
--- head/devel/glib13/files/patch-glib::libcharset::Makefile.in	(nonexistent)
+++ head/devel/glib13/files/patch-glib::libcharset::Makefile.in	(revision 53291)
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- glib/libcharset/Makefile.in	2002/01/18 08:04:15	1.1
++++ glib/libcharset/Makefile.in	2002/01/18 08:13:49
+@@ -148,7 +148,7 @@
+ ms_librarian = @ms_librarian@
+ 
+ INCLUDES = \
+-	-DLIBDIR=\"$(libdir)\"
++	-DLIBDIR=\"$(prefix)/libdata\"
+ 
+ 
+ noinst_LTLIBRARIES = libcharset.la
+@@ -172,8 +172,8 @@
+ 	make-patch.sh
+ 
+ 
+-charset_alias = $(DESTDIR)$(libdir)/charset.alias
+-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
++charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
++charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
+ 
+ SUFFIXES = .sed .sin
+ 

Property changes on: head/devel/glib13/files/patch-glib::libcharset::Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/devel/glib13/files/patch-gmodule::gmodule-dl.c
===================================================================
--- head/devel/glib13/files/patch-gmodule::gmodule-dl.c	(nonexistent)
+++ head/devel/glib13/files/patch-gmodule::gmodule-dl.c	(revision 53291)
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- 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 @@
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -115,6 +116,9 @@
+     g_module_set_error (fetch_dlerror (TRUE));
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void

Property changes on: head/devel/glib13/files/patch-gmodule::gmodule-dl.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/devel/glib13/pkg-plist
===================================================================
--- head/devel/glib13/pkg-plist	(revision 53290)
+++ head/devel/glib13/pkg-plist	(revision 53291)
@@ -1,103 +1,115 @@
 bin/glib-genmarshal
+bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
 include/glib-2.0/glib-object.h
 include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
 include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gcompletion.h
 include/glib-2.0/glib/gconvert.h
 include/glib-2.0/glib/gdataset.h
 include/glib-2.0/glib/gdate.h
+include/glib-2.0/glib/gdir.h
 include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
 include/glib-2.0/glib/ghash.h
 include/glib-2.0/glib/ghook.h
 include/glib-2.0/glib/giochannel.h
 include/glib-2.0/glib/glist.h
 include/glib-2.0/glib/gmacros.h
 include/glib-2.0/glib/gmain.h
 include/glib-2.0/glib/gmarkup.h
 include/glib-2.0/glib/gmem.h
 include/glib-2.0/glib/gmessages.h
 include/glib-2.0/glib/gnode.h
 include/glib-2.0/glib/gpattern.h
 include/glib-2.0/glib/gprimes.h
 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/grel.h
 include/glib-2.0/glib/gscanner.h
 include/glib-2.0/glib/gshell.h
 include/glib-2.0/glib/gslist.h
 include/glib-2.0/glib/gspawn.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h
 include/glib-2.0/glib/gtimer.h
 include/glib-2.0/glib/gtree.h
 include/glib-2.0/glib/gtypes.h
 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
 include/glib-2.0/gobject/gsourceclosure.h
 include/glib-2.0/gobject/gtype.h
 include/glib-2.0/gobject/gtypemodule.h
 include/glib-2.0/gobject/gtypeplugin.h
 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.9
+lib/libglib-1.3.so.12
 lib/libgmodule-1.3.a
 lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.9
+lib/libgmodule-1.3.so.12
 lib/libgobject-1.3.a
 lib/libgobject-1.3.so
-lib/libgobject-1.3.so.9
+lib/libgobject-1.3.so.12
 lib/libgthread-1.3.a
 lib/libgthread-1.3.so
-lib/libgthread-1.3.so.9
+lib/libgthread-1.3.so.12
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
 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
 share/locale/es/LC_MESSAGES/glib20.mo
 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/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
 share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/LC_MESSAGES/glib20.mo
 share/locale/tr/LC_MESSAGES/glib20.mo
 share/locale/uk/LC_MESSAGES/glib20.mo
+share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@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

Property changes on: head/devel/glib13/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.27
\ No newline at end of property
+1.28
\ No newline at end of property
Index: head/devel/glib20/Makefile
===================================================================
--- head/devel/glib20/Makefile	(revision 53290)
+++ head/devel/glib20/Makefile	(revision 53291)
@@ -1,44 +1,45 @@
 # New ports collection makefile for:   glib13
 # Date Created:			28 July 1998
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.9
+PORTVERSION=	1.3.12
 CATEGORIES=	devel
 MASTER_SITES=	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}
 
 MAINTAINER=	gnome@FreeBSD.org
 
 BUILD_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
 NO_LATEST_LINK=	"Unstable, development version."
 
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 USE_GMAKE=	yes
 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}
 
 MAN1=		glib-genmarshal.1 glib-mkenums.1
 
 pre-patch:
 	@find ${WRKSRC} -type f | xargs ${GREP} -l iconv.h | \
 		xargs ${PERL} -pi -e "s|iconv\.h|giconv.h|g"
 	@find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
 		's|\$\(libdir\)/pkgconfig|\$\(prefix\)/libdata/pkgconfig|g'
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/glibconfig.h ${PREFIX}/include/glib-2.0
 
 .include <bsd.port.mk>

Property changes on: head/devel/glib20/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.46
\ No newline at end of property
+1.47
\ No newline at end of property
Index: head/devel/glib20/distinfo
===================================================================
--- head/devel/glib20/distinfo	(revision 53290)
+++ head/devel/glib20/distinfo	(revision 53291)
@@ -1 +1 @@
-MD5 (glib-1.3.9.tar.gz) = 630e78ed84ee94ab83f8d328431003c0
+MD5 (glib-1.3.12.tar.gz) = ef5be630496f3b3078a042f265ef07d3

Property changes on: head/devel/glib20/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.26
\ No newline at end of property
+1.27
\ No newline at end of property
Index: head/devel/glib20/files/patch-ae
===================================================================
--- head/devel/glib20/files/patch-ae	(revision 53290)
+++ head/devel/glib20/files/patch-ae	(revision 53291)
@@ -1,81 +1,59 @@
 
 $FreeBSD$
 
---- configure.orig	Tue Sep 25 18:36:39 2001
-+++ configure	Wed Oct 24 10:00:12 2001
-@@ -9924,6 +9924,12 @@
- 	  linux*)
- 	    G_MODULE_LDFLAGS='-rdynamic'
- 	    ;;
-+	  freebsd*)
-+	    objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
-+	    if test $objformat = "elf"; then
-+	      G_MODULE_LDFLAGS='-Wl,-E'
-+	    fi
-+	    ;;
- 	esac
- 	LIBS_orig="$LIBS"
- 	LDFLAGS_orig="$LDFLAGS"
-@@ -10472,8 +10478,8 @@
+--- configure.orig	Mon Dec 24 00:50:12 2001
++++ configure	Fri Jan 18 09:40:30 2002
+@@ -16354,8 +16354,8 @@
              	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
  		fi
  		;;
 -	*-freebsd2.2*)
 -		G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
 +	*-freebsd*)
 +		G_THREAD_CFLAGS="$G_THREAD_CFLAGS $PTHREAD_CFLAGS"
  
  		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
  		# -mthreads flag.
-@@ -10553,13 +10559,13 @@
-            	fi	
+@@ -16433,13 +16433,13 @@
+            	fi
  		;;
               *)
 -		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
-@@ -11058,6 +11064,7 @@
- 		if test "$cross_compiling" = yes; then
-     { echo "configure: error: can not run test program while cross compiling" 1>&2; exit 1; }
- else
-+#  LIBS="-lgiconv  $LIBS"
-   cat > conftest.$ac_ext <<EOF
- #line 11063 "configure"
- #include "confdefs.h"
-@@ -11516,14 +11523,14 @@
+@@ -17636,13 +17636,13 @@
     #
     # Check for libiconv
     #
--   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
--echo "configure:11521: checking for libiconv_open in -liconv" >&5
-+   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
-+echo "configure:11521: checking for libiconv_open in -lgiconv" >&5
- ac_lib_var=`echo iconv'_'libiconv_open | sed 'y%./+-%__p_%'`
- if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
-   echo $ac_n "(cached) $ac_c" 1>&6
+-   echo "$as_me:17639: checking for libiconv_open in -liconv" >&5
+-echo $ECHO_N "checking for libiconv_open in -liconv... $ECHO_C" >&6
++   echo "$as_me:17639: 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_save_LIBS="$LIBS"
+   ac_check_lib_save_LIBS=$LIBS
 -LIBS="-liconv  $LIBS"
 +LIBS="-lgiconv  $LIBS"
- cat > conftest.$ac_ext <<EOF
- #line 11529 "configure"
+ cat >conftest.$ac_ext <<_ACEOF
+ #line 17647 "configure"
  #include "confdefs.h"
-@@ -11563,7 +11570,7 @@
+@@ -17704,7 +17704,7 @@
  fi
  
  if test "x$with_libiconv" = "xyes" ; then
 -  ICONV_LIBS="-liconv"
 +  ICONV_LIBS="-lgiconv"
-   cat >> confdefs.h <<\EOF
+   cat >>confdefs.h <<\_ACEOF
  #define USE_LIBICONV 1
- EOF
+ _ACEOF

Property changes on: head/devel/glib20/files/patch-ae
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/devel/glib20/files/patch-ag
===================================================================
--- head/devel/glib20/files/patch-ag	(revision 53290)
+++ head/devel/glib20/files/patch-ag	(revision 53291)
@@ -1,23 +1,23 @@
 
 $FreeBSD$
 
---- Makefile.in.orig	Wed Oct 24 10:00:39 2001
-+++ Makefile.in	Wed Oct 24 10:01:07 2001
-@@ -147,7 +147,7 @@
+--- Makefile.in.orig	Fri Jan 18 09:43:54 2002
++++ Makefile.in	Fri Jan 18 09:45:49 2002
+@@ -149,7 +149,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
--SUBDIRS = . m4macros glib gobject gmodule gthread docs tests build po
-+SUBDIRS = . m4macros glib gobject gmodule gthread docs build po
+-SUBDIRS = . m4macros glib gobject gmodule gthread tests build po docs
++SUBDIRS = . m4macros glib gobject gmodule gthread build po docs
  
- INCLUDES = -DG_LOG_DOMAIN=g_log_domain_glib @GLIB_DEBUG_FLAGS@ 	-DG_DISABLE_DEPRECATED -DGLIB_COMPILATION
+ bin_SCRIPTS = glib-gettextize
  
-@@ -159,7 +159,7 @@
- BUILT_EXTRA_DIST =  	glibconfig.h.win32		config.h.win32			glib.spec
+@@ -191,7 +191,7 @@
+ 	glib-zip
  
  
 -configexecincludedir = $(libdir)/glib-2.0/include
 +configexecincludedir = $(glibincludedir)
  
  CONFIGURE_DEPENDENCIES = acglib.m4
  

Property changes on: head/devel/glib20/files/patch-ag
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.5
\ No newline at end of property
+1.6
\ No newline at end of property
Index: head/devel/glib20/files/patch-glib::libcharset::Makefile.in
===================================================================
--- head/devel/glib20/files/patch-glib::libcharset::Makefile.in	(nonexistent)
+++ head/devel/glib20/files/patch-glib::libcharset::Makefile.in	(revision 53291)
@@ -0,0 +1,25 @@
+
+$FreeBSD$
+
+--- glib/libcharset/Makefile.in	2002/01/18 08:04:15	1.1
++++ glib/libcharset/Makefile.in	2002/01/18 08:13:49
+@@ -148,7 +148,7 @@
+ ms_librarian = @ms_librarian@
+ 
+ INCLUDES = \
+-	-DLIBDIR=\"$(libdir)\"
++	-DLIBDIR=\"$(prefix)/libdata\"
+ 
+ 
+ noinst_LTLIBRARIES = libcharset.la
+@@ -172,8 +172,8 @@
+ 	make-patch.sh
+ 
+ 
+-charset_alias = $(DESTDIR)$(libdir)/charset.alias
+-charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
++charset_alias = $(DESTDIR)$(prefix)/libdata/charset.alias
++charset_tmp = $(DESTDIR)$(prefix)/libdata/charset.tmp
+ 
+ SUFFIXES = .sed .sin
+ 

Property changes on: head/devel/glib20/files/patch-glib::libcharset::Makefile.in
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/devel/glib20/files/patch-gmodule::gmodule-dl.c
===================================================================
--- head/devel/glib20/files/patch-gmodule::gmodule-dl.c	(nonexistent)
+++ head/devel/glib20/files/patch-gmodule::gmodule-dl.c	(revision 53291)
@@ -0,0 +1,23 @@
+
+$FreeBSD$
+
+--- 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 @@
+ static gpointer
+ _g_module_self (void)
+ {
++#ifndef __FreeBSD__
+   gpointer handle;
+   
+   /* to query symbols from the program itself, special link options
+@@ -115,6 +116,9 @@
+     g_module_set_error (fetch_dlerror (TRUE));
+   
+   return handle;
++#else
++  return RTLD_DEFAULT;
++#endif
+ }
+ 
+ static void

Property changes on: head/devel/glib20/files/patch-gmodule::gmodule-dl.c
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.1
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+FreeBSD=%H
\ No newline at end of property
Index: head/devel/glib20/pkg-plist
===================================================================
--- head/devel/glib20/pkg-plist	(revision 53290)
+++ head/devel/glib20/pkg-plist	(revision 53291)
@@ -1,103 +1,115 @@
 bin/glib-genmarshal
+bin/glib-gettextize
 bin/glib-mkenums
 bin/gobject-query
 include/glib-2.0/glib-object.h
 include/glib-2.0/glib.h
 include/glib-2.0/glib/galloca.h
 include/glib-2.0/glib/garray.h
 include/glib-2.0/glib/gasyncqueue.h
 include/glib-2.0/glib/gbacktrace.h
 include/glib-2.0/glib/gcache.h
 include/glib-2.0/glib/gcompletion.h
 include/glib-2.0/glib/gconvert.h
 include/glib-2.0/glib/gdataset.h
 include/glib-2.0/glib/gdate.h
+include/glib-2.0/glib/gdir.h
 include/glib-2.0/glib/gerror.h
 include/glib-2.0/glib/gfileutils.h
 include/glib-2.0/glib/ghash.h
 include/glib-2.0/glib/ghook.h
 include/glib-2.0/glib/giochannel.h
 include/glib-2.0/glib/glist.h
 include/glib-2.0/glib/gmacros.h
 include/glib-2.0/glib/gmain.h
 include/glib-2.0/glib/gmarkup.h
 include/glib-2.0/glib/gmem.h
 include/glib-2.0/glib/gmessages.h
 include/glib-2.0/glib/gnode.h
 include/glib-2.0/glib/gpattern.h
 include/glib-2.0/glib/gprimes.h
 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/grel.h
 include/glib-2.0/glib/gscanner.h
 include/glib-2.0/glib/gshell.h
 include/glib-2.0/glib/gslist.h
 include/glib-2.0/glib/gspawn.h
 include/glib-2.0/glib/gstrfuncs.h
 include/glib-2.0/glib/gstring.h
 include/glib-2.0/glib/gthread.h
 include/glib-2.0/glib/gthreadpool.h
 include/glib-2.0/glib/gtimer.h
 include/glib-2.0/glib/gtree.h
 include/glib-2.0/glib/gtypes.h
 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
 include/glib-2.0/gobject/gsourceclosure.h
 include/glib-2.0/gobject/gtype.h
 include/glib-2.0/gobject/gtypemodule.h
 include/glib-2.0/gobject/gtypeplugin.h
 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.9
+lib/libglib-1.3.so.12
 lib/libgmodule-1.3.a
 lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.9
+lib/libgmodule-1.3.so.12
 lib/libgobject-1.3.a
 lib/libgobject-1.3.so
-lib/libgobject-1.3.so.9
+lib/libgobject-1.3.so.12
 lib/libgthread-1.3.a
 lib/libgthread-1.3.so
-lib/libgthread-1.3.so.9
+lib/libgthread-1.3.so.12
 libdata/pkgconfig/glib-2.0.pc
 libdata/pkgconfig/gmodule-2.0.pc
 libdata/pkgconfig/gobject-2.0.pc
 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
 share/locale/es/LC_MESSAGES/glib20.mo
 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/nl/LC_MESSAGES/glib20.mo
 share/locale/nn/LC_MESSAGES/glib20.mo
 share/locale/no/LC_MESSAGES/glib20.mo
+share/locale/ro/LC_MESSAGES/glib20.mo
 share/locale/ru/LC_MESSAGES/glib20.mo
 share/locale/sk/LC_MESSAGES/glib20.mo
 share/locale/sl/LC_MESSAGES/glib20.mo
 share/locale/sv/LC_MESSAGES/glib20.mo
 share/locale/ta/LC_MESSAGES/glib20.mo
 share/locale/tr/LC_MESSAGES/glib20.mo
 share/locale/uk/LC_MESSAGES/glib20.mo
+share/locale/zh_CN/LC_MESSAGES/glib20.mo
 share/locale/zh_TW/LC_MESSAGES/glib20.mo
+@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

Property changes on: head/devel/glib20/pkg-plist
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.27
\ No newline at end of property
+1.28
\ No newline at end of property