<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/7e6b2245cb69a652033076907c4d40f5f84a557f">https://github.com/macports/macports-ports/commit/7e6b2245cb69a652033076907c4d40f5f84a557f</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 7e6b224 mpgtx: Use CXXFLAGS when compiling C++ code
</span>7e6b224 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 7e6b2245cb69a652033076907c4d40f5f84a557f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Tue Nov 26 00:07:57 2019 -0600
<span style='display:block; white-space:pre;color:#404040;'> mpgtx: Use CXXFLAGS when compiling C++ code
</span>---
multimedia/mpgtx/Portfile | 23 +++++++++++------------
multimedia/mpgtx/files/patch-configure.diff | 29 +++++++++++++++++++++++++++--
2 files changed, 38 insertions(+), 14 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpgtx/Portfile b/multimedia/mpgtx/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 25bbdf9..3112d20 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpgtx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpgtx/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,11 @@ PortSystem 1.0
</span>
name mpgtx
version 1.3.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 f39704aef3e2b325d77f48817ecb883ea6a2a029 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 8815e73e98b862f12ba1ef5eaaf49407cf211c1f668c5ee325bf04af27f8e377 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 89170
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories multimedia
license GPL-2
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,24 +29,17 @@ long_description The MPEG ToolboX can currently split and join MPEG-1 \
</span> homepage http://mpgtx.sourceforge.net/
master_sites sourceforge:project/mpgtx/mpgtx/${version}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums md5 d628060aa04ad3b40a175bf35f5167cf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha1 58b3d18b6dac968e8dd969a7b33c8a8fc31569cd \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- rmd160 f39704aef3e2b325d77f48817ecb883ea6a2a029
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> patchfiles patch-configure.diff
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- if {[variant_isset universal]} {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archflags ${configure.universal_cflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- } else {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set archflags ${configure.cc_archflags}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span> reinplace "s|@CXX@|${configure.cxx}|g" ${worksrcpath}/configure
reinplace "s|@OPTFLAGS@|${configure.optflags}|g" ${worksrcpath}/configure
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@CFLAGS@|${configure.cflags} ${archflags}|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|@LDFLAGS@|${configure.ldflags} ${archflags}|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@CXXFLAGS@|${configure.cxxflags} [get_canonical_archflags cxx]|g" ${worksrcpath}/configure
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@LDFLAGS@|${configure.ldflags} [get_canonical_archflags ld]|g" ${worksrcpath}/configure
</span> }
<span style='display:block; white-space:pre;background:#e0ffe0;'>+configure.cxxflags-delete {*}${configure.optflags}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> configure.pre_args --prefix=${destroot}${prefix}
configure.args --parachute \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -53,10 +51,11 @@ build.target
</span>
post-destroot {
xinstall -d ${destroot}${prefix}/share/doc/${name}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} AUTHORS README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 -W ${worksrcpath} AUTHORS README \
</span> ${destroot}${prefix}/share/doc/${name}
}
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> platform darwin {
patchfiles-append patch-bsd.diff
}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/multimedia/mpgtx/files/patch-configure.diff b/multimedia/mpgtx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 6ade53d..73667e2 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/multimedia/mpgtx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/multimedia/mpgtx/files/patch-configure.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,5 +1,5 @@
</span> --- configure.orig 2005-01-02 15:19:23.000000000 -0600
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ configure 2011-02-09 15:34:24.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure 2019-11-25 22:55:28.000000000 -0600
</span> @@ -9,17 +9,17 @@
prefix="/usr/local"
manprefix='$(PREFIX)'
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@
</span> -CC="g++"
-common_cflags="-Wall"
+CC="@CXX@"
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+common_cflags="-Wall @CFLAGS@"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++common_cflags="-Wall @CXXFLAGS@"
</span> devel_cflags="-g -Werror -fno-builtin"
-optimization_cflags="-O3"
+optimization_cflags="@OPTFLAGS@"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,3 +22,28 @@
</span>
#state vars
debug="no"
<span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -142,23 +142,10 @@
</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;'>+-# test if compiler is gcc version 3.0 or 3.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# if so change optimization flags to -O2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-# they do not seem to like -O3 with mpgtx very much
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gcc_major=`gcc --version 2>&1 | head -n1 | sed 's/^[^0-9]*//' | cut -d. -f1`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-gcc_minor=`gcc --version 2>&1 | head -n1 | sed 's/^[^0-9]*//' | cut -d. -f2`
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if test "$gcc_major" = "3"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if test "$gcc_minor" = "0" -o "$gcc_minor" = "1"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- optimization_cflags="-O2";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-fi
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Now check if the system handles large file support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # unless user has specified not to do so
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if test $LFS = "yes"; then
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- echo -n "Checking Large File Support ... ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ printf "Checking Large File Support ... ";
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cat << EOF >__LFStest.cpp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #include <stdio.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ int main(){
</span></pre><pre style='margin:0'>
</pre>