diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-26 05:40:22 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-07-26 05:40:22 +0000 |
| commit | 9346b215f04cc84bbb7125ff2fcf03978f859a21 (patch) | |
| tree | 73bea5baa559b61c5e812c50ac96fad638950c75 /devel/gnome-common | |
| parent | 49ac3accb4fc378c681317849f4ae94655a61423 (diff) | |
| download | ports-9346b215f04cc84bbb7125ff2fcf03978f859a21.tar.gz ports-9346b215f04cc84bbb7125ff2fcf03978f859a21.zip | |
Notes
Diffstat (limited to 'devel/gnome-common')
| -rw-r--r-- | devel/gnome-common/Makefile | 2 | ||||
| -rw-r--r-- | devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config | 70 |
2 files changed, 71 insertions, 1 deletions
diff --git a/devel/gnome-common/Makefile b/devel/gnome-common/Makefile index 7d7b840672a3..92bd2df9068b 100644 --- a/devel/gnome-common/Makefile +++ b/devel/gnome-common/Makefile @@ -8,7 +8,7 @@ PORTNAME= gnome-common PORTVERSION= 2.28.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= GNOME DIST_SUBDIR= gnome2 diff --git a/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config new file mode 100644 index 000000000000..877b592e85dc --- /dev/null +++ b/devel/gnome-common/files/patch-macros2_gnome-autogen.sh-fix-pkg-config @@ -0,0 +1,70 @@ +https://bugs.gentoo.org/show_bug.cgi?id=427432 +https://bugzilla.gnome.org/show_bug.cgi?id=680363 + +--- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200 ++++ ./macros2/gnome-autogen.sh 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" +https://bugs.gentoo.org/show_bug.cgi?id=427432 +https://bugzilla.gnome.org/show_bug.cgi?id=680363 + +--- ./macros2/gnome-autogen.sh.orig 2009-05-27 23:29:07.000000000 +0200 ++++ ./macros2/gnome-autogen.sh 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" |