From a236e2d0bfa53f22be02c6a4cc7b2cf730bc69e1 Mon Sep 17 00:00:00 2001
From: Koop Mast <kwm@FreeBSD.org>
Date: Sat, 23 Nov 2013 11:39:07 +0000
Subject: Say hello to Mate 1.6.

Mate is a lite desktop forked from gnome2.

Most of the work is done by Jeremy Messenger (mezz@). The only thing I did
was update a few ports to later 1.6 release and attempting to keep up with
ports infra changes. Resulting bugs are all mine.

Mate is a sort of replacement for Gnome 2. So people wanting to keep a
Gnome 2 like desktop should switch. Gnome 2 will be replaced by Gnome 3
in the near future. This switch will be announce with a transition time
so people have more time to switch if they haven't already.

This release was made possible by everyone that send friendly pokes to
keep mate on my mind.

Approved by:	portmgr (bapt)
---
 devel/mate-common/files/patch-macros_mate-autogen | 35 +++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 devel/mate-common/files/patch-macros_mate-autogen

(limited to 'devel/mate-common/files/patch-macros_mate-autogen')

diff --git a/devel/mate-common/files/patch-macros_mate-autogen b/devel/mate-common/files/patch-macros_mate-autogen
new file mode 100644
index 000000000000..5f379b25633a
--- /dev/null
+++ b/devel/mate-common/files/patch-macros_mate-autogen
@@ -0,0 +1,35 @@
+https://bugs.gentoo.org/show_bug.cgi?id=427432
+https://bugzilla.gnome.org/show_bug.cgi?id=680363
+
+--- macros/mate-autogen.orig	2009-05-27 23:29:07.000000000 +0200
++++ macros/mate-autogen	2012-07-24 10:29:13.064750613 +0200
+@@ -77,6 +77,7 @@
+     vc_min_version=$4
+     vc_source=$5
+     vc_status=1
++    vc_option="--version"
+ 
+     vc_checkprog=`eval echo "\\$$vc_variable"`
+     if [ -n "$vc_checkprog" ]; then
+@@ -89,11 +90,19 @@
+     else
+ 	vc_comparator=">="
+     fi
++    # The most reliable way to check pkg-config version is to query the actual
++    # virtual
++    # pkg-config package entry's modversion.  This works in all known
++    # implementations.
++
++    if test "x$vc_package" = "xpkg-config"; then
++	vc_option="--modversion pkg-config"
++    fi
+     printbold "checking for $vc_package $vc_comparator $vc_min_version..."
+     for vc_checkprog in $vc_checkprogs; do
+ 	echo $ECHO_N "  testing $vc_checkprog... " $ECHO_C
+-	if $vc_checkprog --version < /dev/null > /dev/null 2>&1; then
+-	    vc_actual_version=`$vc_checkprog --version | head -n 1 | \
++	if $vc_checkprog $vc_option < /dev/null > /dev/null 2>&1; then
++	    vc_actual_version=`$vc_checkprog $vc_option | head -n 1 | \
+                                sed 's/^.*[ 	]\([0-9.]*[a-z]*\).*$/\1/'`
+ 	    if compare_versions $vc_min_version $vc_actual_version; then
+ 		echo "found $vc_actual_version"
-- 
cgit v1.2.3