[107679] trunk/dports/gnome/libbonobo

[jeremyhu at macports.org]

Revision: 107679
          https://trac.macports.org/changeset/107679
Author:   jeremyhu at macports.org
Date:     2013-07-04 00:44:43 -0700 (Thu, 04 Jul 2013)
Log Message:
-----------
libbonobo: Remove the INTLTOOL_PERL nonsense from configure

Modified Paths:
--------------
    trunk/dports/gnome/libbonobo/Portfile
    trunk/dports/gnome/libbonobo/files/patch-configure.diff

Modified: trunk/dports/gnome/libbonobo/Portfile
===================================================================
--- trunk/dports/gnome/libbonobo/Portfile	2013-07-04 07:22:12 UTC (rev 107678)
+++ trunk/dports/gnome/libbonobo/Portfile	2013-07-04 07:44:43 UTC (rev 107679)
@@ -31,9 +31,6 @@
                 port:gnome-common \
                 port:intltool
 
-# The perl executable should be the one explicitly required by intltool
-configure.env-append  INTLTOOL_PERL=${prefix}/bin/perl5.12
-
 depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 port:dbus-glib \
                 port:orbit2 \

Modified: trunk/dports/gnome/libbonobo/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/libbonobo/files/patch-configure.diff	2013-07-04 07:22:12 UTC (rev 107678)
+++ trunk/dports/gnome/libbonobo/files/patch-configure.diff	2013-07-04 07:44:43 UTC (rev 107679)
@@ -1,8 +1,87 @@
---- configure.orig	2013-04-04 10:11:17.000000000 -0700
-+++ configure	2013-04-04 10:11:46.000000000 -0700
-@@ -13818,7 +13818,7 @@
+--- configure.orig	2013-07-04 00:35:13.000000000 -0700
++++ configure	2013-07-04 00:35:48.000000000 -0700
+@@ -794,7 +794,6 @@ MSGFMT_OPTS
+ GETTEXT_PACKAGE
+ DATADIRNAME
+ ALL_LINGUAS
+-INTLTOOL_PERL
+ GMSGFMT
+ MSGFMT
+ MSGMERGE
+@@ -12441,70 +12440,6 @@ if test -z "$xgversion" -o -z "$mmversio
+     as_fn_error "GNU gettext tools not found; required for intltool" "$LINENO" 5
+ fi
  
+-# Extract the first word of "perl", so it can be a program name with args.
+-set dummy perl; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  case $INTLTOOL_PERL in
+-  [\\/]* | ?:[\\/]*)
+-  ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+-  ;;
+-  *)
+-  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+-    ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  ;;
+-esac
+-fi
+-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+-if test -n "$INTLTOOL_PERL"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $INTLTOOL_PERL" >&5
+-$as_echo "$INTLTOOL_PERL" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test -z "$INTLTOOL_PERL"; then
+-   as_fn_error "perl not found" "$LINENO" 5
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for perl >= 5.8.1" >&5
+-$as_echo_n "checking for perl >= 5.8.1... " >&6; }
+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+-if test $? -ne 0; then
+-   as_fn_error "perl 5.8.1 is required for intltool" "$LINENO" 5
+-else
+-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: result: $IT_PERL_VERSION" >&5
+-$as_echo "$IT_PERL_VERSION" >&6; }
+-fi
+-if test "x" != "xno-xml"; then
+-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XML::Parser" >&5
+-$as_echo_n "checking for XML::Parser... " >&6; }
+-   if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+-       { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5
+-$as_echo "ok" >&6; }
+-   else
+-       as_fn_error "XML::Parser perl module is required for intltool" "$LINENO" 5
+-   fi
+-fi
+-
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
  
+ 
+@@ -13818,7 +13753,7 @@ fi
+ 
+ 
  if test "$enable_maintainer_mode" = "yes"; then
 -	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_DEPRECATED -DG_DISABLE_SINGLE_INCLUDES"
 +	DISABLE_DEPRECATED_CFLAGS="-DG_DISABLE_SINGLE_INCLUDES"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130704/3f443367/attachment.html>