3 files changed, 36 insertions, 17 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index 8a7fa526ccdf..6996cacb5c3f 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:   gio-fam-backend
-# Date Created:			22 December 2007
-# Whom:				Joe Marcus Clarke <marcus@FreeBSD.org>
-#
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.82 2011/06/11 19:51:14 mezz Exp $
-#
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.96 2012/12/09 20:42:55 kwm Exp $
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.28.8
-PORTREVISION=	1
+PORTVERSION=	2.34.3
+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/}/ \
@@ -27,7 +23,8 @@ USE_XZ=		yes
 BUILD_WRKSRC=	${WRKSRC}/gio/fam
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 GNU_CONFIGURE=	yes
-USE_GNOME=	gnomehack pkgconfig _glib20
+USE_PKGCONFIG=	build
+USE_GNOME=	gnomehack _glib20
 USE_FAM=	yes
 USE_GMAKE=	yes
 MAKE_JOBS_SAFE=	yes
diff --git a/devel/gio-fam-backend/distinfo b/devel/gio-fam-backend/distinfo
index 93d831f49734..57207bc60785 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.28.8.tar.xz) = 4d7ca95dbde8e8f60ab428c765b0dbb8a44be9eb9316491803ce5ee7b4748353
-SIZE (gnome2/glib-2.28.8.tar.xz) = 5223564
+SHA256 (gnome2/glib-2.34.3.tar.xz) = 855fcbf87cb93065b488358e351774d8a39177281023bae58c286f41612658a7
+SIZE (gnome2/glib-2.34.3.tar.xz) = 6334872
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-ae
index 2e1ead9eaf8c..9c9caf0ab20c 100644
--- a/devel/gio-fam-backend/files/patch-ae
+++ b/devel/gio-fam-backend/files/patch-ae
@@ -1,6 +1,6 @@
---- configure.orig	2010-03-03 21:31:46.000000000 -0500
-+++ configure	2010-03-03 21:47:47.000000000 -0500
-@@ -714,6 +714,9 @@ ac_includes_default="\
+--- configure.orig	2013-02-14 19:12:15.000000000 +0000
++++ configure	2013-02-14 19:13:51.000000000 +0000
+@@ -603,6 +603,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,12 +10,34 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -23020,7 +23023,7 @@ _ACEOF
+@@ -5602,7 +5605,7 @@
+ fi
+ 
+ GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
+-ABS_GLIB_RUNTIME_LIBDIR="`readlink -f $libdir/$with_runtime_libdir`"
++ABS_GLIB_RUNTIME_LIBDIR="`readlink $libdir/$with_runtime_libdir`"
+ 
+ 
+  if test "x$with_runtime_libdir" != "x"; then
+@@ -23647,7 +23650,7 @@
  fi
  done
  
--for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link statvfs statfs utimes getgrgid getpwuid sysctlbyname
+-for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid
++for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid getresuid sysctlbyname
  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"
+@@ -27108,10 +27111,10 @@
+ #  b) FreeBSD doesn't do this either.
+ #
+ case $host in
+-  *-*-freebsd*|*-*-linux*)
++  *-*-linux*)
+     G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-pthread/`"
+     ;;
+-  *-*-openbsd*)
++  *-*-freebsd*|*-*-openbsd*)
+     LDFLAGS="$LDFLAGS -pthread"
+     ;;
+   *)