<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/7eff6c7318e089abe9f17e6ac8118299fe77205f">https://github.com/macports/macports-ports/commit/7eff6c7318e089abe9f17e6ac8118299fe77205f</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 7eff6c7318e bitkeeper: fix build
</span>7eff6c7318e is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7eff6c7318e089abe9f17e6ac8118299fe77205f
</span>Author: Zero King <l2dy@macports.org>
AuthorDate: Sun Nov 14 13:57:46 2021 +0000
<span style='display:block; white-space:pre;color:#404040;'> bitkeeper: fix build
</span>---
devel/bitkeeper/Portfile | 20 ++--
.../bitkeeper/files/patch-Makefile-bk-little.diff | 26 -----
.../bitkeeper/files/patch-rename-macosx-macro.diff | 126 ---------------------
3 files changed, 10 insertions(+), 162 deletions(-)
<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 902b85b9e1d..4a7456e7891 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;'>@@ -1,10 +1,12 @@
</span> # -*- 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
PortSystem 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name bitkeeper
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup bitkeeper-scm bitkeeper 994fb651a4045b221e33703fc3d665c3a34784e1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# commit contains build fixes
</span> version 7.3.3
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> categories devel
platforms darwin
supported_archs x86_64
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,13 +16,13 @@ description BitKeeper is a fast, enterprise-ready, distributed SCM \
</span> that scales up to very large projects and down to tiny ones.
long_description {*}${description}
homepage https://www.bitkeeper.org/
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites https://www.bitkeeper.org/downloads/${version}/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname bk-${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .src.tar.gz
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#master_sites https://www.bitkeeper.org/downloads/${version}/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#distname bk-${version}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#extract.suffix .src.tar.gz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 eba72e926b0e6188c1c398ecd7abcd29925ab356 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 da2b8ef3044b9fc9d96cbd5990e5a9e989f5856f9b394013affc1e25014a2928 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 20273074
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 95409bbe4a4ea4f358cc717459094eb9dec7a95c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 c9fc0fe380f3816aa1f063213eb7bc27f18285e3367c2144b091ed89a1f6daf0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 29060773
</span>
depends_build port:pkgconfig
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -31,8 +33,6 @@ depends_lib port:libtomcrypt \
</span> port:zlib
patchfiles patch-Makefile.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-Makefile-bk-little.diff \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 37137e372ce..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bitkeeper/files/patch-Makefile-bk-little.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,26 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git doc/nested/Makefile doc/nested/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 4691168..cea3c76 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- doc/nested/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ doc/nested/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2,7 +2,7 @@ HTML=html # default to be replaced when makefile is called
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BK=../../src/bk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ../www/nested.html: nested.doc ../www/template.html ../bin/pod2html.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(BK) tclsh ../bin/pod2html.l \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(BK) little ../bin/pod2html.l \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --title="BitKeeper Nested Overview" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- --template=../www/template.html -- nested.doc > ../www/nested.html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git man/man2html/Makefile man/man2html/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 454a0df..589cb10 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- man/man2html/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ man/man2html/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -5,7 +5,7 @@ all: html
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- html: man2html.l BitKeeper_SN_Blue.png BitKeeper_SN_SVC_Blue.png
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @test -d www || mkdir www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @rm -f www/*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(BK) tclsh man2html.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(BK) little man2html.l
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @cp *.png *.js www
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- .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>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index dbe6b56a05c..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/bitkeeper/files/patch-rename-macosx-macro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,126 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/gethelp.c src/gethelp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 3d70340..dd2abf7 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/gethelp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/gethelp.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,7 +126,7 @@ gethelp(char *helptxt, char *topic, char *bkarg, char *prefix, FILE *outf)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- *p = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fputs(t, outf);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- t = &p[7];
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* all the same size for roff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * #BKMOD#
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/libc/unix.h src/libc/unix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bfbd1f2..6ffd7cc 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libc/unix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libc/unix.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -74,9 +74,9 @@
</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;'>- #ifdef __APPLE__
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define macosx() 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define is_macosx() 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define macosx() 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define is_macosx() 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* tcp/tcp.c */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/libc/win32.h src/libc/win32.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index b2522a8..7bec191 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/libc/win32.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/libc/win32.h
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -75,7 +75,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define mkpipe(p, size) pipe(p, size)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define win32() 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--#define macosx() 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#define is_macosx() 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define NOPROC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #define ELOOP 40
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/port/gui.c src/port/gui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index f1a7bcf..391c3a1 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/port/gui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/port/gui.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -26,7 +26,7 @@ gui_useDisplay(void)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *p;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if ((p = getenv("BK_NO_GUI_PROMPT")) && *p) return (0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (win32() || macosx()) return ((p = getenv("BK_GUI")) && *p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (win32() || is_macosx()) return ((p = getenv("BK_GUI")) && *p);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- return (getenv("DISPLAY") && (p = getenv("BK_GUI")) && *p);
</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;'>-diff --git src/port/uninstall.c src/port/uninstall.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 6a26c2b..50592af 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/port/uninstall.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/port/uninstall.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -351,7 +351,7 @@ uninstall(char *path, int upgrade)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dfd = efopen("BK_UNINSTALL_LOG");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macosx() && exists(MAC_PHFILE)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx() && exists(MAC_PHFILE)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ph = backtick("cat " MAC_PHFILE, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /*
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * Ensure that
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -435,7 +435,7 @@ uninstall(char *path, int upgrade)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- free(cmd);
</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 (macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* figure out if we're in a bundle or not */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- char *bundle = fullname(bin, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -496,7 +496,7 @@ uninstall(char *path, int upgrade)
</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 OS X, bk 7.0.1 and later use path_helper(8). Remove that crumb. */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macosx() && removeph) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx() && removeph) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unlink(MAC_PHFILE);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rc = 0;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git src/upgrade.c src/upgrade.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 37d05e3..b8afb70 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/upgrade.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/upgrade.c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -131,7 +131,7 @@ upgrade_main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- platform = bk_platform;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* figure out if we're in a bundle or not */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- bundle = fullname(bin, 0);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (p = strstr(bundle, "BitKeeper.app")) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,7 +148,7 @@ upgrade_main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notice("upgrade-nomsys", 0, "-e");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto out;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (!macosx() && install && noperms(bin)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (!is_macosx() && install && noperms(bin)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- notice("upgrade-badperms", bin, "-e");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto out;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,7 +216,7 @@ upgrade_main(int ac, char **av)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- unless (version) version = strdup(data[3]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (streq(data[5], platform)) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* found this platform */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- /* if we hit a .bin, skip it. we
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- * want the .pkg */
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- p = strrchr(data[1], '.');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -347,7 +347,7 @@ proceed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- goto out;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (is_macosx()) {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(buf, "/usr/bin/open -W %s", data[1]);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sprintf(buf, "./%s -u", data[1]);
</span></pre><pre style='margin:0'>
</pre>