<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/3682296edb0ab87bdb453a9af16b2979cd8789c3">https://github.com/macports/macports-ports/commit/3682296edb0ab87bdb453a9af16b2979cd8789c3</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit 3682296edb0ab87bdb453a9af16b2979cd8789c3
</span>Author: Andrew Udvare <audvare@gmail.com>
AuthorDate: Sat Jan 30 00:53:53 2021 -0500
<span style='display:block; white-space:pre;color:#404040;'> clucene: install contribs-lib
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Also do not install bundled Boost headers
</span><span style='display:block; white-space:pre;color:#404040;'> Many thanks to Gentoo for the patches
</span>---
devel/clucene/Portfile | 14 ++++++--
.../clucene/files/patch-clucene-contribs-lib.diff | 42 ++++++++++++++++++++++
2 files changed, 54 insertions(+), 2 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/clucene/Portfile b/devel/clucene/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 61bb2cce7b4..60cbc01621d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/clucene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/clucene/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -7,7 +7,7 @@ PortGroup muniversal 1.0
</span>
name clucene
version 2.3.3.4
<span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 2
</span> set branch [join [lrange [split ${version} .] 0 1] .]
categories devel
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -33,7 +33,17 @@ patch.pre_args -p1
</span> patchfiles 0001-Fix-.pc-file-by-adding-clucene-shared-library.patch
patchfiles-append patch-src-shared-CLucene-LuceneThreads.h.diff \
<span style='display:block; white-space:pre;background:#ffe0e0;'>- patch-src-shared-CLucene-config-repl_tchar.h.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-src-shared-CLucene-config-repl_tchar.h.diff \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ patch-${name}-contribs-lib.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # patch out installing bundled Boost headers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "/ADD_SUBDIRECTORY (src\\/ext)/d" CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ system "rm -rf src/ext"
</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 -DBUILD_CONTRIBS_LIB=ON \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ -DLIB_DESTINATION=${destroot}/lib
</span>
conflicts_build ${name}
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/clucene/files/patch-clucene-contribs-lib.diff b/devel/clucene/files/patch-clucene-contribs-lib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..8fbb3c7164a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/clucene/files/patch-clucene-contribs-lib.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,42 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+diff -NaurpBb clucene-core-2.3.3.4/CMakeLists.txt clucene-core-2.3.3.4-mod/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clucene-core-2.3.3.4/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clucene-core-2.3.3.4-mod/CMakeLists.txt 2011-08-16 16:56:55.968268152 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -163,7 +163,7 @@ IF ( BUILD_CONTRIBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET(BUILD_CONTRIBS_LIB 1)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF ( BUILD_CONTRIBS )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ IF ( BUILD_CONTRIBS_LIB )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- ADD_SUBDIRECTORY (src/contribs-lib EXCLUDE_FROM_ALL)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ADD_SUBDIRECTORY (src/contribs-lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ENDIF ( BUILD_CONTRIBS_LIB )
</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;'>+diff -NaurpBb clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- clucene-core-2.3.3.4/src/contribs-lib/CMakeLists.txt 2011-03-17 03:21:07.000000000 +0300
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ clucene-core-2.3.3.4-mod/src/contribs-lib/CMakeLists.txt 2011-08-16 17:14:13.499275499 +0400
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -106,9 +106,26 @@ add_library(clucene-contribs-lib SHARED
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ TARGET_LINK_LIBRARIES(clucene-contribs-lib ${clucene_contrib_extra_libs})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#install public headers.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++FOREACH(file ${HEADERS})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_filename_component(apath ${file} PATH)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ get_filename_component(aname ${file} NAME)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ file(RELATIVE_PATH relpath ${CMAKE_SOURCE_DIR}/src/contribs-lib ${apath})
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ IF ( NOT aname MATCHES "^_.*" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ install(FILES ${file}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION include/${relpath}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPONENT development)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ ENDIF ( NOT aname MATCHES "^_.*" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ENDFOREACH(file)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #set properties on the libraries
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SET_TARGET_PROPERTIES(clucene-contribs-lib PROPERTIES
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ VERSION ${CLUCENE_VERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ SOVERSION ${CLUCENE_SOVERSION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ COMPILE_DEFINITIONS_DEBUG _DEBUG
</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;'>++#and install library
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++install(TARGETS clucene-contribs-lib
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ DESTINATION ${LIB_DESTINATION}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ COMPONENT runtime )
</span></pre><pre style='margin:0'>
</pre>