[113096] users/devans/GNOME-3/stable/dports/gnome/gnome-desktop
devans at macports.org
devans at macports.org
Fri Nov 8 11:31:19 PST 2013
Revision: 113096
https://trac.macports.org/changeset/113096
Author: devans at macports.org
Date: 2013-11-08 11:31:19 -0800 (Fri, 08 Nov 2013)
Log Message:
-----------
GNOME-3/stable/dports: gnome-desktop, autoreconf for intltool perl issue.
Modified Paths:
--------------
users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile
Added Paths:
-----------
users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch
Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2013-11-08 19:06:15 UTC (rev 113095)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile 2013-11-08 19:31:19 UTC (rev 113096)
@@ -43,7 +43,8 @@
port:xkeyboard-config \
port:xorg-libxkbfile
-patchfiles patch-gnome-desktop-Makefile.am.diff
+patchfiles patch-gnome-desktop-Makefile.am.diff \
+ remove-intltool-perl-hack.patch
configure.args --enable-introspection=no \
--disable-maintainer-mode \
@@ -53,7 +54,8 @@
--x-includes=${prefix}/include \
--x-libraries=${prefix}/lib
-# Don't do intltool's INTLTOOL_PERL dance
+# autoreconf with MacPorts patched intltool.m4
+
use_autoreconf yes
autoreconf.args -fi
Added: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch (rev 0)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch 2013-11-08 19:31:19 UTC (rev 113096)
@@ -0,0 +1,30 @@
+--- m4/intltool.m4.orig 2013-07-02 11:22:23.000000000 -0700
++++ m4/intltool.m4 2013-07-02 11:22:32.000000000 -0700
+@@ -131,27 +131,6 @@ if test -z "$xgversion" -o -z "$mmversio
+ AC_MSG_ERROR([GNU gettext tools not found; required for intltool])
+ fi
+
+-AC_PATH_PROG(INTLTOOL_PERL, perl)
+-if test -z "$INTLTOOL_PERL"; then
+- AC_MSG_ERROR([perl not found])
+-fi
+-AC_MSG_CHECKING([for perl >= 5.8.1])
+-$INTLTOOL_PERL -e "use 5.8.1;" > /dev/null 2>&1
+-if test $? -ne 0; then
+- AC_MSG_ERROR([perl 5.8.1 is required for intltool])
+-else
+- IT_PERL_VERSION=`$INTLTOOL_PERL -e "printf '%vd', $^V"`
+- AC_MSG_RESULT([$IT_PERL_VERSION])
+-fi
+-if test "x$2" != "xno-xml"; then
+- AC_MSG_CHECKING([for XML::Parser])
+- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+- AC_MSG_RESULT([ok])
+- else
+- AC_MSG_ERROR([XML::Parser perl module is required for intltool])
+- fi
+-fi
+-
+ # Substitute ALL_LINGUAS so we can use it in po/Makefile
+ AC_SUBST(ALL_LINGUAS)
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131108/5af06f6f/attachment.html>
More information about the macports-changes
mailing list