<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/3525986373dedc00f15995a370b93f1db5c2c733">https://github.com/macports/macports-ports/commit/3525986373dedc00f15995a370b93f1db5c2c733</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 3525986 libgsm: fix incorrect id on some systems
</span>3525986 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 3525986373dedc00f15995a370b93f1db5c2c733
</span>Author: ken-cunningham-webuse <ken.cunningham.webuse@gmail.com>
AuthorDate: Sat Apr 13 09:29:35 2019 -0700
<span style='display:block; white-space:pre;color:#404040;'> libgsm: fix incorrect id on some systems
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> using install_name_tool -change to change the library ID name did not work on newer systems
</span><span style='display:block; white-space:pre;color:#404040;'> use install_name_tool -id instead to change it.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Added support for the Makefile library version to reflect the source version
</span><span style='display:block; white-space:pre;color:#404040;'> this will be done dynamically now using ${version} and reinplace
</span><span style='display:block; white-space:pre;color:#404040;'> will make updating in the future simpler and less error-prone
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> bump revision to pass these changes through
</span><span style='display:block; white-space:pre;color:#404040;'> no dependents as yet so no need to bump any
</span>---
audio/libgsm/Portfile | 17 +++++++++++------
audio/libgsm/files/patch-makefile.diff | 8 ++++----
2 files changed, 15 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libgsm/Portfile b/audio/libgsm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 016adc2..920cfa1 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libgsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libgsm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name libgsm
version 1.0.18
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license public-domain
categories audio
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -14,7 +15,7 @@ long_description ${description}
</span> homepage http://www.quut.com/gsm
platforms darwin
distname gsm-${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites http://www.quut.com/gsm/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites ${homepage}
</span> checksums rmd160 e268a667257aa42d5ddbb76c9a8b519f0a7cdb2d \
sha256 04f68087c3348bf156b78d59f4d8aff545da7f6e14f33be8f47d33f4efae2a10 \
size 64549
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -25,6 +26,10 @@ use_configure no
</span> patch.pre_args -p1
patchfiles patch-makefile.diff patch-makefile-more.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@@VERSION@@|${version}|g" ${worksrcpath}/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> variant universal {}
use_parallel_build no
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,18 +42,18 @@ build.args CC="${configure.cc} [get_canonical_archflags cc]"
</span> destroot.env INSTALL_ROOT=${destroot}${prefix}
post-destroot {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- move ${worksrcpath}/lib/libgsm.1.0.13.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ move ${worksrcpath}/lib/libgsm.${version}.dylib ${destroot}${prefix}/lib
</span> move ${worksrcpath}/lib/libgsm.1.dylib ${destroot}${prefix}/lib
move ${worksrcpath}/lib/libgsm.dylib ${destroot}${prefix}/lib
system -W ${destroot}${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change ./lib/libgsm.1.0.13.dylib ${prefix}/lib/libgsm.1.0.13.dylib ./lib/libgsm.1.0.13.dylib"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -id ${prefix}/lib/libgsm.${version}.dylib ./lib/libgsm.${version}.dylib"
</span> system -W ${destroot}${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change ./lib/libgsm.1.0.13.dylib ${prefix}/lib/libgsm.1.0.13.dylib ./bin/tcat"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change ./lib/libgsm.${version}.dylib ${prefix}/lib/libgsm.${version}.dylib ./bin/tcat"
</span> system -W ${destroot}${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change ./lib/libgsm.1.0.13.dylib ${prefix}/lib/libgsm.1.0.13.dylib ./bin/toast"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change ./lib/libgsm.${version}.dylib ${prefix}/lib/libgsm.${version}.dylib ./bin/toast"
</span> system -W ${destroot}${prefix} \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- "install_name_tool -change ./lib/libgsm.1.0.13.dylib ${prefix}/lib/libgsm.1.0.13.dylib ./bin/untoast"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ "install_name_tool -change ./lib/libgsm.${version}.dylib ${prefix}/lib/libgsm.${version}.dylib ./bin/untoast"
</span>
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/audio/libgsm/files/patch-makefile.diff b/audio/libgsm/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 1e2bea3..b644d2f 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/audio/libgsm/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/audio/libgsm/files/patch-makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,7 +17,7 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
</span> # Targets
LIBGSM = $(LIB)/libgsm.a
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+LIBGSMSO= $(LIB)/libgsm.1.0.13.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++LIBGSMSO= $(LIB)/libgsm.@@VERSION@@.dylib
</span>
TOAST = $(BIN)/toast
UNTOAST = $(BIN)/untoast
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -35,9 +35,9 @@ diff -urNad libgsm-1.0.12~/Makefile libgsm-1.0.12/Makefile
</span> # The basic API: libgsm
+$(LIBGSMSO): $(LIB) $(GSM_OBJECTS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(LD) -o $(LIBGSMSO) -dynamiclib -Wl,-compatibility_version,1,-current_version,1.0.13,-install_name,$(LIBGSMSO) $(GSM_OBJECTS) -lc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs libgsm.1.0.13.dylib lib/libgsm.1.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs libgsm.1.0.13.dylib lib/libgsm.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(LD) -o $(LIBGSMSO) -dynamiclib -Wl,-compatibility_version,1,-current_version,@@VERSION@@,-install_name,$(LIBGSMSO) $(GSM_OBJECTS) -lc
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -fs libgsm.@@VERSION@@.dylib lib/libgsm.1.dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ln -fs libgsm.@@VERSION@@.dylib lib/libgsm.dylib
</span> +
$(LIBGSM): $(LIB) $(GSM_OBJECTS)
-rm $(RMFLAGS) $(LIBGSM)
</pre><pre style='margin:0'>
</pre>