6 files changed, 152 insertions, 28 deletions

diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 21480cc2d4d3..ff9743819059 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	glib
-PORTVERSION=	1.3.1
+PORTVERSION=	1.3.2
 CATEGORIES=	devel
 MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.3/ \
 		ftp://ftp.cs.umn.edu/pub/gimp/gtk/v1.3/ \
@@ -14,11 +14,20 @@ MASTER_SITES=	ftp://ftp.gimp.org/pub/gtk/v1.3/ \
 
 MAINTAINER=	vanilla@FreeBSD.org
 
+LIB_DEPENDS=	giconv.2:${PORTSDIR}/converters/libiconv
+#iconv.1:${PORTSDIR}/converters/iconv
+
 NO_LATEST_LINK=	"Unstable, development version."
 
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
+CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
+		LDFLAGS="-L${LOCALBASE}/lib"
+
+MAN1=		glib-config-2.0.1 glib-genmarshal.1
 
-MAN1=		glib-config-2.0.1
+pre-patch:
+	@find ${WRKSRC} -type f | xargs ${GREP} -l iconv.h | \
+		xargs ${PERL} -pi -e "s|iconv\.h|giconv.h|g"
 
 .include <bsd.port.mk>
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 4f95e32da09f..c90ab9761b04 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1 +1 @@
-MD5 (glib-1.3.1.tar.gz) = be7e038afea8c92f1b01c60e1f304556
+MD5 (glib-1.3.2.tar.gz) = 64f11623bfd9809eb71a53acf4e93b47
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index 33da4edb32a4..3e306163ee3d 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	Fri Jul 14 22:09:59 2000
-+++ configure	Tue Jul 18 10:06:24 2000
-@@ -4580,6 +4580,12 @@
+--- configure.orig	Fri Nov 17 22:45:11 2000
++++ configure	Mon Nov 20 18:27:43 2000
+@@ -4230,6 +4230,12 @@
  	  linux*)
  	    G_MODULE_LDFLAGS='-rdynamic'
  	    ;;
@@ -13,7 +13,16 @@
  	esac
  	LIBS_orig="$LIBS"
  	LDFLAGS_orig="$LDFLAGS"
-@@ -4864,8 +4870,8 @@
+@@ -4523,7 +4529,7 @@
+             	        G_THREAD_CFLAGS="$G_THREAD_CFLAGS -mthreads"
+ 		fi
+ 		;;
+-	*-freebsd2.2*)
++	*-freebsd*)
+ 		G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_THREAD_SAFE"
+ 
+ 		# FreeBSD 2.2.x shiped with gcc 2.7.2.x, which doesn't support
+@@ -4610,8 +4616,8 @@
  				add_thread_lib=""
  				IN=""
  			else
@@ -23,13 +32,47 @@
 +				IN=" in -$thread_lib"
  			fi
  			if test x"$have_threads" = xposix; then
