[107737] trunk/dports/x11/gtkspell2

[jeremyhu at macports.org]

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

Modified Paths:
--------------
    trunk/dports/x11/gtkspell2/Portfile

Added Paths:
-----------
    trunk/dports/x11/gtkspell2/files/patch-configure.diff

Modified: trunk/dports/x11/gtkspell2/Portfile
===================================================================
--- trunk/dports/x11/gtkspell2/Portfile	2013-07-04 18:49:11 UTC (rev 107736)
+++ trunk/dports/x11/gtkspell2/Portfile	2013-07-04 18:54:42 UTC (rev 107737)
@@ -33,13 +33,11 @@
 depends_lib         port:enchant \
                     port:gtk2
 
-patchfiles          patch-Makefile.in.diff
+patchfiles          patch-Makefile.in.diff \
+                    patch-configure.diff
 
 configure.args      --disable-debug
 
-# intltool needs to be run with the correct version of perl
-configure.env-append INTLTOOL_PERL=${prefix}/bin/perl5.12
-
 #
 # the following dummy variants are used
 # to identify this port's binary dependencies

Added: trunk/dports/x11/gtkspell2/files/patch-configure.diff
===================================================================
--- trunk/dports/x11/gtkspell2/files/patch-configure.diff	                        (rev 0)
+++ trunk/dports/x11/gtkspell2/files/patch-configure.diff	2013-07-04 18:54:42 UTC (rev 107737)
@@ -0,0 +1,87 @@
+--- configure.orig	2013-07-04 11:46:10.000000000 -0700
++++ configure	2013-07-04 11:46:27.000000000 -0700
+@@ -792,7 +792,6 @@ GTK_DOC_USE_LIBTOOL_FALSE
+ GTK_DOC_USE_LIBTOOL_TRUE
+ GTKDOC_CHECK
+ ALL_LINGUAS
+-INTLTOOL_PERL
+ MSGMERGE
+ INTLTOOL_POLICY_RULE
+ INTLTOOL_SERVICE_RULE
+@@ -13641,76 +13640,6 @@ $as_echo "$as_me: error: GNU gettext too
+    { (exit 1); exit 1; }; }
+ 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:$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:$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:$LINENO: result: $INTLTOOL_PERL" >&5
+-$as_echo "$INTLTOOL_PERL" >&6; }
+-else
+-  { $as_echo "$as_me:$LINENO: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-if test -z "$INTLTOOL_PERL"; then
+-   { { $as_echo "$as_me:$LINENO: error: perl not found" >&5
+-$as_echo "$as_me: error: perl not found" >&2;}
+-   { (exit 1); exit 1; }; }
+-fi
+-{ $as_echo "$as_me:$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_echo "$as_me:$LINENO: error: perl 5.8.1 is required for intltool" >&5
+-$as_echo "$as_me: error: perl 5.8.1 is required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-else
+-   IT_PERL_VERSION="`$INTLTOOL_PERL -e \"printf '%vd', $^V\"`"
+-   { $as_echo "$as_me:$LINENO: result: $IT_PERL_VERSION" >&5
+-$as_echo "$IT_PERL_VERSION" >&6; }
+-fi
+-if test "x" != "xno-xml"; then
+-   { $as_echo "$as_me:$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:$LINENO: result: ok" >&5
+-$as_echo "ok" >&6; }
+-   else
+-       { { $as_echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+-$as_echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+-   { (exit 1); exit 1; }; }
+-   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/d7b75f22/attachment-0001.html>