[117325] trunk/dports/gnome/epiphany

[devans at macports.org]

Revision: 117325
          https://trac.macports.org/changeset/117325
Author:   devans at macports.org
Date:     2014-02-21 20:41:52 -0800 (Fri, 21 Feb 2014)
Log Message:
-----------
epiphany: replace in-tree intltool.m4 with our version, patch configure.ac rather than configure, autoreconf to correct intltool configuration, build deps.

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

Added Paths:
-----------
    trunk/dports/gnome/epiphany/files/patch-configure.ac.diff

Removed Paths:
-------------
    trunk/dports/gnome/epiphany/files/patch-configure.diff

Modified: trunk/dports/gnome/epiphany/Portfile
===================================================================
--- trunk/dports/gnome/epiphany/Portfile	2014-02-22 03:23:06 UTC (rev 117324)
+++ trunk/dports/gnome/epiphany/Portfile	2014-02-22 04:41:52 UTC (rev 117325)
@@ -26,7 +26,8 @@
                 sha256  ae89d6902ed243304d2cbf2fa361f6dd0cb3401fdaf726e6fdd4acc09197d50a
 
 depends_build   port:pkgconfig \
-                port:intltool
+                port:intltool \
+                port:gnome-common
 
 depends_lib     port:desktop-file-utils \
                 port:gnome-icon-theme \
@@ -70,8 +71,17 @@
     }
 }
 
-patchfiles      patch-configure.diff
+patchfiles      patch-configure.ac.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.cflags-append -Wno-format-nonliteral
 
 configure.args  --with-distributor-name=MacPorts \

Added: trunk/dports/gnome/epiphany/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/gnome/epiphany/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/gnome/epiphany/files/patch-configure.ac.diff	2014-02-22 04:41:52 UTC (rev 117325)
@@ -0,0 +1,11 @@
+--- configure.ac.orig	2013-05-31 03:28:55.000000000 -0700
++++ configure.ac	2014-02-21 20:21:48.000000000 -0800
+@@ -90,7 +90,7 @@
+ AVAHI_REQUIRED=0.6.22
+ 
+ # Set to 'no' to build with the WebKit1 backend
+-with_webkit2=yes
++with_webkit2=no
+ 
+ if test "x$with_webkit2" != xno; then
+    WEBKIT_GTK_PC_NAME=webkit2gtk-3.0

Deleted: trunk/dports/gnome/epiphany/files/patch-configure.diff
===================================================================
--- trunk/dports/gnome/epiphany/files/patch-configure.diff	2014-02-22 03:23:06 UTC (rev 117324)
+++ trunk/dports/gnome/epiphany/files/patch-configure.diff	2014-02-22 04:41:52 UTC (rev 117325)
@@ -1,11 +0,0 @@
---- configure.orig	2013-08-15 21:08:06.000000000 -0700
-+++ configure	2013-08-15 21:08:32.000000000 -0700
-@@ -13775,7 +13775,7 @@
- AVAHI_REQUIRED=0.6.22
- 
- # Set to 'no' to build with the WebKit1 backend
--with_webkit2=yes
-+with_webkit2=no
- 
- if test "x$with_webkit2" != xno; then
-    WEBKIT_GTK_PC_NAME=webkit2gtk-3.0
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140221/801d7b58/attachment.html>