<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a32ccb1087a01f6e0ecdfea7b412efcf0f036063">https://github.com/macports/macports-ports/commit/a32ccb1087a01f6e0ecdfea7b412efcf0f036063</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new a32ccb1 kcd: Update to 7.15.0
</span>a32ccb1 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a32ccb1087a01f6e0ecdfea7b412efcf0f036063
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Nov 4 08:48:44 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> kcd: Update to 7.15.0
</span>---
sysutils/kcd/Portfile | 28 +++++++++++++++++++---------
sysutils/kcd/files/Makefile.in.patch | 13 +++++++++++++
sysutils/kcd/files/dirtree.cc.patch | 34 ++++++++++++++++++++++++++++++++++
sysutils/kcd/files/patch-Makefile.in | 11 -----------
sysutils/kcd/files/version.cc.patch | 10 ++++++++++
5 files changed, 76 insertions(+), 20 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/kcd/Portfile b/sysutils/kcd/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 02aea2f..99ff2a1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/kcd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/kcd/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,8 +1,18 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# -*- 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:#e0ffe0;'>+
</span> PortSystem 1.0
name kcd
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 7.6.2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# This is a development version, but the latest stable version dates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# back to 2007 and has more warnings than this one which itself dates
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# back to 2009. If there is ever a new stable version, go back to
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# following stable versions.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 7.15.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 cfe08bcec98614d7cb03974cecc9ccef72cdeb95 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5afe4320f216c58f8e1190fe34ee18874e684cc86fc8145c0d7cab9bb0819285 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 379948
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories sysutils
license GPL-2+
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,19 +24,19 @@ long_description \
</span> directory name in the command line and let kcd find it for you.
homepage http://kcd.sourceforge.net/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 c185abc405ab7dbc0e07959c57b0f6d1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 f5d2a08adf498a2c67a763a14d031982dea8aef9 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 03abbd62f735937fe09fbc2e9889987ead629042
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-Makefile.in
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/kcd/kcd/${version}
</span>
depends_lib port:gettext \
port:ncurses \
port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# fix conftest consuming all available memory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-use_autoconf yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append Makefile.in.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dirtree.cc.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version.cc.patch
</span>
destroot.destdir prefix=${destroot}${prefix} \
mandir=${destroot}${prefix}/share/man \
etcdir2=${destroot}${prefix}/etc
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Use this if a new stable version is ever released.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#livecheck.regex {/kcd-(\d+\.\d*[02468](?:\.\d+)*)}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/kcd/files/Makefile.in.patch b/sysutils/kcd/files/Makefile.in.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8647b91
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/kcd/files/Makefile.in.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Link with gettext library.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/kcd/bugs/6/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.in.orig 2007-12-05 04:39:30.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile.in 2019-11-04 06:36:36.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -60,7 +60,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXXCFLAGS = $(CPPFLAGS) $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LIBS = @LIBINTL@ @LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBS = -lintl @LIBS@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INSTALL_PROGRAM = @INSTALL_PROGRAM@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/kcd/files/dirtree.cc.patch b/sysutils/kcd/files/dirtree.cc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..5b7fa26
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/kcd/files/dirtree.cc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,34 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./dirtree.cc:173:4: error: no matching function for call to 'gzclose'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gzclose(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/opt/local/include/zlib.h:1630:24: note: candidate function not viable: no known conversion from 'FILE *' (aka '__sFILE *') to 'gzFile' (aka 'gzFile_s *') for 1st argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+./dirtree.cc:178:4: error: no matching function for call to 'gzclose'
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gzclose(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^~~~~~~
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+/opt/local/include/zlib.h:1630:24: note: candidate function not viable: no known conversion from 'FILE *' (aka '__sFILE *') to 'gzFile' (aka 'gzFile_s *') for 1st argument
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ZEXTERN int ZEXPORT gzclose OF((gzFile file));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ^
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2 errors generated.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/kcd/patches/3/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- dirtree.cc.orig 2009-02-18 06:01:05.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ dirtree.cc 2019-11-04 07:19:48.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -170,12 +170,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ReadSaveFile(dirTree, filegz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ catch(ErrorBadFileFormat &) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gzclose(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gzclose(filegz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw ErrorGenericFile(_("invalid file format in %$"), saveFile);
</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;'>+ catch(ErrorGZIO &) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- gzclose(file);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ gzclose(filegz);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ throw ErrorGenericFile(_("error reading file %$"), saveFile);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ gzclose(filegz);
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/kcd/files/patch-Makefile.in b/sysutils/kcd/files/patch-Makefile.in
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index bf238e3..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/sysutils/kcd/files/patch-Makefile.in
</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;'>---- Makefile.in Mon Mar 29 17:07:37 2004
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ Makefile.in.new Sat Jan 1 15:46:32 2005
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -56,7 +56,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXXCFLAGS = $(CPPFLAGS) $(CXXFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDFLAGS = @LDFLAGS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LIBS = @LIBINTL@ @LIBS@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBS = @LIBINTL@ @LIBS@ -lintl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL = @INSTALL@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- INSTALL_PROGRAM = @INSTALL_PROGRAM@
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/sysutils/kcd/files/version.cc.patch b/sysutils/kcd/files/version.cc.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c94bfc4
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/sysutils/kcd/files/version.cc.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix configure error on macOS which does not have /bin/true.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://sourceforge.net/p/kcd/patches/2/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- version.cc.orig 2009-02-18 06:01:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ version.cc 2019-11-04 07:41:19.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,4 +1,4 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-//bin/true; VERSION="7.15.0"; return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//usr/bin/env true; VERSION="7.15.0"; return 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Above magic is for configure to get version number
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // Generate automatically from scripts/versions.cc.src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char version[] = "7.15.0";
</span></pre><pre style='margin:0'>
</pre>