From 7887c684adab042fed1bfcba2e91589ecd17c4a8 Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Fri, 8 Mar 2013 10:51:34 +0000
Subject: * Update the glib to 2.34.3 and gtk20 to 2.24.17 and gtk30 to 3.6.4
 which   are the latest stable releases. * Update vala to the newest stable
 release 0.18.1, also update a few ports   in the gtk/gnome stack. * The c++
 bindings ports for glib, atk, gconf, etc, have now USE_GNOME toggles. *
 Remove pkg-config run depends from glib20 and freetype2. This doesn't  
 eliminate pkg-config run dependency completely, a second phase is needed  
 and is planned. * Support for .:run. and .:build. for USE_GNOME components
 was added.   Currently only libxml2 and libxslt support this mechanism. *
 Updates of the telepathy stack and empathy. * Trim makefile headers, convert
 ports to new options, trim off library   versions for some ports. * Fix other
 ports so they build with the new glib version.

Thanks to miwi and crees for helping out with some exp-runs.
Approved by:	portmgr (miwi & bapt)
Obtained from:	gnome team repo
---
 net-im/empathy/files/patch-configure | 75 +-----------------------------------
 1 file changed, 2 insertions(+), 73 deletions(-)

(limited to 'net-im/empathy/files/patch-configure')

diff --git a/net-im/empathy/files/patch-configure b/net-im/empathy/files/patch-configure
index 9bf98699b386..300f783e450a 100644
--- a/net-im/empathy/files/patch-configure
+++ b/net-im/empathy/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2011-08-16 16:19:02.000000000 +0200
-+++ configure	2011-08-16 16:19:59.000000000 +0200
+--- configure.orig	2010-11-18 17:41:43.000000000 +0100
++++ configure	2010-11-18 17:41:43.000000000 +0100
 @@ -13390,8 +13390,8 @@
  .SECONDARY: $(gsettings_SCHEMAS)
  
@@ -11,74 +11,3 @@
  
  install-gsettings-schemas: $(gsettings_SCHEMAS:.xml=.valid)
  	@$(NORMAL_INSTALL)
-@@ -14771,14 +14771,14 @@
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED
--    libnotify < 0.7\""; } >&5
-+    libnotify < 0.9\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7") 2>&5
-+    libnotify < 0.9") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_LIBNOTIFY_CFLAGS=`$PKG_CONFIG --cflags "libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7" 2>/dev/null`
-+    libnotify < 0.9" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14790,14 +14790,14 @@
-  elif test -n "$PKG_CONFIG"; then
-     if test -n "$PKG_CONFIG" && \
-     { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libnotify >= \$LIBNOTIFY_REQUIRED
--    libnotify < 0.7\""; } >&5
-+    libnotify < 0.9\""; } >&5
-   ($PKG_CONFIG --exists --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7") 2>&5
-+    libnotify < 0.9") 2>&5
-   ac_status=$?
-   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-   test $ac_status = 0; }; then
-   pkg_cv_LIBNOTIFY_LIBS=`$PKG_CONFIG --libs "libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7" 2>/dev/null`
-+    libnotify < 0.9" 2>/dev/null`
- else
-   pkg_failed=yes
- fi
-@@ -14818,16 +14818,16 @@
- fi
-         if test $_pkg_short_errors_supported = yes; then
- 	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7" 2>&1`
-+    libnotify < 0.9" 2>&1`
-         else
- 	        LIBNOTIFY_PKG_ERRORS=`$PKG_CONFIG --print-errors "libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7" 2>&1`
-+    libnotify < 0.9" 2>&1`
-         fi
- 	# Put the nasty error message in config.log where it belongs
- 	echo "$LIBNOTIFY_PKG_ERRORS" >&5
- 
- 	as_fn_error $? "Package requirements (libnotify >= $LIBNOTIFY_REQUIRED
--    libnotify < 0.7) were not met:
-+    libnotify < 0.9) were not met:
- 
- $LIBNOTIFY_PKG_ERRORS
- 
-@@ -15049,11 +15049,11 @@
- fi
- 
- # Enable GSEAL checks if needed
--if test $USE_MAINTAINER_MODE = yes; then
-+#if test $USE_MAINTAINER_MODE = yes; then
- 
--$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
-+#$as_echo "#define GSEAL_ENABLE /**/" >>confdefs.h
- 
--fi
-+#fi
- 
- # -----------------------------------------------------------
- # Enable debug
-- 
cgit v1.2.3