<!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>[151751] trunk/dports/gnome/goffice</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/151751">151751</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-08-21 11:39:16 -0700 (Sun, 21 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>goffice: update to version 0.10.32, autogen.sh, no longer requires gnome-common (but goffice08 still does).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgnomegofficePortfile">trunk/dports/gnome/goffice/Portfile</a></li>
<li><a href="#trunkdportsgnomegofficefilesautogensh">trunk/dports/gnome/goffice/files/autogen.sh</a></li>
<li><a href="#trunkdportsgnomegofficefilespatchconfigureacdiff">trunk/dports/gnome/goffice/files/patch-configure.ac.diff</a></li>
</ul>
<h3>Property Changed</h3>
<ul>
<li><a href="#trunkdportsgnomegoffice">trunk/dports/gnome/goffice/</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgnomegoffice"></a>
<div class="propset"><h4>Property changes: trunk/dports/gnome/goffice</h4>
<pre class="diff"><span>
</span></pre></div>
<a id="svnmergeinfo"></a>
<div class="modfile"><h4>Modified: svn:mergeinfo</h4></div>
<span class="cx"> + /users/devans/GNOME-3/stable/dports/gnome/goffice:126043-151749
</span><a id="trunkdportsgnomegofficePortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/goffice/Portfile (151750 => 151751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/goffice/Portfile 2016-08-21 18:37:59 UTC (rev 151750)
+++ trunk/dports/gnome/goffice/Portfile 2016-08-21 18:39:16 UTC (rev 151751)
</span><span class="lines">@@ -18,23 +18,22 @@
</span><span class="cx"> homepage http://www.gnumeric.org/
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-depends_build port:pkgconfig \
</del><ins>+if {${name} eq ${subport}} {
+ epoch 1
+ version 0.10.32
+
+ license {GPL-2 GPL-3}
+
+ checksums rmd160 4887c569629f61d1dae72a2aacc71560bb4b4fd0 \
+ sha256 02b37da9f54fb92725b973875d1d2da49b54f6486eb03648fd1ea58e4a297ac3
+
+ depends_build port:pkgconfig \
</ins><span class="cx"> port:intltool \
</span><del>- port:gnome-common \
</del><span class="cx"> port:gtk-doc \
</span><span class="cx"> port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:libtool
</span><span class="cx">
</span><del>-if {${name} eq ${subport}} {
- epoch 1
- version 0.10.31
-
- license {GPL-2 GPL-3}
-
- checksums rmd160 40120c2f49c8098ef71cecfde7c601d66bacd014 \
- sha256 9d1fc2dcc131742348ed6e1597e2fab143cbf73e7067c5c05a3f3565266ed5a5
-
</del><span class="cx"> depends_lib port:gtk3 \
</span><span class="cx"> port:libgsf \
</span><span class="cx"> port:librsvg \
</span><span class="lines">@@ -57,7 +56,6 @@
</span><span class="cx"> patch_quartz-goffice-goffice.c.diff
</span><span class="cx">
</span><span class="cx"> configure.args-append \
</span><del>- --enable-compile-warnings=minimum \
</del><span class="cx"> --disable-silent-rules
</span><span class="cx">
</span><span class="cx"> variant quartz {}
</span><span class="lines">@@ -87,6 +85,14 @@
</span><span class="cx">
</span><span class="cx"> license GPL-2
</span><span class="cx">
</span><ins>+ depends_build port:pkgconfig \
+ port:intltool \
+ port:gnome-common \
+ port:gtk-doc \
+ port:autoconf \
+ port:automake \
+ port:libtool
+
</ins><span class="cx"> depends_lib port:gtk2 \
</span><span class="cx"> port:gconf \
</span><span class="cx"> port:libgsf \
</span></span></pre></div>
<a id="trunkdportsgnomegofficefilesautogensh"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/goffice/files/autogen.sh (151750 => 151751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/goffice/files/autogen.sh 2016-08-21 18:37:59 UTC (rev 151750)
+++ trunk/dports/gnome/goffice/files/autogen.sh 2016-08-21 18:39:16 UTC (rev 151751)
</span><span class="lines">@@ -1,38 +1,13 @@
</span><span class="cx"> #!/bin/sh
</span><span class="cx"> # Run this to generate all the initial makefiles, etc.
</span><span class="cx">
</span><del>-PKG_NAME="goffice"
</del><ins>+PKG_NAME="Goffice"
</ins><span class="cx">
</span><del>-REQUIRED_AUTOMAKE_VERSION=1.9.0
-REQUIRED_LIBTOOL_VERSION=1.4.3
</del><ins>+test -n "$srcdir" || srcdir=$(dirname "$0")
+test -n "$srcdir" || srcdir=.
</ins><span class="cx">
</span><del>-# We need intltool >= 0.27.2 to extract the UTF-8 chars from source code:
-REQUIRED_INTLTOOL_VERSION=0.27.2
</del><ins>+olddir=$(pwd)
</ins><span class="cx">
</span><del>-# We require Automake 1.7.2, which requires Autoconf 2.54.
-# (It needs _AC_AM_CONFIG_HEADER_HOOK, for example.)
-REQUIRED_AUTOCONF_VERSION=2.54
-
-# This enforces the version for the machine where the tarball is built
-# from CVS. This requirement might be stronger than the one in configure.in.
-#
-# An example: we might require pkg-config binary >= 0.18, because it
-# implements Libs.private. But we might require macro PKG_PROG_PKG_CONFIG
-# from pkg-config >= 0.29 because this macro is able to detect old versions
-# of pkg-config conrrectly and reports a sane error message.
-#
-# In other words, the distribution tarball can be created only with 0.29 or
-# later, but it can be then compiled on any host with pkg-config >= 0.18.
-#
-# We would then use REQUIRED_PKG_CONFIG_VERSION=0.29 here and
-# PKG_PROG_PKG_CONFIG([0.18]) in configure.in.
-
-USE_GNOME2_MACROS=1
-USE_COMMON_DOC_BUILD=yes
-
-srcdir=`dirname $0`
-test -z "$srcdir" && srcdir=.
-
</del><span class="cx"> (test -f $srcdir/configure.ac \
</span><span class="cx"> && test -d $srcdir/goffice \
</span><span class="cx"> && test -f $srcdir/goffice/goffice.h) || {
</span><span class="lines">@@ -41,32 +16,20 @@
</span><span class="cx"> exit 1
</span><span class="cx"> }
</span><span class="cx">
</span><del>-ifs_save="$IFS"; IFS=":"
-for dir in $PATH ; do
- IFS="$ifs_save"
- test -z "$dir" && dir=.
- if test -f "$dir/gnome-autogen.sh" ; then
- gnome_autogen="$dir/gnome-autogen.sh"
- gnome_datadir=`echo $dir | sed -e 's,/bin$,/share,'`
- break
- fi
-done
</del><ins>+cd $srcdir
+aclocal --install || exit 1
+glib-gettextize --force --copy || exit 1
+gtkdocize --copy || exit 1
+intltoolize --force --copy --automake || exit 1
+autoreconf --verbose --force --install || exit 1
+cd $olddir
</ins><span class="cx">
</span><del>-if test -z "$gnome_autogen" ; then
- echo "You need to install the gnome-common module and make" 1>&2
- echo "sure the gnome-autogen.sh script is in your \$PATH." 1>&2
- exit 1
-fi
</del><ins>+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
</ins><span class="cx">
</span><del>-GNOME_DATADIR="$gnome_datadir"
-
-. $gnome_autogen
-
-if grep 'which gtkdoc-rebase >/dev/null &&' $srcdir/gtk-doc.make >/dev/null 2>&1 && \
- grep '[^-]installfiles=`echo $(srcdir)/html/*`;' $srcdir/gtk-doc.make >/dev/null 2>&1; then
- echo '----------------------------------------------------' 1>&2
- echo "Your gtk-doc has a dependency problem. Upgrade." 1>&2
- echo "See http://bugzilla.gnome.org/show_bug.cgi?id=506506" 1>&2
- echo '----------------------------------------------------' 1>&2
- exit 1
</del><ins>+ if [ "$1" = "--help" ]; then exit 0 else
+ echo "Now type 'make' to compile $PKG_NAME" || exit 1
+ fi
+else
+ echo "Skipping configure process."
</ins><span class="cx"> fi
</span></span></pre></div>
<a id="trunkdportsgnomegofficefilespatchconfigureacdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/gnome/goffice/files/patch-configure.ac.diff (151750 => 151751)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gnome/goffice/files/patch-configure.ac.diff 2016-08-21 18:37:59 UTC (rev 151750)
+++ trunk/dports/gnome/goffice/files/patch-configure.ac.diff 2016-08-21 18:39:16 UTC (rev 151751)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx"> --- configure.ac.orig 2015-05-17 16:32:52.000000000 -0700
</span><span class="cx"> +++ configure.ac 2015-07-30 17:02:42.000000000 -0700
</span><del>-@@ -293,14 +293,14 @@
</del><ins>+@@ -295,14 +295,14 @@
</ins><span class="cx"> if test "x$platform_osx" = xyes; then
</span><span class="cx"> AC_DEFINE([OS_OSX],[1],[Defined if system is Mac OS X])
</span><span class="cx"> dnl check for native osx
</span></span></pre>
</div>
</div>
</body>
</html>