[117051] users/devans/GNOME-3/stable/dports/gnome

[devans at macports.org]

Revision: 117051
          https://trac.macports.org/changeset/117051
Author:   devans at macports.org
Date:     2014-02-13 17:41:38 -0800 (Thu, 13 Feb 2014)
Log Message:
-----------
GNOME-3/stable/dports: sync gnome-desktop, gnome-menus with trunk.

Modified Paths:
--------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile
    users/devans/GNOME-3/stable/dports/gnome/gnome-menus/Portfile

Removed Paths:
-------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch
    users/devans/GNOME-3/stable/dports/gnome/gnome-menus/files/

Property Changed:
----------------
    users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/
    users/devans/GNOME-3/stable/dports/gnome/gnome-menus/


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk/dports/gnome/gnome-desktop:108265-115828
   + /trunk/dports/gnome/gnome-desktop:108265-117050

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile	2014-02-14 01:32:54 UTC (rev 117050)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/Portfile	2014-02-14 01:41:38 UTC (rev 117051)
@@ -48,9 +48,17 @@
 }
 
 patchfiles      patch-gnome-desktop-Makefile.am.diff \
-                remove-intltool-perl-hack.patch \
                 patch-libgnome-destktop-libgsystem.diff
 
+# update m4/intltool.m4 and autoreconf
+
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
+
+use_autoreconf  yes
+autoreconf.args -fvi
+
 configure.args  --enable-introspection=no \
                 --disable-maintainer-mode \
                 --disable-silent-rules \
@@ -59,11 +67,6 @@
                 --x-includes=${prefix}/include \
                 --x-libraries=${prefix}/lib
 
-# autoreconf with MacPorts patched intltool.m4
-
-use_autoreconf  yes
-autoreconf.args -fvi
-
 #
 #  portions of this port are strictly X11 specific
 #  so a +quartz build is not possible (fails in configure if X11 is absent)

Deleted: 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	2014-02-14 01:32:54 UTC (rev 117050)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-desktop/files/remove-intltool-perl-hack.patch	2014-02-14 01:41:38 UTC (rev 117051)
@@ -1,30 +0,0 @@
---- 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)
- 


Property changes on: users/devans/GNOME-3/stable/dports/gnome/gnome-menus
___________________________________________________________________
Added: svn:mergeinfo
   + /branches/mld-qt-481/dports/gnome/gnome-menus:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/trunk/dports/gnome/gnome-menus:108265-117050
/users/rmstonecipher/gnome/gnome-menus:102363-103172

Modified: users/devans/GNOME-3/stable/dports/gnome/gnome-menus/Portfile
===================================================================
--- users/devans/GNOME-3/stable/dports/gnome/gnome-menus/Portfile	2014-02-14 01:32:54 UTC (rev 117050)
+++ users/devans/GNOME-3/stable/dports/gnome/gnome-menus/Portfile	2014-02-14 01:41:38 UTC (rev 117051)
@@ -30,9 +30,11 @@
 depends_lib     path:lib/pkgconfig/glib-2.0.pc:glib2 \
                 port:gobject-introspection
 
-patchfiles      remove-intltool-perl-hack.patch
+# update m4/intltool.m4 and autoreconf
 
-# autoreconf with MacPorts patched intltool.m4
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
 
 use_autoreconf  yes
 autoreconf.args -fvi
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140213/6156545e/attachment-0001.html>