<pre style='margin:0'>
Andrea D'Amore (anddam) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0452915358379e90187caf1efdf3aaf94a36f1fa">https://github.com/macports/macports-ports/commit/0452915358379e90187caf1efdf3aaf94a36f1fa</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 0452915358379e90187caf1efdf3aaf94a36f1fa
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Tue Dec 20 12:23:55 2016 -0700
<span style='display:block; white-space:pre;color:#404040;'> libQGLViewer: allow universal build
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> No revbump since port either builds correctly or not at all.
</span>---
graphics/libQGLViewer/Portfile | 38 ++++++++++++++++++++++++++++----------
1 file changed, 28 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/libQGLViewer/Portfile b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3ecc51b..45a48ee 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/libQGLViewer/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
if {[variant_isset qt5]} {
PortGroup qmake5 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup muniversal 1.0
</span> } else {
PortGroup qmake 1.0
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -70,16 +71,33 @@ if {[variant_isset qt4]} {
</span>
use_parallel_build no
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- system -W ${worksrcpath}/examples "make clean"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- copy ${worksrcpath}/examples ${destroot}${applications_dir}/libQGLViewer\ Examples
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CHANGELOG \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- GPL_EXCEPTION \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- LICENCE \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- README \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {![variant_isset universal] || ![variant_isset qt5]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}/examples "make clean"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}/examples ${destroot}${applications_dir}/libQGLViewer\ Examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGELOG \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GPL_EXCEPTION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LICENCE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}${prefix}/share/doc/${name}
</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;'>+ merger-post-destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach arch ${universal_archs_supported} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system -W ${worksrcpath}-${arch}/examples "make clean"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ copy ${worksrcpath}-${arch}/examples ${destroot}-${arch}${applications_dir}/libQGLViewer\ Examples
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 755 -d ${destroot}-${arch}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 644 -W ${worksrcpath}-${arch} \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ CHANGELOG \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ GPL_EXCEPTION \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ LICENCE \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ README \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${destroot}-${arch}${prefix}/share/doc/${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span> }
variant qt4 description {build with Qt 4} conflicts qt5 {}
</pre><pre style='margin:0'>
</pre>