<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/0dbc801d5149815842d71e730f16ab3634ce4061">https://github.com/macports/macports-ports/commit/0dbc801d5149815842d71e730f16ab3634ce4061</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 0dbc801d514 gmic: add gmic-lib subport
</span>0dbc801d514 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 0dbc801d5149815842d71e730f16ab3634ce4061
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Thu May 5 16:40:53 2022 -0500
<span style='display:block; white-space:pre;color:#404040;'> gmic: add gmic-lib subport
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> See: https://trac.macports.org/ticket/65123
</span>---
science/gmic/Portfile | 62 +++++++++++++++++++++++++++++++++++++++++++--------
1 file changed, 53 insertions(+), 9 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/Portfile b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 6fe3c15204a..bfce867ca82 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -11,11 +11,13 @@ if {${subport} eq "gmic-gimp" || ${subport} eq "gmic-qt"} {
</span> PortGroup active_variants 1.1
} else {
PortGroup makefile 1.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patchfiles patch-src-Makefile.diff
</span> }
name gmic
version 3.1.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 CeCILL
categories science graphics
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -77,22 +79,23 @@ subport ${name}-gimp {
</span>
subport ${name}-clib {
description-append (C library).
<span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-lib {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (C++ library).
</span> }
if {${subport} eq ${name}} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- description-append (C++ library and stand-alone binary).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (Stand-alone binary).
</span>
depends_build-append port:pkgconfig
<span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> build.dir ${worksrcpath}/src
build.target cli
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patchfiles patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> variant opencv4 description {compile with OpenCV support} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> depends_lib-append path:lib/opencv4/libopencv_core.dylib:opencv4
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -167,7 +170,49 @@ if {${subport} eq ${name}} {
</span> xinstall -m 0644 ${worksrcpath}/src/libcgmic.a ${destroot}${prefix}/lib
xinstall -m 0755 ${worksrcpath}/src/libcgmic.${soversion}.dylib ${destroot}${prefix}/lib
ln -s libcgmic.${soversion}.dylib ${destroot}${prefix}/lib/libcgmic.dylib
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ln -s libcgmic.${soversion}.dylib ${destroot}${prefix}/lib/libgmic.dylib
</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;'>+ livecheck.type none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "${name}-lib"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set soversion 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_build-append port:pkgconfig
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.target lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makefile.override-append PREFIX
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ makefile.prefix_name USR
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # parallel build fails
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ use_parallel_build no
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ variant x11 {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:xorg-libX11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ default_variants-append +x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ pre-build {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see ${worksrcpath}/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset x11]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_cflags "-Dcimg_display=1 [exec ${prefix}/bin/pkg-config --cflags x11]"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_libs "[exec ${prefix}/bin/pkg-config --libs x11] -lpthread"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_cflags "-Dcimg_display=0"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set x11_libs "-lpthread"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append X11_CFLAGS="${x11_cflags}" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ X11_LIBS="${x11_libs}"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ build.args-append NO_STDLIB=Yes \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPT_CFLAGS="" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOVERSION=${soversion}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ destroot {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/src/gmic.h ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/src/libgmic.a ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/src/libgmic.${soversion}.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libgmic.${soversion}.dylib ${destroot}${prefix}/lib/libgmic.dylib
</span> }
livecheck.type none
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -189,8 +234,7 @@ if {${subport} eq ${name}} {
</span>
qt5.depends_build_component qttools
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:${name} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- port:${name}-clib \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:${name}-lib \
</span> port:xorg-libX11 \
port:xorg-libXext \
port:xorg-libice \
</pre><pre style='margin:0'>
</pre>