- 				defattr=NULL
-@@ -5042,7 +5048,7 @@
- 
- if test x"$enable_threads" = xyes; then
- 
--    G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT" # good default guess
-+    G_THREAD_CFLAGS="$G_THREAD_CFLAGS -D_REENTRANT -D_THREAD_SAFE" # good default guess
+ 				defattr=0
+@@ -4912,7 +4918,7 @@
+                                         		sizeof (buffer));
+ ; return 0; }
+ EOF
+-if { (eval echo configure:4916: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>&5; }; then
++if { (eval echo configure:4916: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null; then
+   rm -rf conftest*
+   ac_cv_func_nonposix_getpwuid_r=yes
+ else
+@@ -5413,6 +5419,7 @@
+ if eval "test \"`echo '$''{'ac_cv_func_iconv_open'+set}'`\" = set"; then
+   echo $ac_n "(cached) $ac_c" 1>&6
+ else
++#  LIBS="-liconv  $LIBS"
+   cat > conftest.$ac_ext <<EOF
+ #line 5418 "configure"
+ #include "confdefs.h"
+@@ -5462,14 +5469,14 @@
+    #
+    # Check for libiconv
+    #
+-   echo $ac_n "checking for libiconv_open in -liconv""... $ac_c" 1>&6
++   echo $ac_n "checking for libiconv_open in -lgiconv""... $ac_c" 1>&6
+ echo "configure:5467: checking for libiconv_open in -liconv" >&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
+ else
+   ac_save_LIBS="$LIBS"
+-LIBS="-liconv  $LIBS"
++LIBS="-lgiconv  $LIBS"
+ cat > conftest.$ac_ext <<EOF
+ #line 5475 "configure"
+ #include "confdefs.h"
+@@ -5509,7 +5516,7 @@
+ fi
  
-     case $host in
- 	*-aix*)
+ if test "x$with_libiconv" = "xyes" ; then
+-  ICONV_LIBS="-liconv"
++  ICONV_LIBS="-lgiconv"
+   cat >> confdefs.h <<\EOF
+ #define USE_LIBICONV 1
+ EOF
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
index f87e5fbe1b95..b91c8e5ed4be 100644
--- a/devel/glib20/files/patch-ag
+++ b/devel/glib20/files/patch-ag
@@ -1,11 +1,29 @@
---- Makefile.in.orig	Mon Jul 17 10:37:18 2000
-+++ Makefile.in	Mon Jul 17 10:38:06 2000
-@@ -103,7 +103,7 @@
+--- Makefile.in.orig	Fri Nov 17 22:45:29 2000
++++ Makefile.in	Mon Nov 20 12:01:17 2000
+@@ -108,7 +108,7 @@
  
  AUTOMAKE_OPTIONS = 1.4
  
--SUBDIRS = . gobject gmodule gthread docs tests
-+SUBDIRS = . gobject gmodule gthread docs
+-SUBDIRS = . gobject gmodule gthread docs tests build
++SUBDIRS = . gobject gmodule gthread docs build
  
  bin_SCRIPTS = glib-config-2.0
  
+@@ -134,7 +134,7 @@
+ glibinclude_HEADERS =  	galloca.h		garray.h		gasyncqueue.h		gbacktrace.h		gcache.h		gcompletion.h		gconvert.h		gdataset.h		gdate.h			gerror.h		gfileutils.h		ghash.h			ghook.h			giochannel.h		glib.h 			glib-object.h		glist.h			gmacros.h		gmain.h			gmarkup.h		gmem.h			gmessages.h		gnode.h			gprimes.h		gquark.h		gqueue.h		grand.h			grel.h			gscanner.h		gshell.h		gslist.h		gspawn.h		gstrfuncs.h		gstring.h		gthread.h		gthreadpool.h		gtimer.h		gtree.h			gtypes.h		gunicode.h		gutils.h		gwin32.h
+ 
+ 
+-configexecincludedir = $(libdir)/glib-2.0/include
++configexecincludedir = $(glibincludedir)
+ 
+ CONFIGURE_DEPENDENCIES = acglib.m4
+ 
+@@ -594,7 +594,7 @@
+ 		install-exec-local
+ install-exec: install-exec-recursive
+ 
+-install-data-am: install-m4dataDATA install-pkgconfigDATA \
++install-data-am: install-m4dataDATA \
+ 		install-glibincludeHEADERS
+ install-data: install-data-recursive
+ 
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-ah
new file mode 100644
index 000000000000..afb4544d268b
--- /dev/null
+++ b/devel/glib20/files/patch-ah
@@ -0,0 +1,11 @@
+--- docs/reference/Makefile.in	2000/11/20 09:49:25	1.1
++++ docs/reference/Makefile.in	2000/11/20 09:50:55
+@@ -106,7 +106,7 @@
+ STRIP_END = @STRIP_END@
+ VERSION = @VERSION@
+ 
+-SUBDIRS = glib gobject
++SUBDIRS = #glib gobject
+ mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+ CONFIG_HEADER = ../../config.h
+ CONFIG_CLEAN_FILES = 
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index bcf16eadc2d6..893c701acbcf 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -1,33 +1,76 @@
 bin/glib-config-2.0
+bin/glib-genmarshal
 bin/gobject-query
+include/glib-2.0/galloca.h
+include/glib-2.0/garray.h
+include/glib-2.0/gasyncqueue.h
+include/glib-2.0/gbacktrace.h
+include/glib-2.0/gcache.h
+include/glib-2.0/gcompletion.h
+include/glib-2.0/gconvert.h
+include/glib-2.0/gdataset.h
+include/glib-2.0/gdate.h
 include/glib-2.0/gerror.h
+include/glib-2.0/gfileutils.h
+include/glib-2.0/ghash.h
+include/glib-2.0/ghook.h
+include/glib-2.0/giochannel.h
 include/glib-2.0/glib-object.h
 include/glib-2.0/glib.h
+include/glib-2.0/glibconfig.h
+include/glib-2.0/glist.h
+include/glib-2.0/gmacros.h
+include/glib-2.0/gmain.h
+include/glib-2.0/gmarkup.h
+include/glib-2.0/gmem.h
+include/glib-2.0/gmessages.h
 include/glib-2.0/gmodule.h
+include/glib-2.0/gnode.h
+include/glib-2.0/gobject/gboxed.h
+include/glib-2.0/gobject/gbsearcharray.h
+include/glib-2.0/gobject/gclosure.h
 include/glib-2.0/gobject/genums.h
 include/glib-2.0/gobject/gobject.h
 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/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/gvaluecollector.h
 include/glib-2.0/gobject/gvaluetypes.h
+include/glib-2.0/gprimes.h
+include/glib-2.0/gquark.h
+include/glib-2.0/gqueue.h
+include/glib-2.0/grand.h
+include/glib-2.0/grel.h
+include/glib-2.0/gscanner.h
+include/glib-2.0/gshell.h
+include/glib-2.0/gslist.h
+include/glib-2.0/gspawn.h
+include/glib-2.0/gstrfuncs.h
+include/glib-2.0/gstring.h
+include/glib-2.0/gthread.h
+include/glib-2.0/gthreadpool.h
+include/glib-2.0/gtimer.h
+include/glib-2.0/gtree.h
+include/glib-2.0/gtypes.h
 include/glib-2.0/gunicode.h
-lib/glib-2.0/include/glibconfig.h
+include/glib-2.0/gutils.h
+include/glib-2.0/gwin32.h
 lib/libglib-1.3.a
 lib/libglib-1.3.so
-lib/libglib-1.3.so.1
+lib/libglib-1.3.so.2
 lib/libgmodule-1.3.a
 lib/libgmodule-1.3.so
-lib/libgmodule-1.3.so.1
+lib/libgmodule-1.3.so.2
 lib/libgobject-1.3.a
 lib/libgobject-1.3.so
-lib/libgobject-1.3.so.1
+lib/libgobject-1.3.so.2
 lib/libgthread-1.3.a
 lib/libgthread-1.3.so
-lib/libgthread-1.3.so.1
+lib/libgthread-1.3.so.2
 share/aclocal/glib-2.0.m4
-@dirrm lib/glib-2.0/include
-@dirrm lib/glib-2.0
 @dirrm include/glib-2.0/gobject
 @dirrm include/glib-2.0