<pre style='margin:0'>
Vadym-Valdis Yudaiev (judaew) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/aa6ac2543f204505113659c0fa371e40c6a27f91">https://github.com/macports/macports-ports/commit/aa6ac2543f204505113659c0fa371e40c6a27f91</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit aa6ac2543f204505113659c0fa371e40c6a27f91
</span>Author: Vadym-Valdis Yudaiev <judaew@macports.org>
AuthorDate: Wed Jun 1 16:42:17 2022 +0300
<span style='display:block; white-space:pre;color:#404040;'> lowdown: Fix wrong lib name and symlink
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Trac:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Fixed https://trac.macports.org/ticket/65268
</span><span style='display:block; white-space:pre;color:#404040;'> Fixed https://trac.macports.org/ticket/65267
</span><span style='display:block; white-space:pre;color:#404040;'> Fixed https://trac.macports.org/ticket/65266
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> GitHub:
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/kristapsdz/lowdown/pull/88
</span><span style='display:block; white-space:pre;color:#404040;'> See https://github.com/kristapsdz/lowdown/pull/91
</span>---
textproc/lowdown/Portfile | 24 +++++++++++-----------
...x-ld.diff => patch-fix-ld-and-symlink-lib.diff} | 13 +++++++-----
2 files changed, 20 insertions(+), 17 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lowdown/Portfile b/textproc/lowdown/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 5d5807b9b32..31233d3b8db 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lowdown/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lowdown/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,7 +8,7 @@ PortGroup legacysupport 1.1
</span> name lowdown
categories textproc
version 1.0.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license BSD
description simple markdown translator
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,19 +24,19 @@ checksums rmd160 72e8ab1f766ee24d95b373ee4249c15b5a28d4fb \
</span>
# Use -install_name instead of -soname because OS X doesn't use the convention
# liblowdown.so.X.Y.Z. Сompile library with -dynamiclib instead -shared option
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# to get shared-library format OS X (.dylib).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-fix-ld.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# to get shared-library format OS X (.dylib). See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://trac.macports.org/ticket/65266
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://github.com/kristapsdz/lowdown/pull/88
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+#
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# Symlink unversioned to the versioned shared library. See:
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://trac.macports.org/ticket/65267
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# - https://github.com/kristapsdz/lowdown/pull/91
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-fix-ld-and-symlink-lib.diff
</span>
configure.universal_args
configure.pre_args PREFIX=${prefix}
configure.args MANDIR=${prefix}/share/man
<span style='display:block; white-space:pre;background:#ffe0e0;'>-build.env DESTDIR=${destroot}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.target install install_lib_common install_shared
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# Symlink unversioned to versioned shared library
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set lib_ver 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s ${prefix}/lib/liblowdown.dylib.${lib_ver} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/liblowdown.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# The install target installs only binaries but does not install the library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# and pkg-config pc file.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destroot.target-append install_lib_common install_shared
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/lowdown/files/patch-fix-ld.diff b/textproc/lowdown/files/patch-fix-ld-and-symlink-lib.diff
</span>similarity index 77%
rename from textproc/lowdown/files/patch-fix-ld.diff
rename to textproc/lowdown/files/patch-fix-ld-and-symlink-lib.diff
<span style='display:block; white-space:pre;color:#808080;'>index 3593ed2e485..4c198919030 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/lowdown/files/patch-fix-ld.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/lowdown/files/patch-fix-ld-and-symlink-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,25 +9,28 @@
</span> bins: lowdown lowdown-diff
valgrind: $(VALGRINDS) $(VALGRINDDIFFS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -182,8 +182,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -182,9 +182,9 @@
</span> liblowdown.a: $(OBJS) $(COMPAT_OBJS)
$(AR) rs $@ $(OBJS) $(COMPAT_OBJS)
-liblowdown.so: $(OBJS) $(COMPAT_OBJS)
- $(CC) -shared -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-soname,$@.$(LIBVER)
<span style='display:block; white-space:pre;background:#e0ffe0;'>+- ln -sf $@.$(LIBVER) $@
</span> +liblowdown.dylib: $(OBJS) $(COMPAT_OBJS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CC) -dynamiclib -o $@.$(LIBVER) $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-install_name,$@.$(LIBVER)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -sf $@.$(LIBVER) $@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CC) -dynamiclib -o liblowdown.$(LIBVER).dylib $(OBJS) $(COMPAT_OBJS) $(LDFLAGS) $(LDADD_MD5) -Wl,-install_name,liblowdown.$(LIBVER).dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -sf liblowdown.$(LIBVER).dylib $@
</span>
install: bins
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -212,8 +212,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ mkdir -p $(DESTDIR)$(BINDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -212,8 +212,9 @@
</span> $(INSTALL_MAN) man/$$name $(DESTDIR)$(MANDIR)/man$$section ; \
done
-install_shared: liblowdown.so install_lib_common
- $(INSTALL_LIB) liblowdown.so.$(LIBVER) $(DESTDIR)$(LIBDIR)
+install_shared: liblowdown.dylib install_lib_common
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(INSTALL_LIB) liblowdown.dylib.$(LIBVER) $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(INSTALL_LIB) liblowdown.$(LIBVER).dylib $(DESTDIR)$(LIBDIR)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ( cd $(DESTDIR)$(LIBDIR) ; ln -sf liblowdown.$(LIBVER).dylib liblowdown.dylib )
</span>
install_static: liblowdown.a install_lib_common
$(INSTALL_LIB) liblowdown.a $(DESTDIR)$(LIBDIR)
</pre><pre style='margin:0'>
</pre>