<pre style='margin:0'>
Mojca Miklavec (mojca) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a8423424fedad68064f7ea58add2fae9afefb3ca">https://github.com/macports/macports-ports/commit/a8423424fedad68064f7ea58add2fae9afefb3ca</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 a842342 darwinbuild: sources moved, fix build error
</span>a842342 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit a8423424fedad68064f7ea58add2fae9afefb3ca
</span>Author: Ken Cunningham <ken.cunningham.webuse@gmail.com>
AuthorDate: Mon May 29 15:19:14 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> darwinbuild: sources moved, fix build error
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> * Switch to GitHub.
</span><span style='display:block; white-space:pre;color:#404040;'> * Remove warnings about deprecated functions that were treated as errors.
</span><span style='display:block; white-space:pre;color:#404040;'> * Fix a 64 -> 32 bit implicit integer cast.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/45849
</span><span style='display:block; white-space:pre;color:#404040;'> Closes: https://trac.macports.org/ticket/52355
</span>---
devel/darwinbuild/Portfile | 24 +++++++++---------
.../patch-darwinxref-plugins-register-64bit.diff | 29 ++++++++++++++++++++++
2 files changed, 41 insertions(+), 12 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/darwinbuild/Portfile b/devel/darwinbuild/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 59614e0..422667c 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/darwinbuild/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/darwinbuild/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,11 +1,10 @@
</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> PortGroup xcode 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name darwinbuild
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 33
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup macosforge darwinbuild 37 darwinbuild-
</span> categories devel
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -20,13 +19,13 @@ long_description The Darwin Build Scripts are a collection of tools that assi
</span> version on Apple's site. These tools will provide the proper build environment \
as well as help to resolve any necessary dependencies prior to building.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://darwinbuild.macosforge.org/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://svn.macosforge.org/repository/darwinbuild/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://macosforge.github.io/darwinbuild/
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-fetch.type svn
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.url ${master_sites}tags/${distname}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-svn.revision HEAD
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${distname}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 07fc93baeb10209b21d9aff843877556ba8b8f4f \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 2bb2e1458b6b9e3e6a189fb48e3cc0b72b7cb253607366b9ab6b92cdbac1e62b
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fix a 64 -> 32 bit implicit integer cast
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-darwinxref-plugins-register-64bit.diff
</span>
depends_lib-append port:sqlite3 \
port:tcl
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -34,9 +33,11 @@ depends_lib-append port:sqlite3 \
</span> xcode.configuration Public
xcode.target world
xcode.build.settings \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS=NO
</span> xcode.destroot.settings \
PREFIX=${prefix} \
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS=NO \
</span> LIBRARY_SEARCH_PATHS=${prefix}/lib \
HEADER_SEARCH_PATHS=${prefix}/include \
FRAMEWORK_SEARCH_PATHS=${frameworks_dir}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -51,8 +52,7 @@ variant universal {
</span>
pre-fetch {
if {${os.major} < 10} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- return -code error "The ${name} port is only for Darwin 10. For Darwin\
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 8 & 9 support, install the darwinbuild-legacy port."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ return -code error "For Darwin 8 & 9 support, install the darwinbuild-legacy port."
</span> }
if {![variant_isset universal]} {
return -code error "You must install ${name} with the universal variant.\
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/darwinbuild/files/patch-darwinxref-plugins-register-64bit.diff b/devel/darwinbuild/files/patch-darwinxref-plugins-register-64bit.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..c8efc7b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/darwinbuild/files/patch-darwinxref-plugins-register-64bit.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,29 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- darwinxref/plugins/register.c.orig 2013-10-16 16:25:16.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ darwinxref/plugins/register.c 2017-05-21 10:34:04.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -340,7 +340,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // sections immediately follow the dylib_command structure, and are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // reflected in the cmdsize.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int strsize = dylib->cmdsize - sizeof(struct dylib_command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned long int strsize = dylib->cmdsize - sizeof(struct dylib_command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* str = malloc(strsize+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strncpy(str, (char*)((uint8_t*)dylib + dylib->dylib.name.offset), strsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str[strsize] = 0; // NUL-terminate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -361,7 +361,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // sections immediately follow the dylib_command structure, and are
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // reflected in the cmdsize.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- int strsize = dylinker->cmdsize - sizeof(struct dylinker_command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned long int strsize = dylinker->cmdsize - sizeof(struct dylinker_command);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ char* str = malloc(strsize+1);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strncpy(str, (char*)((uint8_t*)dylinker + dylinker->name.offset), strsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ str[strsize] = 0; // NUL-terminate
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -381,7 +381,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (swap) swap_symtab_command(symtab, NXHostByteOrder());
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ nsyms = symtab->nsyms;
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- uint32_t symsize = nsyms * (mh64 ? sizeof(struct nlist_64) : sizeof(struct nlist));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ unsigned long int symsize = nsyms * (mh64 ? sizeof(struct nlist_64) : sizeof(struct nlist));
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ symbols = malloc(symsize);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ strsize = symtab->strsize;
</span></pre><pre style='margin:0'>
</pre>