<pre style='margin:0'>
Renee Otten (reneeotten) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/bf30abc8554a01d717c167fb2b045abbac608a30">https://github.com/macports/macports-ports/commit/bf30abc8554a01d717c167fb2b045abbac608a30</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 bf30abc8554 proxmark3-iceman: update release
</span>bf30abc8554 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit bf30abc8554a01d717c167fb2b045abbac608a30
</span>Author: İlteriş Yağıztegin Eroğlu <ilteris@asenkron.com.tr>
AuthorDate: Tue Sep 21 11:54:00 2021 +0300
<span style='display:block; white-space:pre;color:#404040;'> proxmark3-iceman: update release
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Signed-off-by: İlteriş Yağıztegin Eroğlu <ilteris@asenkron.com.tr>
</span>---
science/proxmark3-iceman/Portfile | 21 +-
.../files/0001-MacPorts-Patch.patch | 34 +++
.../files/0001-Support-MacPorts.patch | 240 ---------------------
3 files changed, 45 insertions(+), 250 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/proxmark3-iceman/Portfile b/science/proxmark3-iceman/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6a2268b6936..44e62ab3b37 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/proxmark3-iceman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/proxmark3-iceman/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -6,11 +6,11 @@ PortGroup qt5 1.0
</span>
name proxmark3-iceman
<span style='display:block; white-space:pre;background:#ffe0e0;'>-github.setup RfidResearchGroup proxmark3 4.13441 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup RfidResearchGroup proxmark3 4.14434 v
</span> github.tarball_from archive
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums sha256 49c4f1854b364aa7ea7083581351f867128e71ea783d0ecd71fc41bcf7f63584 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 8ef2d5205f422466ca9de5fbfdc409dcdf2162db \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 24563979
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums sha256 c92fb48f14d7428b9b06b9a2b966278ae9ada469b80f0eba1cc5bc001df86db6 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ rmd160 d3d07bc130e270f2ff3dc6eb144d2dd18e8be499 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 24816648
</span>
revision 0
license GPL-2
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -36,17 +36,18 @@ depends_build-append \
</span> port:arm-none-eabi-binutils
patch.pre_args -p1
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append 0001-Support-MacPorts.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append 0001-MacPorts-Patch.patch
</span>
use_configure no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LD=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- USE_BREW=0 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+build.env-append USE_BREW=0 \
</span> USE_MACPORTS=1 \
PREFIX=${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- MACPORTS_PREFIX=${prefix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ MACPORTS_PREFIX=${prefix} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CXX=${configure.cxx} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CPP=${configure.cpp} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LD=${configure.cxx}
</span>
variant pm3generic description {Build firmware for PM3GENERIC instead of PM3RDV4} {
build.env-append PLATFORM=PM3GENERIC
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/proxmark3-iceman/files/0001-MacPorts-Patch.patch b/science/proxmark3-iceman/files/0001-MacPorts-Patch.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8cc7463468c
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/proxmark3-iceman/files/0001-MacPorts-Patch.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;'>+From b5a4e4f87d064509b39094cad3f39a370900afec Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ya=C4=9F=C4=B1ztegin=20Ero=C4=9Flu?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ <ilteris@asenkron.com.tr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Date: Tue, 21 Sep 2021 11:39:20 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Subject: [PATCH] MacPorts Patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Signed-off-by: İlteriş Yağıztegin Eroğlu <ilteris@asenkron.com.tr>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ Makefile.defs | 6 +++---
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ 1 file changed, 3 insertions(+), 3 deletions(-)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff --git a/Makefile.defs b/Makefile.defs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+index 68e6f9f0e..aed9c04a2 100644
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- a/Makefile.defs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ b/Makefile.defs
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,9 +21,9 @@ TAR = tar
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARFLAGS ?= -v --ignore-failed-read -r
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARFLAGS += -C .. -f
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CROSS ?= arm-none-eabi-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CC = gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-CXX = g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-LD = g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CC ?= gcc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++CXX ?= g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LD ?= g++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SH = sh
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BASH = bash
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PERL = perl
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+2.30.1 (Apple Git-130)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/proxmark3-iceman/files/0001-Support-MacPorts.patch b/science/proxmark3-iceman/files/0001-Support-MacPorts.patch
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index e434a8236d3..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/proxmark3-iceman/files/0001-Support-MacPorts.patch
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,240 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From 1e82173035bb47ff0690f0fb4f4f3ac2a7d5c41b Mon Sep 17 00:00:00 2001
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-From: =?UTF-8?q?=C4=B0lteri=C5=9F=20Ya=C4=9F=C4=B1ztegin=20Ero=C4=9Flu?=
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- <ilteris@asenkron.com.tr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Date: Sat, 21 Aug 2021 19:35:49 +0300
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Subject: [PATCH] Support MacPorts
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-MIME-Version: 1.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Type: text/plain; charset=UTF-8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Content-Transfer-Encoding: 8bit
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Signed-off-by: İlteriş Yağıztegin Eroğlu <ilteris@asenkron.com.tr>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- Makefile.defs | 18 +++++++++----
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- client/Makefile | 68 +++++++++++++++++++++++++++++++++++--------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- 2 files changed, 62 insertions(+), 24 deletions(-)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/Makefile.defs b/Makefile.defs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index 40fb49b8b..8628e6b4e 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/Makefile.defs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/Makefile.defs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -21,9 +21,9 @@ TAR = tar
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARFLAGS ?= -v --ignore-failed-read -r
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARFLAGS += -C .. -f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CROSS ?= arm-none-eabi-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CC = gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--CXX = g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--LD = g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CC ?= gcc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+CXX ?= g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+LD ?= g++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SH = sh
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- BASH = bash
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PERL = perl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -50,7 +50,8 @@ else
</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;'>- ifeq ($(platform),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- USE_BREW = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ USE_BREW ?= 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ USE_MACPORTS ?= 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- AR= /usr/bin/ar rcs
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- RANLIB= /usr/bin/ranlib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -59,7 +60,14 @@ else
</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;'>- ifeq ($(USE_BREW),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- BREW_PREFIX = $(shell brew --prefix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ BREW_PREFIX = $(shell brew --prefix 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ifneq ($(strip $(BREW_PREFIX)),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ USE_BREW = 0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</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;'>-+ifeq ($(USE_MACPORTS),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ MACPORTS_PREFIX ?= /opt/local
</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;'>- ifeq ($(DEBUG),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-diff --git a/client/Makefile b/client/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-index bf46792ee..308685b27 100644
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- a/client/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ b/client/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,15 @@ ifeq ($(USE_BREW),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(BREW_PREFIX)/opt/qt5/lib/pkgconfig
</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;'>-+ifdef ($(USE_MACPORTS),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ INCLUDES += -I$(MACPORTS_PREFIX)/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LDLIBS += -L$(MACPORTS_PREFIX)/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKG_CONFIG_ENV := PKG_CONFIG_PATH=$(MACPORTS_PREFIX)/lib/pkgconfig
</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;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES =
</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;'>- # local libraries #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ###################
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -101,24 +110,29 @@ MBEDTLSLIBCLIENTRELPATH = ../../client
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not distributed as system library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(AMIIBOLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(AMIIBOLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(AMIIBOLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(AMIIBOLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Cliparser / Argtable3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not distributed as system library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(CLIPARSERLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(CLIPARSERLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(CLIPARSERLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(CLIPARSERLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Hardnested
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not distributed as system library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(HARDNESTEDLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS +=$(HARDNESTEDLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(HARDNESTEDLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(HARDNESTEDLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Lua
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(SKIPLUASYSTEM),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ifdef MACPORTS_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua-5.2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua-5.2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LUAINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags lua5.2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ LUALDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs lua5.2 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(LUALDLIBS),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUALIB =
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUALIBLD = $(LUALDLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -126,9 +140,10 @@ ifneq ($(SKIPLUASYSTEM),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LUA_FOUND = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</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;'>- STATICLIBS += $(LUALIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(LUALIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(LUALIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(LUALIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Jansson
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Jansson section needs to be after Lua to avoid interferences on macOS if a locally incompatible Lua was available, see PR 1155
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -144,25 +159,25 @@ ifneq ($(SKIPJANSSONSYSTEM),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(JANSSONLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(JANSSONLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(JANSSONLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(JANSSONLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## mbed TLS
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # system library cannot be used because it is compiled by default without CMAC support
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(MBEDTLSLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(MBEDTLSLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(MBEDTLSLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(MBEDTLSLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Reveng
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not distributed as system library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(REVENGLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(REVENGLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(REVENGLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(REVENGLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Tinycbor
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # not distributed as system library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(TINYCBORLIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(TINYCBORLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(TINYCBORLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(TINYCBORLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Whereami
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(SKIPWHEREAMISYSTEM),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -175,7 +190,7 @@ ifneq ($(SKIPWHEREAMISYSTEM),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- STATICLIBS += $(WHEREAMILIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(WHEREAMILIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(WHEREAMILIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(WHEREAMILIBINC)
</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;'>- # system libraries #
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -203,7 +218,7 @@ ifneq ($(SKIPBT),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(BTLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(BTLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(BTLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Math
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += -lm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -216,16 +231,26 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## Python3 (optional)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(SKIPPYTHON),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ifdef MACPORTS_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python-3.9 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python-3.9 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(PYTHONLDLIBS),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONLIBLD = $(PYTHONLDLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONLIBINC = $(PYTHONINCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHON_FOUND = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # since python3.8, applications willing to embed python must use -embed:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ifdef MACPORTS_PREFIX
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python-3.9-embed 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python-3.9-embed 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONINCLUDES = $(shell $(PKG_CONFIG_ENV) pkg-config --cflags python3-embed 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PYTHONLDLIBS = $(shell $(PKG_CONFIG_ENV) pkg-config --libs python3-embed 2>/dev/null)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(PYTHONLDLIBS),)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONLIBLD = $(PYTHONLDLIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PYTHONLIBINC = $(PYTHONINCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,7 +259,7 @@ ifneq ($(SKIPPYTHON),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += $(PYTHONLIBLD)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--INCLUDES += $(PYTHONLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3INCLUDES += $(PYTHONLIBINC)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## QT5 (or QT4 fallback) (optional)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(SKIPQT),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -280,8 +305,13 @@ CXXINCLUDES += $(QTINCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(SKIPREADLINE),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(USE_BREW),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LDLIBS += -L$(BREW_PREFIX)/opt/readline/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PM3INCLUDES += -I$(BREW_PREFIX)/opt/readline/include
</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;'>-+ ifeq ($(USE_MACPORTS),1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PM3INCLUDES += -I$(MACPORTS_PREFIX)/include/readline
</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;'>- LDLIBS += -lreadline
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- READLINE_FOUND = 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -303,7 +333,7 @@ endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CFLAGS ?= $(DEFCFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # We cannot just use CFLAGS+=... because it has impact on sub-makes if CFLAGS is defined in env:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- PM3CFLAGS = $(CFLAGS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PM3CFLAGS += -I./src -I./include -I../include -I../common -I../common_fpga $(INCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+PM3CFLAGS += -I./src -I./include -I../include -I../common -I../common_fpga $(PM3INCLUDES) $(INCLUDES)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # WIP Testing
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #PM3CFLAGS += -std=c11 -pedantic
</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;'>-2.30.1 (Apple Git-130)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>