<pre style='margin:0'>
Rainer Müller (raimue) pushed a commit to branch stellarium_0.15.0
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7deb61f6b44a9ad4aeb3f9ad91646307598ac99c">https://github.com/macports/macports-ports/commit/7deb61f6b44a9ad4aeb3f9ad91646307598ac99c</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 7deb61f6b44a9ad4aeb3f9ad91646307598ac99c
</span>Author: Dan R. K. Ports <dports@macports.org>
AuthorDate: Sun Nov 6 18:08:38 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> gnucash: merge gnucash-devel in as a subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> The gnucash-devel port tracks unstable-branch releases of gnucash, and
</span><span style='display:block; white-space:pre;color:#404040;'> there haven't been any of those in a while, so it currently installs
</span><span style='display:block; white-space:pre;color:#404040;'> the same version as the gnucash port.
</span>---
gnome/gnucash-devel/Portfile | 173 ---------------
gnome/gnucash-devel/files/autogen.sh | 246 ---------------------
gnome/gnucash-devel/files/patch-configure.ac.diff | 18 --
gnome/gnucash-devel/files/patch-configure.diff | 18 --
.../files/patch-src_bin_environment.in.diff | 11 -
.../files/patch-src_core-utils_gnc-path.c.diff | 11 -
gnome/gnucash/Portfile | 14 +-
7 files changed, 13 insertions(+), 478 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-devel/Portfile b/gnome/gnucash-devel/Portfile
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9c4a125..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-devel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,173 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# $Id$
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortSystem 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup perl5 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-name gnucash-devel
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts gnucash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set my_name gnucash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 2.6.14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-perl5.branches 5.24
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-categories gnome x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-license GPL-2+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-maintainers dports openmaintainer
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platforms darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-description a personal and small-business financial-accounting software
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-long_description GnuCash is a personal and small-business \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- financial-accounting software. -- gnucash-devel \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- installs a version from the development (unstable) \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- branch. It cannot be installed along the regular \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (stable) version. If you want to try it, it is \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- recommended that you `port deactivate gnucash', then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- `port install gnucash-devel', so that you can go \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- back to a working copy in case anything goes wrong.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://www.gnucash.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:${my_name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- http://www.gnucash.org/pub/gnucash/sources/unstable/${branch}.x/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-dist_subdir ${my_name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${my_name}-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 3e7eb1da511efe7b1a91224d1ca2a53b3fd42052 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 3b144f2ca5025df5eb1977b11e6f93208f3e90d840285ae952fa9b3da8158e75
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# We'll install gnucash's libraries in a separate subdir of
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# ${prefix}/lib, because gnucash sets DYLD_LIBRARY_PATH at runtime in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# order to dynamically load these directories, and including all
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# MacPorts libraries in DYLD_LIBRARY_PATH can cause problems.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# guile18 modules are also installed in a separate subdirectory.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# See https://trac.macports.org/ticket/52494.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set gnclibdir ${prefix}/lib/gnucash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-configure.ac.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_bin_environment.in.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@GUILEPATH@@|${prefix}/lib/guile18|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/bin/environment.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@@LIBDIR@@|${gnclibdir}|" ${worksrcpath}/src/core-utils/gnc-path.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # gnc-fq-dump needs to be patched to use MacPorts perl.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (autoconf takes care of the other perl scripts.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|^#!/usr/bin/perl|#!${perl5.bin}|" ${worksrcpath}/src/quotes/gnc-fq-dump
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # patch source files to include guile18 header instead of guile.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (Note that gnucash's autoconf scripts prefer guile18 over guile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if both are installed.)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fs-traverse f ${worksrcpath} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if [regexp {\.[ch]$} ${f}] {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|<libguile\\.h>|<libguile18.h>|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace -locale C "s|<libguile/|<libguile18/|g" ${f}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_build port:pkgconfig \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:intltool \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:autoconf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:automake \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libtool
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-depends_lib port:guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libgnomeui \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:goffice08 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-datemanip \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:p${perl5.major}-finance-quote
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# yelp currently requires X11 to build so disable dependency if building
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# with +quartz
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# TODO: add +x11 +quartz variants to distinguish one build from the other
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# since they have different binary dependencies. Otherwise, rev-upgrade
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# errors may occur
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if {![variant_isset quartz]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_run port:yelp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-platform darwin {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {${configure.cxx_stdlib} eq "libstdc++"} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-delete path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/pkgconfig/webkit-1.0.pc:webkit-gtk-2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# aqbanking is not universal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-universal_variant no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# reconfigure using upstream autogen.sh for intltool 0.51 compatibility
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 ${filespath}/autogen.sh ${worksrcpath}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "cd ${worksrcpath} && ./autogen.sh"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset python27]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Fix python exec_prefix
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\(PYTHON_EXEC_PREFIX=\\).*$|\\1${frameworks_dir}/Python.framework/Versions/2.7/|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|\\(PYTHON_PREFIX=\\).*$|\\1${frameworks_dir}/Python.framework/Versions/2.7/|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args --disable-dependency-tracking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-aqbanking \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-ofx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --disable-dbi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-html-engine=webkit \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --with-guile=1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.args-append --libdir=${gnclibdir}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.perl ${perl5.bin}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-configure.env \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE=${prefix}/bin/guile18 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_CONFIG=${prefix}/bin/guile18-config \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_TOOLS=${prefix}/bin/guile18-tools
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant hbci description {AqBanking/HBCI support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append path:lib/libaqbanking.dylib:aqbanking5-gtk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-aqbanking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-aqbanking
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant ofx description {OFX support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libofx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-ofx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-ofx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant dbi description {Adds dbi backend support} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:libdbi \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:libdbi-drivers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-delete --disable-dbi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-dbi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --with-dbi-dbd-dir=${prefix}/lib/dbd
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notes-append "gnucash DBI backend support requires the libdbi-drivers port to be built with support for the desired databases. sqlite3 is available by default; for MySQL or PostgreSQL support, ensure that the corresponding variant is selected for libdbi-drivers."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-default_variants +ofx +hbci
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant python27 description {Install Python bindings for Python 2.7} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:python27
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set python_bindir ${frameworks_dir}/Python.framework/Versions/2.7/bin/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.args-append --enable-python \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_EXTRA_LDFLAGS=\"\`${python_bindir}/python2.7-config --ldflags\`\" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_CPPFLAGS=\"\`${python_bindir}/python2.7-config --cflags\`\"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- configure.python ${python_bindir}/python2.7
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/gtk-update-icon-cache -f -t ${prefix}/share/icons/hicolor"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system "${prefix}/bin/glib-compile-schemas ${prefix}/share/glib-2.0/schemas"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "/${my_name} .*/(\[0-9\]+\\.\[0-9\]*\[0-9\]\\.\[0-9\]+)/"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-devel/files/autogen.sh b/gnome/gnucash-devel/files/autogen.sh
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 54641d5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-devel/files/autogen.sh
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,246 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#!/bin/sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Run this to generate all the initial makefiles, etc.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$srcdir" ; then srcdir=`dirname $0` ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test -z "$srcdir" ; then srcdir=. ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-cd $srcdir
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-DIE=0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if [ -n "${GNOME2_PATH}" ]; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for dir in `echo ${GNOME2_PATH} | sed 's/:/ /g'`; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d "${dir}/share/aclocal"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ACLOCAL_FLAGS="${ACLOCAL_FLAGS} -I ${dir}/share/aclocal"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -d "${dir}/bin"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PATH="${PATH}:${dir}/bin"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- export PATH
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# usage: test_version program version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# returns 0 if program >= version; returns 1 if not.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test_version()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- this_prog="$1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- want_vers="$2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testv=`"$this_prog" --version 2>/dev/null | head -n 1 | awk '{print $NF}'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -z "$testv" ; then return 1 ; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testv_major=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- testv_minor=`echo "$testv" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vers_major=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\1/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vers_minor=`echo "$want_vers" | sed 's/\([0-9]*\).\([0-9]*\).*$/\2/'`
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if wanted_major > found_major, this isn't good enough
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test $vers_major -gt $testv_major ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if wanted_major < found_major, then this is fine
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test $vers_major -lt $testv_major ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # if we get here, then the majors are equal, so test the minor version
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # we want found_minor >= want_minor.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # So, if want_minor > found_minor, this is bad.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elif test $vers_minor -gt $testv_minor ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # this is it.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# usage: find_program preset program version "<other versions>"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# sets "program" to the name of the program to use.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if preset is set, then use that regardless,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# otherwise check if "program" is of a good enough version and use that,
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# otherwise check if "program-version" is of a good enough version and use that.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# otherwise return an error.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-{
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- find="$1"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- prog="$2"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- vers="$3"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- extravers="$4"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test -n "$find" ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_version "$find" "$vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status="$?"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$status" = 0 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$find"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: cannot use $find"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_version "$prog" "$vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$status" = 0 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$prog"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- for test_vers in $vers $extravers ; do
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- test_version "$prog-$test_vers" "$vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- status=$?
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "$status" = 0 ; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$prog-$test_vers"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- done
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Warning**: Could not find a $prog that identifies itself >= $vers."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- program="$prog"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Store all required programs in variables. All of these variables
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# could have been set by the developer beforehand, if he/she needs to
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# override the defaults of here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${GLIB_GETTEXTIZE=glib-gettextize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${INTLTOOLIZE=intltoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-: ${LIBTOOLIZE=libtoolize}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$AUTOCONF" autoconf 2.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOCONF="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$AUTOHEADER" autoheader 2.59
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOHEADER="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$AUTOMAKE" automake 1.11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-AUTOMAKE="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-find_program "$ACLOCAL" aclocal 1.9
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-ACLOCAL="$program"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# All variables are set. Now check whether these programs are really
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# available.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${GLIB_GETTEXTIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`glib-gettextize' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Get the development packages of the glib-2.x library from your distribution."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${INTLTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`intltoolize' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Get the package 'intltool' of your distribution."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# On MacOS, libtoolize is installed as glibtoolize, so handle that here.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LIBTOOLIZE=glibtoolize
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (${LIBTOOLIZE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`libtoolize' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Could not find either \`libtoolize' or \'glibtoolize'."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${AUTOMAKE} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`automake' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- NO_AUTOMAKE=yes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# if no automake, don't bother testing for aclocal
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -n "$NO_AUTOMAKE" || (${ACLOCAL} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: Missing \`aclocal'. The version of \`automake'"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "installed doesn't appear recent enough (older than automake-1.4)."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-(${AUTOCONF} --version) < /dev/null > /dev/null 2>&1 || {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "**Error**: You must have \`autoconf' installed to compile GnuCash."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "Download the appropriate package for your distribution,"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- echo "or get the source tarball at ftp://ftp.gnu.org/pub/gnu/"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DIE=1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if test "$DIE" -eq 1; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- exit 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-case $CC in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-xlc )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- am_opt=--include-deps;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-esac
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# All programs are available. So now actually call them in the
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# required order.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Creating po/POTFILES.in ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r po/POTFILES.in || touch po/POTFILES.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Creating aclocal.m4 ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r aclocal.m4 || touch aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${GLIB_GETTEXTIZE} --force --copy ... "
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "GnuCash note: Please ignore the output of ${GLIB_GETTEXTIZE} below!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "no" | ${GLIB_GETTEXTIZE} --force --copy
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "GnuCash note: Please ignore the output of ${GLIB_GETTEXTIZE} above!"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Ensure aclocal.m4 is writable ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r aclocal.m4 && chmod u+w aclocal.m4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Ensure po/POTFILES.in is writable ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-test -r po/POTFILES.in && chmod u+w po/POTFILES.in
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${INTLTOOLIZE} --force --copy ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${INTLTOOLIZE} --force --copy || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${INTLTOOLIZE} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${LIBTOOLIZE} --force --copy ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${LIBTOOLIZE} --force --copy || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${LIBTOOLIZE} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-aclocalinclude="$ACLOCAL_FLAGS -I macros"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${ACLOCAL} $aclocalinclude ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${ACLOCAL} $aclocalinclude || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${ACLOCAL} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${AUTOHEADER}..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${AUTOHEADER} || { echo "**Error**: ${AUTOHEADER} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${AUTOMAKE} --add-missing --gnu --warnings=no-portability $am_opt ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${AUTOMAKE} --add-missing --gnu --warnings=no-portability $am_opt || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${AUTOMAKE} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "Running ${AUTOCONF} ..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-${AUTOCONF} || \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- { echo "**Error**: ${AUTOCONF} failed."; exit 1; }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-############################################################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Done.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-conf_flags="--enable-compile-warnings" # --enable-iso-c --enable-error-on-warning
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo "NOTE: Just run configure. Even if something told you to run"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo " aclocal, automake, or anything else above, IGNORE IT."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo " Everything has been run properly. Just run configure..."
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo ""
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-echo You must now run $srcdir/configure $conf_flags "$@" ...
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-devel/files/patch-configure.ac.diff b/gnome/gnucash-devel/files/patch-configure.ac.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b5924f4..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-devel/files/patch-configure.ac.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.ac.orig 2016-05-16 21:59:52.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure.ac 2016-05-16 22:00:05.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -357,7 +357,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ;;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- darwin*)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform=darwin
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- AC_DEFINE(PLATFORM_OSX,1,[Running on OSX, either X11 or Quartz])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_RESULT($platform)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_MSG_CHECKING(For GDK-Quartz)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform=osx
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -429,7 +428,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AC_SUBST(REGEX_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(PLATFORM_LINUX, test "x$platform" = "xlinux/other")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--AM_CONDITIONAL(PLATFORM_OSX, test "x$platform" = "xdarwin")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(PLATFORM_OSX_QUARTZ, test "x$platform" = "xdarwin/quartz")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(PLATFORM_WIN32, test "x$platform" = "xwin32")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AM_CONDITIONAL(OS_WIN32, test "x$native_win32" = "xyes")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-devel/files/patch-configure.diff b/gnome/gnucash-devel/files/patch-configure.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 3160d1d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-devel/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,18 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- configure.orig 2011-01-14 17:48:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-01-14 17:48:23.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -14681,13 +14681,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_OSX_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if test "x$platform" = "xdarwin/quartz"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_TRUE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_FALSE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_TRUE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PLATFORM_OSX_QUARTZ_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_OSX_QUARTZ_TRUE='#'
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PLATFORM_OSX_QUARTZ_FALSE=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if test "x$platform" = "xwin32"; then
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PLATFORM_WIN32_TRUE=
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-devel/files/patch-src_bin_environment.in.diff b/gnome/gnucash-devel/files/patch-src_bin_environment.in.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9308824..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-devel/files/patch-src_bin_environment.in.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/bin/environment.in.orig 2016-10-04 23:47:24.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/bin/environment.in 2016-10-04 23:46:34.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GUILE_LOAD_COMPILED_PATH={GNC_LIB}/scm/ccache/@-GUILE_EFFECTIVE_VERSION-@;{GUILE_COMPILED_LIBS};{GUILE_LOAD_COMPILED_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Tell Guile where to find GnuCash specific shared libraries
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--GNC_LIBRARY_PATH={SYS_LIB};{GNC_LIB}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+GNC_LIBRARY_PATH={GNC_LIB};@@GUILEPATH@@;@@LIBDIR@@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD_LIBRARY_PATH={GNC_LIBRARY_PATH};{LD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The same, but for GnuCash on OS X
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- DYLD_LIBRARY_PATH={GNC_LIBRARY_PATH};{DYLD_LIBRARY_PATH}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash-devel/files/patch-src_core-utils_gnc-path.c.diff b/gnome/gnucash-devel/files/patch-src_core-utils_gnc-path.c.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index b3be84d..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash-devel/files/patch-src_core-utils_gnc-path.c.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/core-utils/gnc-path.c.orig 2016-10-09 12:42:19.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/core-utils/gnc-path.c 2016-10-09 12:44:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -48,7 +48,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- gchar *gnc_path_get_libdir()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- //printf("Returning libdir %s\n", gnc_gbr_find_lib_dir (LIBDIR));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- return gnc_gbr_find_lib_dir (LIBDIR);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ return g_strdup("@@LIBDIR@@");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /** Returns the datadir path, usually
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/gnome/gnucash/Portfile b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 2881ab5..452fe0a 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/gnome/gnucash/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,15 +5,18 @@ PortSystem 1.0
</span> PortGroup perl5 1.0
name gnucash
<span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts gnucash gnucash-devel
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+conflicts-delete ${subport}
</span> version 2.6.14
revision 3
perl5.branches 5.24
<span style='display:block; white-space:pre;background:#ffe0e0;'>-conflicts gnucash-devel
</span> categories gnome x11
license GPL-2+
maintainers dports openmaintainer
platforms darwin
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> description a personal and small-business financial-accounting software
long_description GnuCash is a personal and small-business \
financial-accounting software, freely licensed under the \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -166,3 +169,12 @@ post-activate {
</span> }
livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[02468\]\\.\[0-9\]+)/"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport gnucash-devel {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ master_sites sourceforge:${name} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ http://www.gnucash.org/pub/gnucash/sources/unstable/${branch}.x/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex "/${name} .*/(\[0-9\]+\\.\[0-9\]*\[0-9\]\\.\[0-9\]+)/"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span></pre><pre style='margin:0'>
</pre>