Update to 2.34.1.

Update header, rename patches from patch-ab to patch-${path}.
Pet portlint, convert to OptionsNG.


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

3 files changed, 17 insertions, 31 deletions

diff --git a/devel/gio-fam-backend/Makefile b/devel/gio-fam-backend/Makefile
index d32ce63ef..f06abc99d 100644
--- a/devel/gio-fam-backend/Makefile
+++ b/devel/gio-fam-backend/Makefile
@@ -1,13 +1,9 @@
-# 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.93 2012/07/15 11:44:25 kwm Exp $
-#
+#   $MCom: ports/devel/gio-fam-backend/Makefile,v 1.94 2012/07/26 09:09:58 kwm Exp $
 
 PORTNAME=	gio-fam-backend
-PORTVERSION=	2.32.4
+PORTVERSION=	2.34.1
 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 129eca31c..d12cd6987 100644
--- a/devel/gio-fam-backend/distinfo
+++ b/devel/gio-fam-backend/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/glib-2.32.4.tar.xz) = a5d742a4fda22fb6975a8c0cfcd2499dd1c809b8afd4ef709bda4d11b167fae2
-SIZE (gnome2/glib-2.32.4.tar.xz) = 6178556
+SHA256 (gnome2/glib-2.34.1.tar.xz) = 6e84dc9d84b104725b34d255421ed7ac3629e49f437d37addde5ce3891c2e2f1
+SIZE (gnome2/glib-2.34.1.tar.xz) = 6363332
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/gio-fam-backend/files/patch-configure
index a8c65b182..c1bea263a 100644
--- a/devel/gio-fam-backend/files/patch-ae
+++ b/devel/gio-fam-backend/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-05-02 21:59:16.000000000 -0500
-+++ configure	2012-05-02 22:00:41.000000000 -0500
-@@ -583,6 +583,9 @@
+--- configure.orig	2012-09-24 01:56:12.000000000 +0000
++++ configure	2012-09-24 01:57:06.000000000 +0000
+@@ -603,6 +603,9 @@
  #ifdef HAVE_SYS_TYPES_H
  # include <sys/types.h>
  #endif
@@ -10,7 +10,7 @@
  #ifdef HAVE_SYS_STAT_H
  # include <sys/stat.h>
  #endif
-@@ -5526,7 +5529,7 @@
+@@ -5602,7 +5605,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,36 +19,26 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -23546,7 +23549,7 @@
+@@ -23647,7 +23650,7 @@
  fi
  done
  
--for ac_func in chown lchmod lchown fchmod fchown link utimes getgrgid getpwuid
-+for ac_func in chown lchmod lchown fchmod fchown link 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"
-@@ -26461,6 +26464,9 @@
-   esac
- fi
- 
-+G_THREAD_CFLAGS="${PTHREAD_CFLAGS}"
-+G_THREAD_LIBS="${PTHREAD_LIBS}"
-+
- if test x"$G_THREAD_CFLAGS" = x; then
- 
-   # The canonical -pthread[s] does not work. Try something different.
-@@ -26949,9 +26955,12 @@
+@@ -27107,8 +27110,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/-pthread/`"
-     ;;
++    G_THREAD_LIBS_FOR_GTHREAD="`echo $G_THREAD_LIBS | sed s/-pthread/-lpthread/`"
++    ;;
 +  *-*-freebsd*)
 +    G_THREAD_LIBS_FOR_GTHREAD="-pthread"
-+    ;;
+     ;;
    *-*-openbsd*)
      LDFLAGS="$LDFLAGS -pthread"
-     ;;