[107671] trunk/dports/net/avahi

[jeremyhu at macports.org]

Revision: 107671
          https://trac.macports.org/changeset/107671
Author:   jeremyhu at macports.org
Date:     2013-07-03 23:12:49 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
avahi: Remove the INTLTOOL_PERL nonsense from configure

Modified Paths:
--------------
    trunk/dports/net/avahi/Portfile
    trunk/dports/net/avahi/files/patch-configure.diff

Modified: trunk/dports/net/avahi/Portfile
===================================================================
--- trunk/dports/net/avahi/Portfile	2013-07-04 06:02:07 UTC (rev 107670)
+++ trunk/dports/net/avahi/Portfile	2013-07-04 06:12:49 UTC (rev 107671)
@@ -65,9 +65,6 @@
 # gobject-introspection uses g-ir-scanner, which uses $CC from env
 build.args-append       CC="${configure.cc} ${configure.cc_archflags}"
 
-# intltool needs to be run with the correct version of perl
-configure.env-append INTLTOOL_PERL=${prefix}/bin/perl5.12
-
 # __APPLE_USE_RFC_2292 should be removed once avhi is updated to support RFC 3542
 configure.cppflags-append   -L${prefix}/lib -D__APPLE_USE_RFC_2292
 

Modified: trunk/dports/net/avahi/files/patch-configure.diff
===================================================================
--- trunk/dports/net/avahi/files/patch-configure.diff	2013-07-04 06:02:07 UTC (rev 107670)
+++ trunk/dports/net/avahi/files/patch-configure.diff	2013-07-04 06:12:49 UTC (rev 107671)
@@ -1,9 +1,88 @@
---- a/configure	2012-02-15 10:30:25.000000000 -0800
-+++ b/configure	2012-02-15 10:33:40.000000000 -0800
-@@ -21925,9 +21925,9 @@
+--- a/configure.orig	2013-07-03 23:02:52.000000000 -0700
++++ b/configure	2013-07-03 23:03:21.000000000 -0700
+@@ -788,7 +788,6 @@ MSGFMT_OPTS
+ GETTEXT_PACKAGE
+ DATADIRNAME
+ ALL_LINGUAS
+-INTLTOOL_PERL
+ GMSGFMT
+ MSGFMT
+ MSGMERGE
+@@ -19218,70 +19217,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 ${ac_cv_path_INTLTOOL_PERL+:} false; 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
  
  
+@@ -21925,9 +21860,9 @@ $as_echo "$am_cv_python_version" >&6; }
+ 
+ 
+ 
 -  PYTHON_PREFIX='${prefix}'
 +  PYTHON_PREFIX=`$PYTHON -c 'import sys; print sys.prefix;'`
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130703/21a1b54f/attachment-0001.html>