<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be43b26dbb4ce7f886a341badc89924a6865b42f">https://github.com/macports/macports-ports/commit/be43b26dbb4ce7f886a341badc89924a6865b42f</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 be43b26dbb4 irstlm: Update to 6.00.05
</span>be43b26dbb4 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be43b26dbb4ce7f886a341badc89924a6865b42f
</span>Author: Ryan Schmidt <ryandesign@macports.org>
AuthorDate: Mon Feb 6 00:55:41 2023 -0600
<span style='display:block; white-space:pre;color:#404040;'> irstlm: Update to 6.00.05
</span>---
textproc/irstlm/Portfile | 33 ++++++++++++-------------
textproc/irstlm/files/compiler.patch | 9 +++++++
textproc/irstlm/files/docs.patch | 14 +++++++++++
textproc/irstlm/files/lib64.patch | 8 +++++++
textproc/irstlm/files/output-path.patch | 21 ++++++++++++++++
textproc/irstlm/files/patch-CMakeLists.diff | 37 -----------------------------
textproc/irstlm/files/permissions.patch | 8 +++++++
textproc/irstlm/files/version.patch | 13 ++++++++++
8 files changed, 90 insertions(+), 53 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/Portfile b/textproc/irstlm/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 1804f073498..f2b37055c04 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/irstlm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -2,37 +2,38 @@
</span>
PortSystem 1.0
PortGroup cmake 1.1
<span style='display:block; white-space:pre;background:#e0ffe0;'>+PortGroup github 1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.setup irstlm-team irstlm 6.00.05 v
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 a312e0032a09a4f3a62df5db60ca7753beef1f67 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0d0ca97a58351710f3bca8a43bdcca880dbc766a1f73389b359b4df6357df9ec \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 229185
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-name irstlm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.80.08
</span> categories textproc math
maintainers nomaintainer
<span style='display:block; white-space:pre;background:#e0ffe0;'>+license LGPL-2.1+
</span>
description The IRST Language Modeling Toolkit
<span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> long_description {*}${description} features algorithms and data structures \
suitable to estimate, store, and access very large LMs. Our \
software has been integrated into a popular open source \
Statistical Machine Translation decoder called Moses, and is \
compatible with language models created with other tools, \
such as the SRILM Tooolkit.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-license LGPL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage https://sourceforge.net/projects/irstlm
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites ${homepage}/files/irstlm/irstlm-5.80
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 72c136d495dd56fa77ba20ac3e4b53b1dd0815b5 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 4d1eee217ee70f8abb08d2509c438d034772922b2fc7f90b6084629d7f8d0d7e \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 11590533
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-extract.suffix .tgz
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-cmake.source_dir ${worksrcpath}/trunk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+github.tarball_from archive
</span>
depends_lib port:zlib
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles compiler.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ docs.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ lib64.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ output-path.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ permissions.patch \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ version.patch
</span>
post-patch {
<span style='display:block; white-space:pre;background:#ffe0e0;'>- reinplace "s,@OUTPUT_PREFIX@,${destroot}${prefix},g" ${worksrcpath}/trunk/src/CMakeLists.txt
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ reinplace "s|@DESTROOT@|${destroot}|g" ${worksrcpath}/src/CMakeLists.txt
</span> }
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.type regex
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.url http://sourceforge.net/projects/irstlm/
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex ${name}-(\[0-9.\]+)\\.
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/files/compiler.patch b/textproc/irstlm/files/compiler.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c2c64d0568f
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/files/compiler.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,9 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't override the user's compiler choice.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/irstlm-team/irstlm/pull/26
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2015-12-09 17:31:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-02-05 17:54:25.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -9,4 +9,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(CMAKE_C_COMPILER "gcc" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(CMAKE_CXX_COMPILER "g++" )
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/files/docs.patch b/textproc/irstlm/files/docs.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..9212f7fc8ce
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/files/docs.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,14 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Add an option to turn off building documentation.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/irstlm-team/irstlm/pull/31
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2015-12-09 17:31:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-02-06 01:08:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -14,2 +14,3 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ OPTION(ASSERT "Enable/Disable MY_ASSERT_FLAG" ON)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++OPTION(BUILD_DOCS "Build documentation" OFF)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -45,3 +46,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_SUBDIRECTORY (scripts)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++IF(BUILD_DOCS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_SUBDIRECTORY (doc)
</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;color:#808080;'>diff --git a/textproc/irstlm/files/lib64.patch b/textproc/irstlm/files/lib64.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..a64abc7bba8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/files/lib64.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Don't try to create a lib64 symlink.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/irstlm-team/irstlm/issues/27
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2015-12-09 17:31:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2023-02-05 21:21:32.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -82,3 +82,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-add_custom_target(LinkToLib64 ALL DEPENDS LNS)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/files/output-path.patch b/textproc/irstlm/files/output-path.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..b49bab15572
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/files/output-path.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,21 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This build system writes the static library and executables directly
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+into the install prefix at compile time. Patch it to write to the
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+destdir instead.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+This is a workaround for a badly-designed build system. The real fix
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+would be to remove these lines to let cmake put the compiled files into
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+the build directory as usual and then install them later but I'm leaving
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+it to the developers to retool the build system to do that.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/irstlm-team/irstlm/issues/28
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/CMakeLists.txt.orig 2015-12-09 17:31:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/CMakeLists.txt 2023-02-05 17:42:28.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # Set output directory
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(LIBRARY_OUTPUT_PATH ${CMAKE_INSTALL_PREFIX}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(EXECUTABLE_OUTPUT_PATH @DESTROOT@${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(LIBRARY_OUTPUT_PATH @DESTROOT@${CMAKE_INSTALL_PREFIX}/lib)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS("-D_LARGE_FILES")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/files/patch-CMakeLists.diff b/textproc/irstlm/files/patch-CMakeLists.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 1c10d996f04..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/textproc/irstlm/files/patch-CMakeLists.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,37 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- trunk/CMakeLists.txt.orig 2015-02-24 20:21:03.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ trunk/CMakeLists.txt 2023-01-05 01:27:14.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -31,13 +31,16 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OPTION( USE_64_BIT "Set to on if you want to compile Win64" OFF )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ENDIF(WIN32)
</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;'>- # include specific modules
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+OPTION(BUILD_DOCS "Build documentation" OFF)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_SUBDIRECTORY (src)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_SUBDIRECTORY (scripts)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+IF (BUILD_DOCS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_SUBDIRECTORY (doc)
</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;'>- IF (WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- MESSAGE( STATUS "-------------------------------------------------------------------------------" )
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -49,4 +52,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- SET( USE_64_BIT "${USE_64_BIT}" CACHE BOOL
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- "Set to ON to build Win64" FORCE )
</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;'>---- trunk/src/CMakeLists.txt.orig 2015-01-10 23:36:16.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ trunk/src/CMakeLists.txt 2023-01-05 01:41:40.000000000 +0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set output directory
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(EXECUTABLE_OUTPUT_PATH ${CMAKE_INSTALL_PREFIX}/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--SET(LIBRARY_OUTPUT_PATH ${CMAKE_INSTALL_PREFIX}/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(EXECUTABLE_OUTPUT_PATH @OUTPUT_PREFIX@/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+SET(LIBRARY_OUTPUT_PATH @OUTPUT_PREFIX@/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS("-D_LARGE_FILES")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ADD_DEFINITIONS("-D_FILE_OFFSET_BITS=64")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/files/permissions.patch b/textproc/irstlm/files/permissions.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..53d7b6b7051
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/files/permissions.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,8 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Do not restrict permissions of scripts.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/irstlm-team/irstlm/pull/30
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- scripts/CMakeLists.txt.orig 2015-12-09 17:31:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ scripts/CMakeLists.txt 2023-02-06 00:21:16.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -3,3 +3,2 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ DESTINATION bin
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ )
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/textproc/irstlm/files/version.patch b/textproc/irstlm/files/version.patch
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..c74fd8bfbf0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/textproc/irstlm/files/version.patch
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,13 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+Fix version number.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+https://github.com/irstlm-team/irstlm/issues/25
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- CMakeLists.txt.orig 2015-12-09 17:31:15.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ CMakeLists.txt 2023-02-05 21:09:06.000000000 -0600
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -5,5 +5,5 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(IRSTLM_VERSION_MAJOR "5")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(IRSTLM_VERSION_MINOR "80")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-SET(IRSTLM_VERSION_PATCH "08")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(IRSTLM_VERSION_MAJOR "6")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(IRSTLM_VERSION_MINOR "00")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++SET(IRSTLM_VERSION_PATCH "05")
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span></pre><pre style='margin:0'>
</pre>