<!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>[151747] users/devans/GNOME-3/stable/dports/gnome/gnumeric</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/151747">151747</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2016-08-21 11:12:14 -0700 (Sun, 21 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>GNOME-3/stable: gnumeric, update to version 1.12.32, autogen.sh, no longer requires gnome-common.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnumericPortfile">users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile</a></li>
<li><a href="#usersdevansGNOME3stabledportsgnomegnumericfilesautogensh">users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/autogen.sh</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#usersdevansGNOME3stabledportsgnomegnumericfilespatchconfigureacdiff">users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/patch-configure.ac.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="usersdevansGNOME3stabledportsgnomegnumericPortfile"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile (151746 => 151747)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile 2016-08-21 18:10:38 UTC (rev 151746)
+++ users/devans/GNOME-3/stable/dports/gnome/gnumeric/Portfile 2016-08-21 18:12:14 UTC (rev 151747)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup gobject_introspection 1.0
</span><span class="cx">
</span><span class="cx"> name gnumeric
</span><del>-version 1.12.31
</del><ins>+version 1.12.32
</ins><span class="cx"> set branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx">
</span><span class="cx"> license GPL-2+
</span><span class="lines">@@ -26,8 +26,8 @@
</span><span class="cx"> master_sites gnome:sources/${name}/${branch}/
</span><span class="cx"> use_xz yes
</span><span class="cx">
</span><del>-checksums rmd160 a6cdd8f40baea32edd0839fa93e9521e26f3ce4c \
- sha256 c8ace78e75c280dced3f15b27c44c7a98e8d21cd8361c6b2599cce191f6d6ae7
</del><ins>+checksums rmd160 2d9b3b0daf535ef598716f362b86f2631453c0aa \
+ sha256 a07bc83e2adaeb94bfa2c737c9a19d90381a19cb203dd7c4d5f7d6cfdbee6de8
</ins><span class="cx">
</span><span class="cx"> # set pbranch to desired perl version
</span><span class="cx"> # currently 5.22 (#48365)
</span><span class="lines">@@ -36,7 +36,6 @@
</span><span class="cx"> depends_build port:pkgconfig \
</span><span class="cx"> port:intltool \
</span><span class="cx"> port:gnome-doc-utils \
</span><del>- port:gnome-common \
</del><span class="cx"> port:autoconf \
</span><span class="cx"> port:automake \
</span><span class="cx"> port:libtool \
</span><span class="lines">@@ -57,8 +56,6 @@
</span><span class="cx">
</span><span class="cx"> gobject_introspection yes
</span><span class="cx">
</span><del>-patchfiles patch-configure.ac.diff
-
</del><span class="cx"> # reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre></div>
<a id="usersdevansGNOME3stabledportsgnomegnumericfilesautogensh"></a>
<div class="modfile"><h4>Modified: users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/autogen.sh (151746 => 151747)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/autogen.sh 2016-08-21 18:10:38 UTC (rev 151746)
+++ users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/autogen.sh 2016-08-21 18:12:14 UTC (rev 151747)
</span><span class="lines">@@ -3,22 +3,11 @@
</span><span class="cx">
</span><span class="cx"> PKG_NAME="Gnumeric"
</span><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 use the XGETTEXT_KEYWORDS variable, thus we require:
-REQUIRED_INTLTOOL_VERSION=0.29
</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
-
-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/src \
</span><span class="cx"> && test -f $srcdir/src/gnumeric.h) || {
</span><span class="lines">@@ -27,37 +16,22 @@
</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"
- echo "sure the gnome-autogen.sh script is in your \$PATH."
- exit 1
-fi
</del><span class="cx">
</span><del>-GNOME_DATADIR="$gnome_datadir"
-
-# Dont't run configure yet, ...
-GNM_NOCONFIGURE=$NOCONFIGURE
-NOCONFIGURE=1
-. $gnome_autogen
-
</del><span class="cx"> # We have our own copy of Makefile.in.in generated October 2008.
</span><span class="cx"> # One of the reasons why we need a local copy is that
</span><span class="cx"> # we generate po-functions/Makefile.in.in from it, which is committed to
</span><span class="cx"> # SVN, so this file cannot depend on the versions of the tools which the
</span><span class="cx"> # developers have installed.
</span><span class="cx"> #
</span><del>-printbold "Creating po/Makefile.in.in and po-functions/Makefile.in.in."
</del><ins>+echo "Creating po/Makefile.in.in and po-functions/Makefile.in.in."
</ins><span class="cx"> #rm -f $srcdir/po/Makefile.in.in $srcdir/po-functions/Makefile.in.in
</span><span class="cx"> rm -f $srcdir/po-functions/Makefile.in.in
</span><span class="cx"> #cp $srcdir/po/Makefile.in.in.own $srcdir/po/Makefile.in.in
</span><span class="lines">@@ -68,7 +42,7 @@
</span><span class="cx"> -e '/^EXTRA_DISTFILES/s/ LINGUAS//' \
</span><span class="cx"> $srcdir/po/Makefile.in.in >$srcdir/po-functions/Makefile.in.in
</span><span class="cx">
</span><del>-printbold "Creating po-functions/POTFILES.{in,skip}."
</del><ins>+echo "Creating po-functions/POTFILES.{in,skip}."
</ins><span class="cx"> rm -f $srcdir/po-functions/POTFILES.in $srcdir/po-functions/POTFILES.skip
</span><span class="cx"> # This regex matches names of XML files:
</span><span class="cx"> xml_file_name='^((schemas|templates)/.+|[^/]+)\.in$|\.(glade|xml)(\.in)?$'
</span><span class="lines">@@ -80,9 +54,13 @@
</span><span class="cx"> egrep "$xml_file_name" $srcdir/po/POTFILES.in
</span><span class="cx"> ) >$srcdir/po-functions/POTFILES.skip
</span><span class="cx">
</span><del>-# ... and then proceed.
-if test "x$GNM_NOCONFIGURE" = x; then
- printbold Running $srcdir/configure $conf_flags "$@" ...
- $srcdir/configure $conf_flags "$@" \
- && echo Now type \`make\' to compile $PKG_NAME || exit 1
</del><ins>+
+if [ "$NOCONFIGURE" = "" ]; then
+ $srcdir/configure "$@" || exit 1
+
+ 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="usersdevansGNOME3stabledportsgnomegnumericfilespatchconfigureacdiff"></a>
<div class="delfile"><h4>Deleted: users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/patch-configure.ac.diff (151746 => 151747)</h4>
<pre class="diff"><span>
<span class="info">--- users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/patch-configure.ac.diff 2016-08-21 18:10:38 UTC (rev 151746)
+++ users/devans/GNOME-3/stable/dports/gnome/gnumeric/files/patch-configure.ac.diff 2016-08-21 18:12:14 UTC (rev 151747)
</span><span class="lines">@@ -1,19 +0,0 @@
</span><del>---- configure.ac.orig 2014-12-30 18:35:24.000000000 -0800
-+++ configure.ac 2015-01-26 11:16:37.000000000 -0800
-@@ -266,11 +266,11 @@
- AC_CHECK_PROG(GDK_PIXBUF_CSOURCE, gdk-pixbuf-csource$ac_exeext, gdk-pixbuf-csource$ac_exeext)
-
- ## this should come after `AC_PROG_CC'
--ifdef([GNOME_COMPILE_WARNINGS],
-- [GNOME_COMPILE_WARNINGS] CFLAGS="$CFLAGS $WARN_CFLAGS",
-- []
--)
--set_more_warnings=yes
-+dnl ifdef([GNOME_COMPILE_WARNINGS],
-+dnl [GNOME_COMPILE_WARNINGS] CFLAGS="$CFLAGS $WARN_CFLAGS",
-+dnl []
-+dnl)
-+set_more_warnings=no
- if test "$GCC" = yes -a "x$set_more_warnings" != xno; then
- dnl Clang needs this option, or else it will appear to support any
- dnl warning option, only to spew warnings about them later.
</del></span></pre>
</div>
</div>
</body>
</html>