<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/6ef5eebdcffe338d15e5599b9e96d8afbbf09ef0">https://github.com/macports/macports-ports/commit/6ef5eebdcffe338d15e5599b9e96d8afbbf09ef0</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 6ef5eebdcffe338d15e5599b9e96d8afbbf09ef0
</span>Author: David B. Evans <devans@macports.org>
AuthorDate: Mon Dec 12 05:38:55 2016 -0800
<span style='display:block; white-space:pre;color:#404040;'> lensfun: fix build and re-enable python helper scripts
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Per suggestion from upstream developer.
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> https://github.com/macports/macports-ports/commit/e9444ad6474543fe70f78e041227d100938deacb#commitcomment-20147948
</span>---
graphics/lensfun/Portfile | 14 ++++++++------
graphics/lensfun/files/patch-apps-CMakeLists.txt.diff | 11 +++++++++++
2 files changed, 19 insertions(+), 6 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/Portfile b/graphics/lensfun/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index add2380..95429f5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/graphics/lensfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lensfun/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -9,7 +9,7 @@ cmake.out_of_source yes
</span> name lensfun
epoch 1
version 0.3.2
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> categories graphics
platforms darwin
maintainers devans openmaintainer
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -40,22 +40,24 @@ depends_lib path:lib/pkgconfig/glib-2.0.pc:glib2 \
</span> port:zlib
# installs python3 helper scripts lensfun-add-adapter lensfun-update-data
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# currently broken and disabled
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-# depends_run port:python35
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+depends_run port:python35
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-docs-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles patch-docs-CMakeLists.txt.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-apps-CMakeLists.txt.diff
</span>
post-patch {
reinplace "s|^#!.*|#!${prefix}/bin/python3.5|" \
${worksrcpath}/apps/lensfun-add-adapter \
${worksrcpath}/apps/lensfun-update-data
reinplace "s|@@PYTHON_VERSION@@|3.5|" \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- ${worksrcpath}/docs/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/docs/CMakeLists.txt \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ${worksrcpath}/apps/CMakeLists.txt
</span> }
configure.args-append \
-DBUILD_LENSTOOL=ON \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- -DINSTALL_HELPER_SCRIPTS=OFF
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DINSTALL_HELPER_SCRIPTS=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DSETUP_PY_INSTALL_PREFIX=${destroot}${frameworks_dir}/Python.framework/Versions/3.5
</span>
variant doc description {Build API and man documentation using doxygen, rst2man} {
depends_build-append \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/graphics/lensfun/files/patch-apps-CMakeLists.txt.diff b/graphics/lensfun/files/patch-apps-CMakeLists.txt.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..52de01b
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/graphics/lensfun/files/patch-apps-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,11 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- apps/CMakeLists.txt.orig 2016-12-11 11:56:14.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ apps/CMakeLists.txt 2016-12-11 11:57:49.000000000 -0800
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -21,7 +21,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Inspired by http://bloerg.net/2012/11/10/cmake-and-distutils.html
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-FIND_PROGRAM(PYTHON "python3")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FIND_PROGRAM(PYTHON "python@@PYTHON_VERSION@@")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF(PYTHON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(SETUP_PY_IN "${CMAKE_CURRENT_SOURCE_DIR}/setup.py.in")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(SETUP_PY "${CMAKE_CURRENT_BINARY_DIR}/setup.py")
</span></pre><pre style='margin:0'>
</pre>