<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[134429] trunk/dports/gnome/epiphany</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/134429">134429</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2015-03-25 08:26:48 -0700 (Wed, 25 Mar 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>epiphany: reconfigure using autogen.sh for intltool 0.51 compatibility, remove GTK_DISABLE_DEPRECATED from DEPRECATION_FLAGS to fix build.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeepiphanyPortfile">trunk/dports/gnome/epiphany/Portfile</a></li>
<li><a href="#trunkdportsgnomeepiphanyfilespatchconfigureacdiff">trunk/dports/gnome/epiphany/files/patch-configure.ac.diff</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgnomeepiphanyfilesautogensh">trunk/dports/gnome/epiphany/files/autogen.sh</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomeepiphanyPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/epiphany/Portfile (134428 => 134429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/epiphany/Portfile        2015-03-25 14:56:57 UTC (rev 134428)
+++ trunk/dports/gnome/epiphany/Portfile        2015-03-25 15:26:48 UTC (rev 134429)
</span><span class="lines">@@ -27,7 +27,10 @@
</span><span class="cx"> 
</span><span class="cx"> depends_build   port:pkgconfig \
</span><span class="cx">                 port:intltool \
</span><del>-                port:gnome-common
</del><ins>+                port:gnome-common \
+                port:autoconf \
+                port:automake \
+                port:libtool
</ins><span class="cx"> 
</span><span class="cx"> depends_lib     port:desktop-file-utils \
</span><span class="cx">                 port:gnome-icon-theme \
</span><span class="lines">@@ -60,15 +63,13 @@
</span><span class="cx"> 
</span><span class="cx"> patchfiles      patch-configure.ac.diff
</span><span class="cx"> 
</span><del>-# update m4/intltool.m4 and autoreconf
</del><ins>+# reconfigure using autogen.sh for intltool 0.51 compatibility
</ins><span class="cx"> 
</span><del>-pre-configure {
-    copy -force ${prefix}/share/aclocal/intltool.m4 ${worksrcpath}/m4
-    reinplace &quot;s|--rpath=|-rpath |g&quot; ${worksrcpath}/configure.ac
</del><ins>+post-patch {
+    xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-use_autoreconf      yes
-autoreconf.args     -fvi
</del><ins>+configure.cmd       ./autogen.sh
</ins><span class="cx"> 
</span><span class="cx"> configure.cflags-append -Wno-format-nonliteral
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkdportsgnomeepiphanyfilesautogensh"></a>
<div class="addfile"><h4>Added: trunk/dports/gnome/epiphany/files/autogen.sh (0 => 134429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/epiphany/files/autogen.sh                                (rev 0)
+++ trunk/dports/gnome/epiphany/files/autogen.sh        2015-03-25 15:26:48 UTC (rev 134429)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+#!/bin/sh
+# Run this to generate all the initial makefiles, etc.
+
+srcdir=`dirname $0`
+test -z &quot;$srcdir&quot; &amp;&amp; srcdir=.
+
+PKG_NAME=&quot;epiphany&quot;
+
+(test -f $srcdir/src/ephy-window.c) || {
+    echo -n &quot;**Error**: Directory &quot;\`$srcdir\'&quot; does not look like the&quot;
+    echo &quot; top-level $PKG_NAME directory&quot;
+    exit 1
+}
+
+which gnome-autogen.sh || {
+    echo &quot;You need to install gnome-common from GNOME git and make&quot;
+    echo &quot;sure the gnome-autogen.sh script is in your \$PATH.&quot;
+    exit 1
+}
+
+REQUIRED_AUTOMAKE_VERSION=1.11
+REQUIRED_LIBTOOL_VERSION=2.2
+REQUIRED_INTLTOOL_VERSION=0.40.4
+. gnome-autogen.sh
</ins></span></pre></div>
<a id="trunkdportsgnomeepiphanyfilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/epiphany/files/patch-configure.ac.diff (134428 => 134429)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/epiphany/files/patch-configure.ac.diff        2015-03-25 14:56:57 UTC (rev 134428)
+++ trunk/dports/gnome/epiphany/files/patch-configure.ac.diff        2015-03-25 15:26:48 UTC (rev 134429)
</span><span class="lines">@@ -1,5 +1,14 @@
</span><del>---- configure.ac.orig        2013-05-31 03:28:55.000000000 -0700
-+++ configure.ac        2014-02-21 20:21:48.000000000 -0800
</del><ins>+--- configure.ac.orig        2015-03-25 08:15:37.000000000 -0700
++++ configure.ac        2015-03-25 08:16:05.000000000 -0700
+@@ -73,7 +73,7 @@
+ if test &quot;$enable_maintainer_mode&quot; = &quot;yes&quot;; then
+         AC_DEFINE([MAINTAINER_MODE],[1],[Define to enable 'maintainer-only' behaviour])
+         enable_debug=yes
+-        DEPRECATION_FLAGS=&quot;-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGSEAL_ENABLE&quot;
++        DEPRECATION_FLAGS=&quot;-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DGSEAL_ENABLE&quot;
+ fi

+ GLIB_REQUIRED=2.35.6
</ins><span class="cx"> @@ -90,7 +90,7 @@
</span><span class="cx">  AVAHI_REQUIRED=0.6.22
</span><span class="cx">  
</span></span></pre>
</div>
</div>

</body>
</html>