<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/4741bb1e3ba33f3526b4186bc8a8bf94305a39ea">https://github.com/macports/macports-ports/commit/4741bb1e3ba33f3526b4186bc8a8bf94305a39ea</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 4741bb1e3ba33f3526b4186bc8a8bf94305a39ea
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Apr 17 07:23:27 2020 -0700
<span style='display:block; white-space:pre;color:#404040;'> gmic: build with CMake and split into subports
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Most other package managers use CMake to build G'MIC.
</span><span style='display:block; white-space:pre;color:#404040;'> MacPorts settings are fully respected.
</span><span style='display:block; white-space:pre;color:#404040;'> However, this necessitates breaking up port into subports.
</span>---
graphics/gimp/Portfile | 3 +-
science/gmic/Portfile | 148 ++++++++++++++++-----
science/gmic/files/patch-CMakeLists.txt.diff | 56 ++++++++
science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff | 13 --
science/gmic/files/patch-src-Makefile.diff | 152 +---------------------
5 files changed, 177 insertions(+), 195 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/gimp/Portfile b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1943f25..5c7aa32 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/gimp/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,6 +4,7 @@ PortSystem 1.0
</span>
name gimp
version 2.10.18
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 1
</span> license none
set branch [join [lrange [split ${version} .] 0 1] .]
categories graphics
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -41,7 +42,7 @@ destroot {
</span> # gmic requires X11
variant gmic conflicts quartz description "Include GREYC's Magic Image Converter (G'MIC)." {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- depends_lib-append port:gmic
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gmic-gimp
</span> }
variant animation description "Include the GIMP Animation Package (gimp-gap)." {
<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 c1ace8a..ef0ab8a 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;'>@@ -1,18 +1,25 @@
</span> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
PortSystem 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq "gmic-clib"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup makefile 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup cmake 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} ne "gmic" && ${subport} ne "gmic-clib"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup qt5 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ PortGroup active_variants 1.1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span>
name gmic
version 2.9.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
platforms darwin
maintainers {mps @Schamschula} openmaintainer
<span style='display:block; white-space:pre;background:#ffe0e0;'>-description G'MIC is an interpreter of image processing macros \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- (stand-alone binary and GIMP plug-in).
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+description G'MIC is an interpreter of image processing macros
</span>
long_description G'MIC stands for GREYC's Magic Image Converter. It is \
focused on the design of possibly complex pipelines for \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -37,7 +44,6 @@ checksums rmd160 f5e250c3043f811c76a74d60513a979ed09679b0 \
</span> depends_lib port:curl \
path:lib/libavcodec.dylib:ffmpeg \
port:fftw-3 \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:gimp2 \
</span> port:GraphicsMagick \
port:ilmbase \
port:jpeg \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -45,45 +51,119 @@ depends_lib port:curl \
</span> port:opencv \
port:openexr \
port:tiff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- port:xorg-libXext \
</span> port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-gmic-qt-gmic_qt.pro.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-CMakeLists.txt.diff \
</span> patch-src-Makefile.diff \
patch-src-gmic.cpp.diff
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-configure {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%PREFIX%|${prefix}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/Makefile
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #cli lib gimp krita gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set gmic_targets {cli lib gimp libc}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s|%TARGETS%|${gmic_targets}|" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/src/Makefile
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-qt {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DGMIC_QT_HOST=none
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (GUI application)
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-post-destroot {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/src/libgmic.a ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0644 ${worksrcpath}/src/libcgmic.a ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- xinstall -m 0755 ${worksrcpath}/gmic-qt/gmic_gimp_qt.app/Contents/MacOS/gmic_gimp_qt \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ${destroot}${prefix}/lib/gimp/2.0/plug-ins
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-gimp {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DGMIC_QT_HOST=gimp
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ depends_lib-append port:gimp2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (GIMP plug-in).
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-use_configure no
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-variant universal {}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.dir ${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-build.args-append CC=${configure.cc} \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- CXX=${configure.cxx}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#see https://trac.macports.org/ticket/59677
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-#see https://trac.macports.org/ticket/58779
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-if { !${use_xcode} && ![file exists ${configure.developer_dir}/SDKs] } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- use_xcode yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+subport ${name}-clib {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (C library).
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url https://gmic.eu/files/source/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}_(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+if {${subport} eq ${name}} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ description-append (C++ library and stand-alone binary).
</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;'>+ # CMakeLists.txt assumes variables CMAKE_CXX_FLAGS_${cmake.build_type}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (CMAKE_CXX_FLAGS_DEBUG and CMAKE_CXX_FLAGS_RELEASE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Release
</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;'>+ configure.args-append -DCUSTOM_CFLAGS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_OPENMP=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_X=OFF
</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;'>+ configure.args-replace -DENABLE_X=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_X=ON
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm
</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;'>+ livecheck.url https://gmic.eu/files/source/
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ livecheck.regex ${name}_(\[0-9.\]+)${extract.suffix}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+} elseif {${subport} eq "${name}-clib"} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see SOVERSION in ${worksrcpath}/CMakeLists.txt
</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 libc
</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;'>+ 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_libc.h ${destroot}${prefix}/include
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0644 ${worksrcpath}/src/libcgmic.a ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ xinstall -m 0755 ${worksrcpath}/src/libcgmic.${soversion}.dylib ${destroot}${prefix}/lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ln -s libcgmic.${soversion}.dylib ${destroot}${prefix}/lib/libcgmic.dylib
</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;'>+ # CMakeLists.txt assumes variables CMAKE_CXX_FLAGS_${cmake.build_type}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # (CMAKE_CXX_FLAGS_DEBUG and CMAKE_CXX_FLAGS_RELEASE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if {[variant_isset debug]} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Debug
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ } else {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.build_type Release
</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;'>+ depends_lib-append port:${name}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ require_active_variants ${name} x11
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ cmake.source_dir ${worksrcpath}/gmic-qt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ configure.args-append -DENABLE_DYNAMIC_LINKING=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DENABLE_LTO=OFF \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DGMIC_PATH=${worksrcpath}/src
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ qt5.depends_build_component qttools
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</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;'>+ port:xorg-libXext \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libice \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ port:xorg-libsm
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-CMakeLists.txt.diff b/science/gmic/files/patch-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..8e020d0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,56 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2020-03-28 06:25:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2020-04-16 20:48:20.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -107,7 +107,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(COMPILE_FLAGS "-Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_abort")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ else()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra -fpermissive")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -121,10 +121,10 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # OpenMP support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(ENABLE_OPENMP)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #if(NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(COMPILE_FLAGS "${COMPILE_FLAGS} -fopenmp -Dcimg_use_openmp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- list(APPEND EXTRA_LIBRARIES "-lgomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #list(APPEND EXTRA_LIBRARIES "-lgomp")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Zlib support
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- gmic-qt/CMakeLists.txt.orig 2020-03-28 06:25:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ gmic-qt/CMakeLists.txt 2020-04-16 20:50:47.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -239,11 +239,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-Dcimg_use_abort)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-Dcimg_appname=\"gmic\")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-if (UNIX AND NOT APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++if (UNIX)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-Dcimg_display=1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions(-D_IS_LINUX_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #add_definitions(-D_IS_LINUX_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-Dcimg_use_vt100)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions(-D_IS_UNIX_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #add_definitions(-D_IS_UNIX_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ find_package(X11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(gmic_qt_LIBRARIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${gmic_qt_LIBRARIES}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -253,11 +253,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions(-Dcimg_display=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ #add_definitions(-Dcimg_display=0)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ add_definitions(-D_IS_MACOS_)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(CMAKE_MACOSX_RPATH 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ set(BUILD_WITH_INSTALL_RPATH 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- add_definitions(-mmacosx-version-min=10.9 -Wno-macro-redefined -Wno-deprecated-register)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ add_definitions(-Wno-macro-redefined -Wno-deprecated-register)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ endif()
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if (WIN32)
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff b/science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index ad06cb5..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-gmic-qt-gmic_qt.pro.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,13 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- gmic-qt/gmic_qt.pro.orig 2018-06-21 03:21:03.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ gmic-qt/gmic_qt.pro 2018-06-21 08:25:19.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -148,6 +148,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message( Linux platform )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+macx {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ PKGCONFIG += x11
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- equals( HOST, "gimp") {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- TARGET = gmic_gimp_qt
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SOURCES += src/Host/Gimp/host_gimp.cpp
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/science/gmic/files/patch-src-Makefile.diff b/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index 52ffc47..77dc547 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/science/gmic/files/patch-src-Makefile.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,107 +1,11 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/Makefile.orig 2020-03-28 08:25:12.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/Makefile 2020-03-29 07:24:42.000000000 -0500
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -119,13 +119,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq (,$(wildcard /opt/local))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--USR = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--PLUGINDIR = $(HOME)/Library/Application\ Support/Gimp/plug-ins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--USR = /opt/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--WGET = curl -k -L --silent -o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifeq (,$(wildcard /opt/local))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#USR = /usr/local
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#PLUGINDIR = $(HOME)/Library/Application\ Support/Gimp/plug-ins
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+USR = %PREFIX%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+WGET = /usr/bin/false
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Windows)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -151,7 +151,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifndef QMAKE
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--QMAKE = qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+QMAKE = %PREFIX%/libexec/qt5/bin/qmake
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #--------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -181,24 +181,24 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Unix)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANDATORY_CFLAGS += -Dcimg_use_vt100
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifndef NO_STDLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifndef NO_STDLIB
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANDATORY_CFLAGS += -stdlib=libc++
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Windows)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MANDATORY_LIBS += -Wl,--stack,16777216
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable optimizations for 'cli'.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_CLI_CFLAGS = -Ofast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifdef IS_GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_CLI_CFLAGS = -Ofast -mtune=generic -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_CLI_LIBS = -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifdef icpc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--OPT_CLI_CFLAGS = -fast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# OPT_CLI_CFLAGS = -Ofast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef IS_GCC
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# OPT_CLI_CFLAGS = -Ofast -mtune=generic -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# OPT_CLI_LIBS = -flto
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# ifdef icpc
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# OPT_CLI_CFLAGS = -fast
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+# endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable optimizations for other targets.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPT_CFLAGS = -O2
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -234,8 +234,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Enable image display, using X11 (Unix).
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # (Keep /usr/ dirname here since X11 is located in /usr/ on Mac too)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifneq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I/usr/X11R6/include) #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--X11_LIBS = $(shell pkg-config --libs x11 || echo -L/usr/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+X11_CFLAGS = -Dcimg_display=1 $(shell pkg-config --cflags x11 || echo -I%PREFIX%/X11R6/include) #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+X11_LIBS = $(shell pkg-config --libs x11 || echo -L%PREFIX%/X11R6/lib -lX11) -lpthread # $(shell pkg-config --libs xrandr || echo -lXrandr)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq (,$(wildcard /usr/X11))
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- X11_CFLAGS = -Dcimg_display=0 #-Dcimg_use_xrandr
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -336,7 +336,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @echo "**"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(MAKE) cli lib gimp krita gmic_qt libc zart
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(MAKE) %TARGETS%
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- native:
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(MAKE) "CFLAGS+=$(GMIC_CLI_CFLAGS) -Ofast -march=native" "LIBS+=$(GMIC_CLI_LIBS)" cli
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -410,7 +410,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _lib: libgmic.o use_libgmic.cpp
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ar rcs libgmic.a libgmic.o
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ifeq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- $(CXX) -shared -std=c++11 -pedantic -o libgmic.so libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) -dynamiclib -o libgmic.$(SVERSION).dylib -install_name $(USR)/lib/libgmic.$(VERSION1).dylib -compatibility_version $(VERSION1) -current_version $(SVERSION) $(MANDATORY_CFLAGS) libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -shared -std=c++11 -pedantic -Wl,-soname,libgmic.so.$(VERSION1) -o libgmic.so libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- $(CXX) -o use_libgmic use_libgmic.cpp -std=c++11 -pedantic -L. -lgmic $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/Makefile.orig 2020-03-28 06:25:12.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/Makefile 2020-04-10 06:02:16.000000000 -0700
</span> @@ -442,7 +442,7 @@
_libc: libcgmic_files libgmic.o libcgmic.o
ar rcs libcgmic.a libcgmic.o
ifeq ($(OS),Darwin)
- $(CXX) -shared -o libcgmic.so libcgmic.o libgmic.o $(LIBS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ $(CXX) -dynamiclib -o libcgmic.$(SVERSION).dylib -install_name $(USR)/lib/libcgmic.$(VERSION1).dylib -compatibility_version $(VERSION1) -current_version $(SVERSION) $(MANDATORY_CFLAGS) libcgmic.o libgmic.o $(LIBS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ $(CXX) -dynamiclib -o libcgmic.$(SOVERSION).dylib -install_name $(USR)/lib/libcgmic.$(SOVERSION).dylib -compatibility_version $(SOVERSION) -current_version $(SVERSION) $(MANDATORY_CFLAGS) libcgmic.o libgmic.o $(LIBS)
</span> else
ifeq ($(OS),Windows)
$(CXX) -shared -Wl,-soname,libcgmic.so.$(VERSION1) -o libcgmic$(SO) libcgmic.o libgmic.o -Wl,--output-def,libcgmic.def,--out-implib,libcgmic.a $(LIBS)
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -110,53 +14,7 @@
</span> endif
endif
- $(CC) -std=c99 -o use_libcgmic use_libcgmic.c -L. -lcgmic
<span style='display:block; white-space:pre;background:#ffe0e0;'>-+ #$(CC) -std=c99 -o use_libcgmic use_libcgmic.c -L. -lcgmic
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++# $(CC) -std=c99 -o use_libcgmic use_libcgmic.c libcgmic.$(SOVERSION).dylib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> libcgmic.o: gmic.cpp gmic.h gmic_stdlib.h CImg.h
$(CXX) -o libcgmic.o -c gmic_libc.cpp $(PIC) $(CFLAGS)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -714,19 +714,19 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ -f ../gmic-qt/gmic_gimp_qt ]; then cp -f ../gmic-qt/gmic_gimp_qt $(DESTDIR)$(PLUGINDIR)/; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ -f ../gmic-qt/gmic_krita_qt ]; then cp -f ../gmic-qt/gmic_krita_qt $(DESTDIR)$(USR)/$(BIN)/; fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--ifneq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#ifneq ($(OS),Darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(USR)/share
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(USR)/$(LIB)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -f libgmic.so $(DESTDIR)$(USR)/$(LIB)/libgmic.so.$(VERSION)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -fs libgmic.so.$(VERSION) $(DESTDIR)$(USR)/$(LIB)/libgmic.so.$(VERSION1)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -fs libgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libgmic.so
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- @if [ -f libcgmic.so ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -f libgmic.$(SVERSION).dylib $(DESTDIR)$(USR)/$(LIB)/libgmic.$(SVERSION).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs libgmic.$(SVERSION).dylib $(DESTDIR)$(USR)/$(LIB)/libgmic.$(VERSION1).dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs libgmic.$(VERSION1).dylib $(DESTDIR)$(USR)/$(LIB)/libgmic.dylib
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ @if true; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f gmic_libc.h $(DESTDIR)$(USR)/$(INCLUDE)/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -f libcgmic.so $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.$(VERSION); \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -fs libcgmic.so.$(VERSION) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so.$(VERSION1) ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- ln -fs libcgmic.so.$(VERSION1) $(DESTDIR)$(USR)/$(LIB)/libcgmic.so; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -f libcgmic.$(SVERSION).dylib $(DESTDIR)$(USR)/$(LIB)/libcgmic.$(SVERSION).dylib; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs libcgmic.$(SVERSION).dylib $(DESTDIR)$(USR)/$(LIB)/libcgmic.$(VERSION1).dylib ; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ ln -fs libcgmic.$(VERSION1).dylib $(DESTDIR)$(USR)/$(LIB)/libcgmic.dylib; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#endif
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(USR)/share/man/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(USR)/share/man/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)$(USR)/share/man/fr/man1/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -735,13 +735,13 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f ../man/gmic.1.gz $(DESTDIR)$(USR)/share/man/fr/man1/gmic.1.gz; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- @if [ -f ../resources/gmic_bashcompletion.sh ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d /usr/share/bash-completion/completions ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if false; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)/usr/share/bash-completion/completions/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/usr/share/bash-completion/completions/gmic; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if [ -d /opt/local/etc/bash_completion.d/ ]; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if true; then \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- mkdir -p $(DESTDIR)/opt/local/etc/bash_completion.d/; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)/opt/local/etc/bash_completion.d/gmic; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ cp -f ../resources/gmic_bashcompletion.sh $(DESTDIR)%PREFIX%/etc/bash_completion.d/gmic; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi; \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- fi
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span></pre><pre style='margin:0'>
</pre>