<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/76dbd68c51c973f9f094dc787f3b85a95af6b4c0">https://github.com/macports/macports-ports/commit/76dbd68c51c973f9f094dc787f3b85a95af6b4c0</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 76dbd68 fastdb: update to 3.76
</span>76dbd68 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 76dbd68c51c973f9f094dc787f3b85a95af6b4c0
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sun Sep 2 19:49:27 2018 -0700
<span style='display:block; white-space:pre;color:#404040;'> fastdb: update to 3.76
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> fix build by removing freebsd collision
</span><span style='display:block; white-space:pre;color:#404040;'> add proper cxx build flags
</span><span style='display:block; white-space:pre;color:#404040;'> fix universal build
</span><span style='display:block; white-space:pre;color:#404040;'> refresh makefile.osx patch
</span>---
databases/fastdb/Portfile | 23 ++++++++----
.../files/patch-fastdb-apple-is-not-freebsd.diff | 26 ++++++++++++++
...{patch-makefile.osx => patch-makefile-osx.diff} | 42 +++++++++++-----------
3 files changed, 64 insertions(+), 27 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/fastdb/Portfile b/databases/fastdb/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bdef89d..03a7e63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/fastdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/fastdb/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,10 +3,11 @@
</span> PortSystem 1.0
name fastdb
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.67
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.76
</span> categories databases
platforms darwin
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license permissive
</span>
description Main Memory Relational Database Management System
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -16,18 +17,26 @@ homepage http://www.garret.ru/fastdb.html
</span> master_sites http://www.garret.ru/ \
sourceforge:project/${name}/${name}/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 7e6ddf8d1418ed69f2879f0d65199328 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 3802cf54a9aaf2aab8ee502be0661eb0f9a3a48f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 b91190466aadddd24077112804d537385aa740e6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 5382ff0c17692118c4147999f300d50cf972f7096164896529ef61501b166841 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 3287628
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-makefile.osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-makefile-osx.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-fastdb-apple-is-not-freebsd.diff
</span>
worksrcdir ${name}
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args -f makefile.osx \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CC="${configure.cxx} ${configure.cxx_archflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args -f makefile.osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CC="${configure.cxx} {*}${configure.cxxflags} ${configure.cxx_archflags}"
</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;'>+variant universal {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append CC="${configure.cxx} {*}${configure.cxxflags} ${configure.universal_cxxflags}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
destroot.destdir -f makefile.osx \
PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/fastdb/files/patch-fastdb-apple-is-not-freebsd.diff b/databases/fastdb/files/patch-fastdb-apple-is-not-freebsd.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8a3ce14
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/fastdb/files/patch-fastdb-apple-is-not-freebsd.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 inc/stdtp.h inc/stdtp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4789b68..53855ae 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- inc/stdtp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ inc/stdtp.h
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -51,7 +51,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #if defined(__APPLE__) && !defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ // MAC OS X is Free BSD
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#define __FreeBSD__ 5
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++//#define __FreeBSD__ 5
</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;'>+ #ifndef _WINCE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git src/sync.cpp src/sync.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 4ae2a6a..24f2392 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/sync.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/sync.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -340,7 +340,7 @@ bool dbWatchDog::create(char const* name) {
</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;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__FreeBSD__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#if (defined(__GNU_LIBRARY__) && !defined(_SEM_SEMUN_UNDEFINED)) || defined(__FreeBSD__) || defined(__APPLE__)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ /* union semun is defined by including <sys/sem.h> */
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ union semun {
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/fastdb/files/patch-makefile.osx b/databases/fastdb/files/patch-makefile-osx.diff
</span>similarity index 73%
rename from databases/fastdb/files/patch-makefile.osx
rename to databases/fastdb/files/patch-makefile-osx.diff
<span style='display:block; white-space:pre;color:#808080;'>index 5b114f4..ad41d78 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/fastdb/files/patch-makefile.osx
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/fastdb/files/patch-makefile-osx.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,20 +1,22 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- makefile.osx.orig 2009-11-01 08:08:52.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ makefile.osx 2010-09-03 18:50:36.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -163,7 +163,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(FASTDB_SHARED): $(OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(FASTDB_SHARED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) $(SHFLAGS) -o $(FASTDB_SHARED) $(OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -install_name $(PREFIX)/lib/libfastdb_r.2.dylib $(SHFLAGS) -o $(FASTDB_SHARED) $(OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CLI_LIB): $(CLI_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -173,7 +173,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CLI_SHARED): $(CLI_OBJS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rm -f $(CLI_SHARED)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CC) $(SHFLAGS) -o $(CLI_SHARED) $(CLI_OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -install_name $(PREFIX)/lib/libcli_r.2.dylib $(SHFLAGS) -o $(CLI_SHARED) $(CLI_OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -f -s $(CLI_SHARED) libcli$(SUFF).so
</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:#e0ffe0;'>+diff --git makefile.osx makefile.osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 15aeeeb..4300337 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- makefile.osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ makefile.osx
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +163,7 @@ $(FASTDB_LIB): $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(FASTDB_SHARED): $(OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(FASTDB_SHARED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(SHFLAGS) -o $(FASTDB_SHARED) $(OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -install_name $(PREFIX)/lib/libfastdb_r.2.dylib $(SHFLAGS) -o $(FASTDB_SHARED) $(OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -f -s $(FASTDB_SHARED) libfastdb$(SUFF).so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CLI_LIB): $(CLI_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -173,7 +173,7 @@ $(CLI_LIB): $(CLI_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(CLI_SHARED): $(CLI_OBJS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rm -f $(CLI_SHARED)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- $(CC) $(SHFLAGS) -o $(CLI_SHARED) $(CLI_OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -install_name $(PREFIX)/lib/libcli_r.2.dylib $(SHFLAGS) -o $(CLI_SHARED) $(CLI_OBJS) $(THRLIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -f -s $(CLI_SHARED) libcli$(SUFF).so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>