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

14 files changed, 76 insertions, 109 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/glib20/files/patch-ae b/devel/gio-fam-backend/files/patch-configure
index 42180586e..c1bea263a 100644
--- a/devel/glib20/files/patch-ae
+++ b/devel/gio-fam-backend/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2012-03-07 20:38:41.000000000 +0100
-+++ configure	2012-03-07 20:38:41.000000000 +0100
-@@ -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
-@@ -5483,7 +5486,7 @@
+@@ -5602,7 +5605,7 @@
  fi
  
  GLIB_RUNTIME_LIBDIR="$with_runtime_libdir"
@@ -19,16 +19,16 @@
  
  
   if test "x$with_runtime_libdir" != "x"; then
-@@ -23514,7 +23517,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"
-@@ -26732,8 +26735,11 @@
+@@ -27107,8 +27110,11 @@
  #  b) FreeBSD doesn't do this either.
  #
  case $host in
diff --git a/devel/glib20/Makefile b/devel/glib20/Makefile
index 71770ad17..4e09f839b 100644
--- a/devel/glib20/Makefile
+++ b/devel/glib20/Makefile
@@ -1,14 +1,10 @@
-# New ports collection makefile for:   glib13
-# Date Created:			28 July 1998
-# Whom:				Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#   $MCom: ports/devel/glib20/Makefile,v 1.226 2012/07/26 09:09:58 kwm Exp $
-#
+#   $MCom: ports/devel/glib20/Makefile,v 1.227 2012/09/19 13:17:02 kwm Exp $
 # !! DON'T FORGET ABOUT devel/gio-fam-backend !!
 
 PORTNAME=	glib
-PORTVERSION=	2.32.4
+PORTVERSION=	2.34.1
 PORTREVISION?=	0
 CATEGORIES=	devel
 MASTER_SITES=	GNOME
@@ -17,16 +13,15 @@ DIST_SUBDIR=	gnome2
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Some useful routines of C programming (current stable version)
 
-LATEST_LINK=	glib20
+LICENSE=	LGPL20
 
+LATEST_LINK=	glib20
 USE_XZ=		yes
-LICENSE=	LGPL20
-LICENSE_FILE=	${WRKSRC}/COPYING
 
 .if !defined(REFERENCE_PORT)
 
-LIB_DEPENDS+=	pcre.1:${PORTSDIR}/devel/pcre \
-		ffi.5:${PORTSDIR}/devel/libffi
+LIB_DEPENDS+=	pcre:${PORTSDIR}/devel/pcre \
+		ffi:${PORTSDIR}/devel/libffi
 
 USE_GETTEXT=	yes
 USE_ICONV=	yes
@@ -47,10 +42,9 @@ CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ENV=	PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 		PTHREAD_LIBS="${PTHREAD_LIBS}"
-		
-OPTIONS=	COLLATION_FIX "fix string collation" off
 
-#CONFIGURE_ARGS+=--disable-silent-rules
+OPTIONS_DEFINE=	COLLATION_FIX DEBUG
+COLLATION_FIX_DESC=	fix string collation
 
 .include <bsd.port.pre.mk>
 
@@ -77,7 +71,7 @@ GLIB_ARCH=	${ARCH}
 .endif
 CONFIGURE_TARGET=${GLIB_ARCH}-portbld-freebsd${OSREL}
 
-.if defined(WITH_COLLATION_FIX)
+.if ${PORT_OPTIONS:MCOLLATION_FIX}
 LIB_DEPENDS+=	icui18n:${PORTSDIR}/devel/icu
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 		${FILESDIR}/extra-patch-glib_gunicollate.c
@@ -85,8 +79,11 @@ EXTRA_PATCHES+=	${FILESDIR}/extra-patch-glib_Makefile.in \
 #CONFIGURE_ENV+=	CFLAGS="-D__STDC_ISO_10646__"
 .endif
 
-.if defined(WITH_DEBUG)
-CONFIGURE_ARGS+=	--enable-debug=yes
+.if ${PORT_OPTIONS:MDEBUG}
+CONFIGURE_ARGS+=	--enable-debug=yes \
+			--disable-silent-rules
+.else
+CONFIGURE_ARGS+=	--disable-modular-tests
 .endif
 
 post-patch:
diff --git a/devel/glib20/distinfo b/devel/glib20/distinfo
index 129eca31c..d12cd6987 100644
--- a/devel/glib20/distinfo
+++ b/devel/glib20/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/glib20/files/extra-patch-glib_Makefile.in b/devel/glib20/files/extra-patch-glib_Makefile.in
index 94b217b4f..04e45460c 100644
--- a/devel/glib20/files/extra-patch-glib_Makefile.in
+++ b/devel/glib20/files/extra-patch-glib_Makefile.in
@@ -1,11 +1,11 @@
---- glib/Makefile.in.orig	2011-10-07 22:24:04.000000000 +0200
-+++ glib/Makefile.in	2011-10-07 22:25:01.000000000 +0200
-@@ -374,7 +374,7 @@
+--- glib/Makefile.in.orig	2012-09-27 15:07:28.000000000 +0000
++++ glib/Makefile.in	2012-09-27 15:08:02.000000000 +0000
+@@ -415,7 +415,7 @@
  INSTOBJEXT = @INSTOBJEXT@
  INTLLIBS = @INTLLIBS@
  LD = @LD@
 -LDFLAGS = @LDFLAGS@
 +LDFLAGS = @LDFLAGS@ -licui18n
