[107734] trunk/dports/graphics/inkscape

[jeremyhu at macports.org]

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

Modified Paths:
--------------
    trunk/dports/graphics/inkscape/Portfile

Added Paths:
-----------
    trunk/dports/graphics/inkscape/files/patch-configure-intltool.diff

Modified: trunk/dports/graphics/inkscape/Portfile
===================================================================
--- trunk/dports/graphics/inkscape/Portfile	2013-07-04 18:39:44 UTC (rev 107733)
+++ trunk/dports/graphics/inkscape/Portfile	2013-07-04 18:43:53 UTC (rev 107734)
@@ -47,6 +47,8 @@
                 port:libwpg \
                 port:gtkspell2
 
+patchfiles      patch-configure-intltool.diff
+
 variant python26 conflicts python27 description {Configure to use Python version 2.6} {
     depends_lib-append \
         port:py26-lxml \
@@ -83,9 +85,6 @@
 
 compiler.blacklist clang
 
-# intltool needs to be run with the correct version of perl
-configure.env-append INTLTOOL_PERL=${prefix}/bin/perl5.12
-
 configure.args  --without-gnome-vfs \
                 --with-python \
                 --enable-lcms \

Added: trunk/dports/graphics/inkscape/files/patch-configure-intltool.diff
===================================================================
--- trunk/dports/graphics/inkscape/files/patch-configure-intltool.diff	                        (rev 0)
+++ trunk/dports/graphics/inkscape/files/patch-configure-intltool.diff	2013-07-04 18:43:53 UTC (rev 107734)
@@ -0,0 +1,81 @@
+--- configure.orig	2013-07-04 11:34:15.000000000 -0700
++++ configure	2013-07-04 11:34:36.000000000 -0700
+@@ -724,7 +724,6 @@ GREP
+ CXXCPP
+ DATADIRNAME
+ ALL_LINGUAS
+-INTLTOOL_PERL
+ GMSGFMT
+ MSGFMT
+ MSGMERGE
+@@ -5814,70 +5813,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 as_fn_executable_p "$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
+ 
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130704/291c01a2/attachment.html>