<pre style='margin:0'>
Herby Gillot (herbygillot) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/be5e5b703a269b4ca9a6700847677f48bea864ef">https://github.com/macports/macports-ports/commit/be5e5b703a269b4ca9a6700847677f48bea864ef</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 be5e5b703a2 astyle: update to 3.4.8
</span>be5e5b703a2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit be5e5b703a269b4ca9a6700847677f48bea864ef
</span>Author: Szabolcs Horvát <szhorvat@gmail.com>
AuthorDate: Sat Sep 23 16:28:52 2023 +0000
<span style='display:block; white-space:pre;color:#404040;'> astyle: update to 3.4.8
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> - update to 3.4.8
</span><span style='display:block; white-space:pre;color:#404040;'> - fix livecheck regex
</span><span style='display:block; white-space:pre;color:#404040;'> - change homepage to https
</span>---
devel/astyle/Portfile | 23 +++++-----
devel/astyle/files/dont-force-stdlib.diff | 11 +++++
devel/astyle/files/patch-CMakeLists.txt.diff | 63 ----------------------------
3 files changed, 22 insertions(+), 75 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/astyle/Portfile b/devel/astyle/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3710f2d37d5..43b00f05657 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/astyle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/astyle/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -5,8 +5,9 @@ PortGroup cmake 1.1
</span> PortGroup java 1.0
name astyle
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 3.1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 1
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 3.4.8
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set branch [join [lrange [split ${version} .] 0 1] .]
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> categories devel
license MIT
platforms darwin
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -17,16 +18,14 @@ long_description Artistic Style is a source code indenter, source code format
</span> and source code beautifier for the C, C++, C# and Java \
programming languages.
<span style='display:block; white-space:pre;background:#ffe0e0;'>-homepage http://astyle.sourceforge.net
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-master_sites sourceforge:project/astyle/astyle/astyle%20${version}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-distname ${name}_${version}_macos
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 5aed3c48b59aedf02e247652db6fad597ef9bd63 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 c4eebbe082eb2cb98f90aafcce3da2daeb774dd092e4cf8b728102fded8d1dcf \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 187918
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+homepage https://astyle.sourceforge.net
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+master_sites sourceforge:project/astyle/astyle/astyle%20${branch}
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+use_bzip2 yes
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 50c9bcba30d187d1b06b332dc8710d54fbbf027b \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 0f32cb097dc121099cca420a0762c62297d5a5dbc8b994fc755cb47ff4c6c666 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 229679
</span>
<span style='display:block; white-space:pre;background:#ffe0e0;'>-worksrcdir ${name}
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles dont-force-stdlib.diff
</span>
compiler.cxx_standard 2011
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -66,4 +65,4 @@ variant java description {Build and install the JNI library} {
</span> lappend builds java {-DBUILD_JAVA_LIBS=ON}
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-livecheck.regex "[quotemeta $name] (\\d+(\\.\\d+)*)"
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+livecheck.regex "[quotemeta $name]-(\\d+(\\.\\d+)*)"
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/astyle/files/dont-force-stdlib.diff b/devel/astyle/files/dont-force-stdlib.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 00000000000..6e878e73ab1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/devel/astyle/files/dont-force-stdlib.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;'>+Don't force -stdlib=libc++ on macOS. MacPorts will set the right lib to use.
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- build/cmake/CompilerOptions.cmake.orig 2023-09-23 15:55:24
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ build/cmake/CompilerOptions.cmake 2023-09-23 15:55:32
</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 default compile options for supported compilers
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if(APPLE)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- target_compile_options( astyle PRIVATE -W -Wall -fno-rtti -fno-exceptions -std=c++11 -stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ target_compile_options( astyle PRIVATE -W -Wall -fno-rtti -fno-exceptions -std=c++11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ elseif(NOT WIN32) # Linux
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ target_compile_options(astyle PRIVATE -Wall -Wextra -fno-rtti -fno-exceptions -std=c++11)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ if ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "gnu")
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/devel/astyle/files/patch-CMakeLists.txt.diff b/devel/astyle/files/patch-CMakeLists.txt.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 33e18f6086e..00000000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/devel/astyle/files/patch-CMakeLists.txt.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,63 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Use JAVA_HOME to find Java on macOS.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Install files into CMAKE_INSTALL_PREFIX not /usr.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Treat MacPorts build type as Release.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-Don't force -stdlib=libc++ on macOS. MacPorts will set the right lib to use.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- CMakeLists.txt.orig 2018-01-11 11:18:20.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ CMakeLists.txt 2018-11-12 17:13:35.000000000 -0600
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -38,7 +38,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # and the Java Development Kit 'include' directories added
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(BUILD_JAVA_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(BUILD_SHARED_LIBS ON)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(WIN32 OR APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(java_home $ENV{JAVA_HOME})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT java_home)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- message(FATAL_ERROR "Environment variable JAVA_HOME not defined")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIBS)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_library(astyle ${SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(NOT WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(TARGETS astyle DESTINATION /usr/lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install(TARGETS astyle DESTINATION lib)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endif()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- add_executable(astyle ${SRCS})
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -71,8 +71,8 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(TARGETS astyle DESTINATION ${prog_files}/AStyle)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- install(FILES ${DOCS} DESTINATION ${prog_files}/AStyle/doc/)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(TARGETS astyle DESTINATION /usr/bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- install(FILES ${DOCS} DESTINATION /usr/share/doc/astyle)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install(TARGETS astyle DESTINATION bin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ install(FILES ${DOCS} DESTINATION share/doc/astyle)
</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;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -83,6 +83,9 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(WIN32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(astyle PRIVATE $ENV{JAVA_HOME}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(astyle PRIVATE $ENV{JAVA_HOME}/include/win32)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ elseif(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(astyle PRIVATE $ENV{JAVA_HOME}/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ target_include_directories(astyle PRIVATE $ENV{JAVA_HOME}/include/darwin)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else()
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(astyle PRIVATE /usr/lib/jvm/default-java/include)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_include_directories(astyle PRIVATE /usr/lib/jvm/default-java/include/linux)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -123,7 +126,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- macro(set_linker_options strip_option)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Remove -rdynamic and add 'strip' to linker flags
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if(CMAKE_BUILD_TYPE STREQUAL "Release" OR CMAKE_BUILD_TYPE STREQUAL "MinSizeRel" OR CMAKE_BUILD_TYPE STREQUAL "MacPorts")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_SHARED_LIBRARY_LINK_CXX_FLAGS "")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${strip_option}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${strip_option}")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -146,7 +149,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Set default compile options for supported compilers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if(APPLE)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- astyle PRIVATE -W -Wall -fno-rtti -fno-exceptions -std=c++11 -stdlib=libc++)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ astyle PRIVATE -W -Wall -fno-rtti -fno-exceptions -std=c++11)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- set_linker_options("")
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- elseif(NOT WIN32) # Linux
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- target_compile_options(astyle PRIVATE -Wall -fno-rtti -fno-exceptions -std=c++11)
</span></pre><pre style='margin:0'>
</pre>