+ LIBELF_CFLAGS = @LIBELF_CFLAGS@
+ LIBELF_LIBS = @LIBELF_LIBS@
  LIBFFI_CFLAGS = @LIBFFI_CFLAGS@
- LIBFFI_LIBS = @LIBFFI_LIBS@
- LIBOBJS = @LIBOBJS@
diff --git a/devel/glib20/files/extra-patch-glib_gunicollate.c b/devel/glib20/files/extra-patch-glib_gunicollate.c
index e2edc6938..e2493d133 100644
--- a/devel/glib20/files/extra-patch-glib_gunicollate.c
+++ b/devel/glib20/files/extra-patch-glib_gunicollate.c
@@ -1,5 +1,5 @@
---- glib/gunicollate.c.orig
-+++ glib/gunicollate.c
+--- glib/gunicollate.c.orig	2012-03-12 00:42:42.000000000 +0000
++++ glib/gunicollate.c	2012-09-27 15:11:08.000000000 +0000
 @@ -26,6 +26,10 @@
  #include <wchar.h>
  #endif
@@ -11,12 +11,7 @@
  #ifdef HAVE_CARBON
  #include <CoreServices/CoreServices.h>
  #endif
-@@ -36,10 +40,53 @@
- #include "gstring.h"
- #include "gstrfuncs.h"
- #include "gtestutils.h"
-+#include "gthread.h"
- #ifndef __STDC_ISO_10646__
+@@ -41,6 +45,48 @@
  #include "gconvert.h"
  #endif
  
@@ -34,7 +29,7 @@
 +
 +      icu_collator = ucol_open(NULL, &error);
 +      if (icu_collator == NULL)
-+	g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
++      g_warning("unable to initialize the ICU collator (%s), FreeBSD collation routines will be used", u_errorName(error));
 +
 +      icu_collator_initialized = TRUE;
 +    }
@@ -54,10 +49,10 @@
 +      result = g_new(UChar, *result_len);
 +      u_strFromUTF8(result, *result_len, NULL, str, len, &error);
 +      if (error > U_ZERO_ERROR)
-+	{
-+	  g_free(result);
-+	  result = NULL;
-+	}
++      {
++        g_free(result);
++        result = NULL;
++      }
 +    }
 +
 +  return result;
@@ -65,7 +60,7 @@
  
  #ifdef _MSC_VER
  /* Workaround for bug in MSVCR80.DLL */
-@@ -127,6 +174,28 @@
+@@ -128,6 +174,28 @@
    g_return_val_if_fail (str1 != NULL, 0);
    g_return_val_if_fail (str2 != NULL, 0);
  
@@ -94,7 +89,7 @@
    str1_norm = g_utf8_normalize (str1, -1, G_NORMALIZE_ALL_COMPOSE);
    str2_norm = g_utf8_normalize (str2, -1, G_NORMALIZE_ALL_COMPOSE);
  
-@@ -419,6 +488,26 @@
+@@ -420,6 +488,26 @@
  
    g_return_val_if_fail (str != NULL, NULL);
  
diff --git a/devel/glib20/files/patch-ag b/devel/glib20/files/patch-ag
deleted file mode 100644
index 289bc3381..000000000
--- a/devel/glib20/files/patch-ag
+++ /dev/null
@@ -1,11 +0,0 @@
---- Makefile.in.orig	2010-08-08 12:14:27.000000000 +0200
-+++ Makefile.in	2010-08-08 12:15:40.000000000 +0200
-@@ -418,7 +418,7 @@
- 	gio-2.0-uninstalled.pc.in gio-unix-2.0-uninstalled.pc.in
- TEST_PROGS = 
- ACLOCAL_AMFLAGS = -I m4macros ${ACLOCAL_FLAGS}
--SUBDIRS = . m4macros glib gmodule gthread gobject gio tests po docs
-+SUBDIRS = . m4macros glib gmodule gthread gobject gio po docs
- DIST_SUBDIRS = $(SUBDIRS) build
- bin_SCRIPTS = glib-gettextize
- AM_CPPFLAGS = \
diff --git a/devel/gio-fam-backend/files/patch-ae b/devel/glib20/files/patch-configure
index a8c65b182..c1bea263a 100644
--- a/devel/gio-fam-backend/files/patch-ae
+++ b/devel/glib20/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"
-     ;;
diff --git a/devel/glib20/files/patch-ah b/devel/glib20/files/patch-docs_reference_Makefile.in
index 3784d16b8..3784d16b8 100644
--- a/devel/glib20/files/patch-ah
+++ b/devel/glib20/files/patch-docs_reference_Makefile.in
diff --git a/devel/glib20/files/patch-glib_Makefile.in b/devel/glib20/files/patch-glib_Makefile.in
index 48a29df14..30d6f1be8 100644
--- a/devel/glib20/files/patch-glib_Makefile.in
+++ b/devel/glib20/files/patch-glib_Makefile.in
@@ -1,15 +1,15 @@
---- glib/Makefile.in.orig	2012-05-03 11:27:53.000000000 +0200
-+++ glib/Makefile.in	2012-05-03 11:41:38.000000000 +0200
-@@ -550,7 +550,7 @@
+--- glib/Makefile.in.orig	2012-09-24 01:59:13.000000000 +0000
++++ glib/Makefile.in	2012-09-24 02:02:07.000000000 +0000
+@@ -585,7 +585,7 @@
  #
  DISTCLEANFILES = glibconfig-stamp glibconfig.h
- CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_5)
+ CLEANFILES = libglib-gdb.py glib-public-headers.txt $(am__append_6)
 -configexecincludedir = $(libdir)/glib-2.0/include
 +configexecincludedir = $(includedir)/glib-2.0
  nodist_configexecinclude_HEADERS = glibconfig.h
  @HAVE_GOOD_PRINTF_FALSE@PRINTF_SUBDIR = gnulib
  @HAVE_GOOD_PRINTF_FALSE@printf_la = gnulib/libgnulib.la
-@@ -1565,7 +1565,7 @@
+@@ -1617,7 +1617,7 @@
  info-am:
  
  install-data-am: install-data-local install-deprecatedincludeHEADERS \
@@ -18,7 +18,7 @@
  	install-glibsubincludeHEADERS install-tapsetDATA
  	@$(NORMAL_INSTALL)
  	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
-@@ -1853,9 +1853,7 @@
+@@ -1906,9 +1906,7 @@
  libglib-gdb.py: libglib-gdb.py.in
  	$(AM_V_GEN) $(SED) -e "s|\@datadir\@|$(datadir)|" $(srcdir)/libglib-gdb.py.in > $(builddir)/libglib-gdb.py
  
diff --git a/devel/glib20/files/patch-glib_gregex.c b/devel/glib20/files/patch-glib_gregex.c
deleted file mode 100644
index ef7f0a87b..000000000
--- a/devel/glib20/files/patch-glib_gregex.c
+++ /dev/null
@@ -1,13 +0,0 @@
---- glib/gregex.c.orig	2007-09-09 18:35:32.000000000 -0400
-+++ glib/gregex.c	2007-09-09 18:36:05.000000000 -0400
-@@ -164,8 +164,10 @@ match_error (gint errcode)
-     case PCRE_ERROR_DFA_RECURSE:
-     case PCRE_ERROR_RECURSIONLIMIT:
-       return _("recursion limit reached");
-+#ifdef PCRE_ERROR_NULLWSLIMIT
-     case PCRE_ERROR_NULLWSLIMIT:
-       return _("workspace limit for empty substrings reached");
-+#endif
-     case PCRE_ERROR_BADNEWLINE:
-       return _("invalid combination of newline flags");
-     default:
diff --git a/devel/glib20/files/patch-glib_tests_utils.c b/devel/glib20/files/patch-glib_tests_utils.c
new file mode 100644
index 000000000..0f7544cc4
--- /dev/null
+++ b/devel/glib20/files/patch-glib_tests_utils.c
@@ -0,0 +1,11 @@
+--- glib/tests/utils.c.orig	2012-09-24 02:19:54.000000000 +0000
++++ glib/tests/utils.c	2012-09-24 02:20:48.000000000 +0000
+@@ -416,7 +416,7 @@
+ 
+   xdg = (gchar *)g_getenv ("XDG_CONFIG_DIRS");
+   if (!xdg)
+-    xdg = "/etc/xdg";
++    xdg = "/usr/local/etc/xdg:/etc/xdg";
+ 
+   dirs = g_get_system_config_dirs ();
+ 
diff --git a/devel/glib20/pkg-plist b/devel/glib20/pkg-plist
index 2684f6822..fe7f895a6 100644
--- a/devel/glib20/pkg-plist
+++ b/devel/glib20/pkg-plist
@@ -111,6 +111,7 @@ include/glib-2.0/gio/goutputstream.h
 include/glib-2.0/gio/gpermission.h
 include/glib-2.0/gio/gpollableinputstream.h
 include/glib-2.0/gio/gpollableoutputstream.h
+include/glib-2.0/gio/gpollableutils.h
 include/glib-2.0/gio/gproxy.h
 include/glib-2.0/gio/gproxyaddress.h
 include/glib-2.0/gio/gproxyaddressenumerator.h
@@ -138,6 +139,7 @@ include/glib-2.0/gio/gsocketservice.h
 include/glib-2.0/gio/gsrvtarget.h
 include/glib-2.0/gio/gtcpconnection.h
 include/glib-2.0/gio/gtcpwrapperconnection.h
+include/glib-2.0/gio/gtestdbus.h
 include/glib-2.0/gio/gthemedicon.h
 include/glib-2.0/gio/gthreadedsocketservice.h
 include/glib-2.0/gio/gtlsbackend.h