<pre style='margin:0'>
Zero King (l2dy) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/146671ee32fa4a9e6fc240244e2186e1c3af6742">https://github.com/macports/macports-ports/commit/146671ee32fa4a9e6fc240244e2186e1c3af6742</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 146671e bitkeeper: fix build
</span>146671e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 146671ee32fa4a9e6fc240244e2186e1c3af6742
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Wed Sep 25 21:02:20 2019 +0800
<span style='display:block; white-space:pre;color:#404040;'> bitkeeper: fix build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixes: https://trac.macports.org/ticket/57874
</span>---
devel/bitkeeper/Portfile | 2 +
.../bitkeeper/files/patch-Makefile-bk-little.diff | 26 +++++
.../bitkeeper/files/patch-rename-macosx-macro.diff | 126 +++++++++++++++++++++
3 files changed, 154 insertions(+)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bitkeeper/Portfile b/devel/bitkeeper/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 8141fa8..c98c7eb 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bitkeeper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bitkeeper/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,6 +31,8 @@ depends_lib port:libtomcrypt \
</span> port:zlib
patchfiles patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-Makefile-bk-little.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-rename-macosx-macro.diff \
</span> patch-src-conf.mk.local.diff \
patch-src-gui-tcltk-Makefile.diff
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bitkeeper/files/patch-Makefile-bk-little.diff b/devel/bitkeeper/files/patch-Makefile-bk-little.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..37137e3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bitkeeper/files/patch-Makefile-bk-little.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,26 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git doc/nested/Makefile doc/nested/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4691168..cea3c76 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- doc/nested/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ doc/nested/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -2,7 +2,7 @@ HTML=html # default to be replaced when makefile is called
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BK=../../src/bk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ../www/nested.html: nested.doc ../www/template.html ../bin/pod2html.l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(BK) tclsh ../bin/pod2html.l \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(BK) little ../bin/pod2html.l \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --title="BitKeeper Nested Overview" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ --template=../www/template.html -- nested.doc > ../www/nested.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git man/man2html/Makefile man/man2html/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 454a0df..589cb10 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- man/man2html/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ man/man2html/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,7 +5,7 @@ all: html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ html: man2html.l BitKeeper_SN_Blue.png BitKeeper_SN_SVC_Blue.png
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @test -d www || mkdir www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @rm -f www/*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(BK) tclsh man2html.l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(BK) little man2html.l
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ @cp *.png *.js www
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ .PHONY: clean
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/bitkeeper/files/patch-rename-macosx-macro.diff b/devel/bitkeeper/files/patch-rename-macosx-macro.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..dbe6b56
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/bitkeeper/files/patch-rename-macosx-macro.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,126 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/gethelp.c src/gethelp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 3d70340..dd2abf7 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gethelp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gethelp.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -126,7 +126,7 @@ gethelp(char *helptxt, char *topic, char *bkarg, char *prefix, FILE *outf)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ *p = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ fputs(t, outf);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ t = &p[7];
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* all the same size for roff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * #BKMOD#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/libc/unix.h src/libc/unix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index bfbd1f2..6ffd7cc 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libc/unix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libc/unix.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -74,9 +74,9 @@
</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;'>+ #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define macosx() 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define is_macosx() 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define macosx() 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define is_macosx() 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* tcp/tcp.c */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/libc/win32.h src/libc/win32.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index b2522a8..7bec191 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/libc/win32.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/libc/win32.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define mkpipe(p, size) pipe(p, size)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define win32() 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define macosx() 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#define is_macosx() 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define NOPROC
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #define ELOOP 40
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/port/gui.c src/port/gui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index f1a7bcf..391c3a1 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/port/gui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/port/gui.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -26,7 +26,7 @@ gui_useDisplay(void)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *p;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ((p = getenv("BK_NO_GUI_PROMPT")) && *p) return (0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (win32() || macosx()) return ((p = getenv("BK_GUI")) && *p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (win32() || is_macosx()) return ((p = getenv("BK_GUI")) && *p);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return (getenv("DISPLAY") && (p = getenv("BK_GUI")) && *p);
</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;'>+diff --git src/port/uninstall.c src/port/uninstall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 6a26c2b..50592af 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/port/uninstall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/port/uninstall.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -351,7 +351,7 @@ uninstall(char *path, int upgrade)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ dfd = efopen("BK_UNINSTALL_LOG");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (macosx() && exists(MAC_PHFILE)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx() && exists(MAC_PHFILE)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ph = backtick("cat " MAC_PHFILE, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /*
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * Ensure that
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -435,7 +435,7 @@ uninstall(char *path, int upgrade)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ free(cmd);
</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;'>+- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* figure out if we're in a bundle or not */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char *bundle = fullname(bin, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -496,7 +496,7 @@ uninstall(char *path, int upgrade)
</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;'>+ /* On OS X, bk 7.0.1 and later use path_helper(8). Remove that crumb. */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (macosx() && removeph) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx() && removeph) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unlink(MAC_PHFILE);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rc = 0;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/upgrade.c src/upgrade.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 37d05e3..b8afb70 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/upgrade.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/upgrade.c
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -131,7 +131,7 @@ upgrade_main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ platform = bk_platform;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* figure out if we're in a bundle or not */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ bundle = fullname(bin, 0);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (p = strstr(bundle, "BitKeeper.app")) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -148,7 +148,7 @@ upgrade_main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notice("upgrade-nomsys", 0, "-e");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (!macosx() && install && noperms(bin)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (!is_macosx() && install && noperms(bin)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ notice("upgrade-badperms", bin, "-e");
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -216,7 +216,7 @@ upgrade_main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ unless (version) version = strdup(data[3]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (streq(data[5], platform)) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* found this platform */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* if we hit a .bin, skip it. we
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ * want the .pkg */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ p = strrchr(data[1], '.');
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -347,7 +347,7 @@ proceed:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ goto out;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(buf, "/usr/bin/open -W %s", data[1]);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sprintf(buf, "./%s -u", data[1]);
</span></pre><pre style='margin:0'>
</pre>