[146389] trunk/dports/gnome/epiphany

[devans at macports.org]

Revision: 146389
          https://trac.macports.org/changeset/146389
Author:   devans at macports.org
Date:     2016-03-06 12:46:20 -0800 (Sun, 06 Mar 2016)
Log Message:
-----------
epiphany: correct reconfiguration with our intltool.m4, remove outdated configuration flag.

Modified Paths:
--------------
    trunk/dports/gnome/epiphany/Portfile

Property Changed:
----------------
    trunk/dports/gnome/epiphany/


Property changes on: trunk/dports/gnome/epiphany
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/epiphany:108269-145774
/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152
/users/rmstonecipher/gnome/epiphany:102363-103172
   + /branches/mld-qt-481/dports/gnome/epiphany:92720,92813,92891,92963,93522,93556,93699,93743,93771-93773,93806,93817-93818,93856
/users/devans/GNOME-3/stable/dports/gnome/epiphany:108269-146388
/users/devans/GNOME-3/unstable/dports/gnome/epiphany:114069-118152,144714-145891
/users/rmstonecipher/gnome/epiphany:102363-103172

Modified: trunk/dports/gnome/epiphany/Portfile
===================================================================
--- trunk/dports/gnome/epiphany/Portfile	2016-03-06 20:38:05 UTC (rev 146388)
+++ trunk/dports/gnome/epiphany/Portfile	2016-03-06 20:46:20 UTC (rev 146389)
@@ -49,11 +49,14 @@
 depends_run         port:gnome-themes-standard \
                     port:gnome-keyring
 
-configure.cmd       ./autogen.sh
+# reconfigure using our intltool.m4 and upstream autogen.sh for intltool 0.51 compatibility
 
-configure.cflags-append \
-                    -Wno-format-nonliteral
+pre-configure {
+    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
+}
 
+configure.cmd       ./autogen.sh
+
 configure.args      --with-distributor-name=MacPorts \
                     --disable-silent-rules \
                     --disable-schemas-compile \
@@ -83,8 +86,6 @@
 
         patchfiles              patch-configure.ac.diff
 
-        # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-
         post-patch {
             xinstall -m 755 ${filespath}/autogen.sh-3.8.2 ${worksrcpath}/autogen.sh
         }
@@ -95,8 +96,6 @@
                                 port:yelp-tools
         depends_lib-append      path:lib/pkgconfig/webkit2gtk-4.0.pc:webkit2-gtk
 
-        # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
-
         post-patch {
             xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160306/bc34d166/attachment.html>