<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/ca055c4112c0f24e0a5033140f6fe81a6276de74">https://github.com/macports/macports-ports/commit/ca055c4112c0f24e0a5033140f6fe81a6276de74</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit ca055c4112c0f24e0a5033140f6fe81a6276de74
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Thu Dec 3 17:50:15 2020 -0600
<span style='display:block; white-space:pre;color:#404040;'> argon2: No @rpath or -march=native; add manpage
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Disable the use of @rpath because it is unusual and unnecessary and can
</span><span style='display:block; white-space:pre;color:#404040;'> cause other programs to fail to find the library.
</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/61735
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Don't use -march=native because we want to build binaries that work on
</span><span style='display:block; white-space:pre;color:#404040;'> any processor, not just the processor of the build machine.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Install the manpage.
</span>---
devel/argon2/Portfile | 12 +++++--
devel/argon2/files/install-manpage.patch | 59 ++++++++++++++++++++++++++++++++
devel/argon2/files/no-rpath.patch | 13 +++++++
3 files changed, 82 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/argon2/Portfile b/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 946c292842c..e324c221d63 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/argon2/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@ PortSystem 1.0
</span> PortGroup github 1.0
github.setup P-H-C phc-winner-argon2 20190702
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> name argon2
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,18 +22,26 @@ checksums rmd160 05b78cfa2309a25b6fed447236f1f37f92732cee \
</span> sha256 3fa0b89e4db51141a071fae29387b08c23dc97813be04c2e15dcc1a9f6db2c00 \
size 1505325
<span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles install-manpage.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ no-rpath.patch
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> use_configure no
variant universal {}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+build.args-append OPTTEST=1
</span> build.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PREFIX=${prefix}
</span> destroot.destdir PREFIX=${destroot}${prefix}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.args-append \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTTEST=1
</span> destroot.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
test.run yes
<span style='display:block; white-space:pre;background:#e0ffe0;'>+test.args-append OPTTEST=1
</span> test.env-append CC=${configure.cc} \
"CFLAGS=${configure.cflags} [get_canonical_archflags cc]" \
"LDFLAGS=${configure.ldflags} [get_canonical_archflags ld]"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/argon2/files/install-manpage.patch b/devel/argon2/files/install-manpage.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..67743384352
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/argon2/files/install-manpage.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,59 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Install manpage.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/P-H-C/phc-winner-argon2/pull/273
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -19,6 +19,7 @@ RUN = argon2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BENCH = bench
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GENKAT = genkat
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ARGON2_VERSION ?= ZERO
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MAN = man/argon2.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # installation parameters for staging area and final installation path
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Note; if Linux and not Debian/Ubuntu version also add lib override to make command-line
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -136,6 +137,7 @@ ifeq ($(KERNEL_NAME), $(filter $(KERNEL_NAME),DragonFly FreeBSD))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BINARY_REL ?= bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_REL ?= include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_REL ?= lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MAN_REL ?= share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKGCONFIG_REL ?= libdata
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else ifeq ($(KERNEL_NAME)-$(MACHINE_NAME), Linux-x86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -144,6 +146,7 @@ else ifeq ($(KERNEL_NAME)-$(MACHINE_NAME), Linux-x86_64)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BINARY_REL ?= bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_REL ?= include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_REL ?= lib/x86_64-linux-gnu
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MAN_REL ?= share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKGCONFIG_REL ?= $(LIBRARY_REL)
</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;'>+@@ -152,6 +155,7 @@ else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ BINARY_REL ?= bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INCLUDE_REL ?= include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIBRARY_REL ?= lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++MAN_REL ?= share/man/man1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PKGCONFIG_REL ?= $(LIBRARY_REL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -160,6 +164,7 @@ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INST_INCLUDE = $(DESTDIR)$(PREFIX)/$(INCLUDE_REL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INST_LIBRARY = $(DESTDIR)$(PREFIX)/$(LIBRARY_REL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INST_BINARY = $(DESTDIR)$(PREFIX)/$(BINARY_REL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++INST_MAN = $(DESTDIR)$(PREFIX)/$(MAN_REL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ INST_PKGCONFIG = $(DESTDIR)$(PREFIX)/$(PKGCONFIG_REL)/pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # main target
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -242,6 +247,8 @@ ifdef LINKED_LIB_SH
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d $(INST_BINARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) $(RUN) $(INST_BINARY)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -d $(INST_MAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL) -m 0644 $(MAN) $(INST_MAN)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -d $(INST_PKGCONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ $(INSTALL) -m 0644 $(PC_NAME) $(INST_PKGCONFIG)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -250,4 +257,5 @@ uninstall:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(INST_INCLUDE) && rm -f $(notdir $(HEADERS))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(INST_LIBRARY) && rm -f $(notdir $(LIBRARIES) $(LINKED_LIB_SH))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(INST_BINARY) && rm -f $(notdir $(RUN))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ cd $(INST_MAN) && rm -f $(notdir $(MAN))
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cd $(INST_PKG_CONFIG) && rm -f $(notdir $(PC_NAME))
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/argon2/files/no-rpath.patch b/devel/argon2/files/no-rpath.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..3fc88652ce5
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/argon2/files/no-rpath.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't use @rpath.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/P-H-C/phc-winner-argon2/pull/309
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- Makefile.orig 2019-05-20 04:18:00.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ Makefile 2020-12-03 14:31:31.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -83,7 +83,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ifeq ($(KERNEL_NAME), Darwin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LIB_EXT := $(ABI_VERSION).dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- LIB_CFLAGS := -dynamiclib -install_name @rpath/lib$(LIB_NAME).$(LIB_EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ LIB_CFLAGS = -dynamiclib -install_name $(PREFIX)/$(LIBRARY_REL)/lib$(LIB_NAME).$(LIB_EXT)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LINKED_LIB_EXT := dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PC_EXTRA_LIBS ?=
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif
</span></pre><pre style='margin:0'>
</pre>