Update to 2.30.2.

git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16563 df743ca5-7f9a-e211-a948-0013205c9059

5 files changed, 91 insertions, 16 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 517d5ee33..493e311a7 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -3,11 +3,11 @@
 # Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.86 2011/10/15 13:01:16 kwm Exp $
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.87 2011/10/28 19:03:26 kwm Exp $
 #
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.30.1
+PORTVERSION=	2.30.2
 PORTREVISION=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index 3f78f692e..f706958a9 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.30.1.tar.xz) = 82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9
-SIZE (gnome2/glib-2.30.1.tar.xz) = 5809220
+SHA256 (gnome2/glib-2.30.2.tar.xz) = f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82
+SIZE (gnome2/glib-2.30.2.tar.xz) = 5818860
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index c1b255560..a9cced179 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -3,13 +3,13 @@
 # Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.214 2011/10/15 13:01:16 kwm Exp $
+#   $MCom: ports/devel/glib20/Makefile,v 1.215 2011/11/09 09:56:32 marcus Exp $
 #
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.30.1
-PORTREVISION?=	1
+PORTVERSION=	2.30.2
+PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_GNOME:S,%SUBDIR%,sources/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/},} \
 		ftp://ftp.gtk.org/pub/glib/${PORTVERSION:C/^([0-9]+\.[0-9]+).*/\1/}/ \
@@ -45,7 +45,6 @@ USE_PERL5=	yes
 CONFIGURE_ARGS=	--enable-static --with-libiconv=gnu \
 		--disable-gtk-doc --with-html-dir=${PREFIX}/share/doc \
 		--disable-man --without-xml-catalog \
-		--disable-dtrace \
 		--with-pcre=system \
 		--disable-fam
 CPPFLAGS+=	-I${LOCALBASE}/include
@@ -55,8 +54,16 @@ CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 
 OPTIONS=	COLLATION_FIX "fix string collation" off
 
+#CONFIGURE_ARGS+=--disable-silent-rules
+
 .include <bsd.port.pre.mk>
 
+#.if ${OSVERSION} >= 900000
+#CONFIGURE_ARGS+=--enable-dtrace
+#.else
+CONFIGURE_ARGS+=--disable-dtrace
+#.endif
+
 .if ${ARCH} == powerpc64
 EXTRA_PATCHES=	${FILESDIR}/extra-arch-powerpc64
 .endif
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 3f78f692e..f706958a9 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.30.1.tar.xz) = 82fde222ea33a0faac88e9b50f5b1f7fcfc235c861a9371e8fe47ec12c1e27f9
-SIZE (gnome2/glib-2.30.1.tar.xz) = 5809220
+SHA256 (gnome2/glib-2.30.2.tar.xz) = f0e91e6333321ddb48fa12b5c66f56c3d5f05325748c66dd2e9016c278ff8e82
+SIZE (gnome2/glib-2.30.2.tar.xz) = 5818860
diff --git a/devel/glib20/files/patch-ae b/devel/glib20/files/patch-ae
index ee22655db..80d40d28b 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/glib20/files/patch-ae
@@ -1,5 +1,5 @@
---- configure.orig	2011-09-15 16:59:35.000000000 +0200
-+++ configure	2011-09-15 17:02:03.000000000 +0200
+--- configure.orig	2011-11-01 08:48:56.000000000 +0100
++++ configure	2011-11-01 08:53:55.000000000 +0100
 @@ -583,6 +583,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5463,7 +5466,7 @@
+@@ -5471,7 +5474,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,7 +19,61 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -23331,7 +23334,7 @@
+@@ -14118,7 +14121,7 @@
+       hardcode_shlibpath_var=no
+       ;;
+ 
+-    freebsd1*)
++    freebsd1.*)
+       ld_shlibs=no
+       ;;
+ 
+@@ -14134,7 +14137,7 @@
+       ;;
+ 
+     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
+-    freebsd2*)
++    freebsd2.*)
+       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+       hardcode_direct=yes
+       hardcode_minus_L=yes
+@@ -15112,7 +15115,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -15141,7 +15144,7 @@
+   esac
+   shlibpath_var=LD_LIBRARY_PATH
+   case $host_os in
+-  freebsd2*)
++  freebsd2.*)
+     shlibpath_overrides_runpath=yes
+     ;;
+   freebsd3.[01]* | freebsdelf3.[01]*)
+@@ -17085,7 +17088,7 @@
+         esac
+         ;;
+ 
+-      freebsd[12]*)
++      freebsd[12].*)
+         # C++ shared libraries reported to be fairly broken before
+ 	# switch to ELF
+         ld_shlibs_CXX=no
+@@ -18949,7 +18952,7 @@
+   shlibpath_var=LD_LIBRARY_PATH
+   ;;
+ 
+-freebsd1*)
++freebsd1.*)
+   dynamic_linker=no
+   ;;
+ 
+@@ -23343,7 +23346,7 @@
  fi
  done
  
@@ -28,7 +82,7 @@
  do :
    as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
  ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
-@@ -26124,6 +26127,8 @@
+@@ -26136,6 +26139,8 @@
           ;;
      esac
    fi
@@ -37,7 +91,21 @@
  
    if test x"$G_THREAD_CFLAGS" = x; then
  
-@@ -28804,7 +28809,7 @@
+@@ -26907,8 +26912,11 @@
+ #  b) FreeBSD doesn't do this either.
+ #
+ case $host in
+-  *-*-freebsd*|*-*-linux*)
+-    G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
++  *-*-linux*)
++    G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
++    ;;
++  *-*-freebsd*)
++    G_THREAD_LIBS_FOR_GTHREAD="-pthread"
+     ;;
+   *)
+     G_THREAD_LIBS_FOR_GTHREAD="$G_THREAD_LIBS"
+@@ -28877,7 +28885,7 @@
  fi