CVS commit: pkgsrc/devel/astyle

["Amitai Schleier" <schmonz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   schmonz
Date:           Wed May 21 18:30:35 UTC 2025

Modified Files:
        pkgsrc/devel/astyle: Makefile PLIST distinfo
Added Files:
        pkgsrc/devel/astyle/patches: patch-CMakeLists.txt
Removed Files:
        pkgsrc/devel/astyle/patches: patch-build_mac_Makefile
            patch-src_astyle__main.cpp

Log Message:
astyle: update to 3.6.9, and take MAINTAINER. Changes:

3.6.9

* Fix --mode parameter in generation script
* disable old isInTemplate flag only within structs

3.6.8

* Adjust --break-blocks to break structs and functions only with _all_ option
* Fix space between pointer references with --align-pointer=type
* Define <<< and >>> operators for Java only
* Fix indentation of class modifiers within structs
* Fix parsing of nested structs
* Another approach to fix interpretation of closing nested templates as operator
* Fix indent of multiline strings with macros

3.6.7

* Add --error-on-changes option
* Add c++17 flags in VS2022 project files; avoid VS2022 compilation warnings
* Prevent --squeeze-ws of removing whitespace before comments
* Adjust --pad-include to ignore macros in include directives
* Adjust --pad-include section in the docs
* Fix interpretation of closing nested templates as operator
* Use standard filesystem API to retrieve absolute file paths
* Add operator --preserve-ws
* Disable --unpad-paren in structs for leading whitespace
* Do not remove space after opening parens and align-pointer=type
* Fix issue with --pad-oper and *= operand

3.6.6

* Fix indent after assignment operators (correct cause)
* Adjust delete-empty-lines feature description
* Support non-English versions of VS2022 in CMakeLists

3.6.5

* Add option --accept-empty-list
* Fix indent regression due to method extraction
* Fix indent in blocks after assignment operators
* Fix indent of multi line strings after preprocessor or comment sections
* Fix indent after assignment operators
* Fix --align-pointer=middle with existing whitespace

3.6.4

* Fix indent of brace initializers within constructor init list
* Improve indent of continued string literals
* Fix space after opening paren for GSC
* Update astyle.html layout
* Add deprecation hint for --html
* Update install docs
* Delete old IDE project files
* Move build/cmake scripts content into main CMakeLists.txt

3.6.3

* Fix indent after single open parenthse
* Fix padding of operator char * methods
* Fix padding of user defined type cast
* Fix bitfield line break with macros
* Fix GSC modulo padding
* Removed flawed option --add-braces=nested

3.6.2

* Reverted alignment of user defined types using --align-pointer

3.6.1

* Fix setting of --pad-negation and --pad-include options
* Fix --pad-include with UTF-8 BOM
* Improve multiplication recognition with --align-pointer=type
* Improve --align-pointer=type after parens and brackets
* Removed VMS compilation options
* Updated JNI interface to use Arduino IDE conventions

3.6

* Add option --pad-include
* Combined GHC and GSC style options
* Improve combination of --align-pointer=type and --pad-oper
* Improve multiplication recognition with --align-pointer=type
* Update compiler options in build files
* Fix indent of assignments within macros

3.5.2

* Fix library compilation errors

3.5.1

* Fix crash concerning macro continuation
* Fix EOL handling for Windows builds
* Fix GSC comment recognition
* Fix MSVC compiler warnings

3.5

* Add option --pad-negation
* Apply align-pointer=type only if type is present
* Avoid deletion of empty lines after continuation
* Fix alignment of logical AND operators
* Fix recognition of Java/C# multi line strings

3.4.16

* Fix padding of scientific notation literals
* Fix of reference args alignment

3.4.15

* Fix parsing of floating point literals
* Fix "--break-block" handling of class and function blocks
* Fix "--align-pointer=type" option for all types in lambda parameter lists
* Fix padding of lambda capture with align-pointer option
* Exclude files ending with backup suffix from input file names list

3.4.14

* Fix split references with "-k1" option
* Fix "--align-pointer=type" option for fundamental types in lambda parameter lists
* Fix "--indent-after-parens" indent count

3.4.13

* Fix comment indent after string macro with R suffix
* Do not break single line block after enum in mozilla mode
* Adjust cmake policy for new versions only
* Update man page path
* Add support for scikit-build-core

3.4.12

* Add "--pad-brackets-in" and "--pad-brackets-out" options
* Fix indentation of initializer lists
* Fix crash with "--add-braces=nested" applied to if-else blocks

3.4.11

* Add new option "--add-braces=nested" to add braces in nested single line statements
* Fix indent after double template brackets
* Fix indent after dot
* Option "--squeeze-lines=1" is no longer default with Linux builds
* Add experimental GHC mode
* Fix indent after raw string

3.4.10

* Fix missing indent in function parameter list

3.4.9

* Apply one wording for Objective-C in the docs
* Fix more CS regressions
* Fix inserting space with combined "--pad-oper" and "--align-pointer" options

3.4.8

* Fix lambda broken brace after auto keyword
* Fix line break after comment in asm block
* Fix padding of multiply operator
* Fix indentation of method calls
* Fix empty line after closing while block
* Add outer padding for empty parens pairs
* Fix more CS regressions

3.4.6

* Add VS2022 project files
* Fix CS regressions
* Add CS coalesce assignment operator

3.4.1

* Fix padding of & following a comma
* Fix indent of function declarations following access modifiers
* Fix indent of C# allocation blocks
* Fix indentation of comments after CS interpolation quotes

3.4

* Fix formatting of CS interpolation literals
* Fix false lambda recognition
* Fix indentation of member declarations
* Fix indentation of struct assignments
* Add new option "--indent-lambda" to enable new lambda recognition
* Add link to astyle Python distribution projects

3.3

* Add new option "--squeeze-ws" to remove superfluous whitespace (experimental)
* Add new option "--squeeze-lines" to remove superfluous empty lines (experimental)
* Add new options "--pad-brackets" and "--unpad-brackets" to add or
  remove whitespace around square brackets (experimental)
* Fix indent of lambda bodies in fct calls
* Fix indent of struct names including "struct"
* Fix indent of C++11 initializer lists
* Fix padding of pointers separated by comma
* Refactor namespace std usage

3.2.1

* Fix struct recognition related to SF #534

3.2

* Add new option "style=webkit" for the WebKit brace style.
* Improve recognition of pointer variable types.
* Change CMake files to the "modern" format.
* Fix formatting of raw string literals with the opening '(' at the end of line
* Fix indentation of comments in a preprocessor define indented with tabs
* Fix vector limit segfault with g++-8, recursive, and -D_GLIBCXX_ASSERTIONS
* Refactoring:
  * Extract new method for options in ASOptions class to avoid compiler limits.
  * Change vector push_back to emplace_back except for vector<bool>.
  * Changes from clang-tidy to modernize code.
* added man page
* removed deprecated options
* added shell completion scripts
* added "--mode=js" option
* added INVALID_TYPE constant
* removed upper limit of "max-continuation-indent"
* fixed raw string parsing
* fixed recognition of rvalue operator as reference
* fixed reverting effect of AttachReturnType option
* fixed padding of dereference operator
* added C++ spaceship operator
* fixed case indent after enum return value
* fixed space deletion when aligning ref value name
* fixed reverting effect of maxCodeLength and AttachReturnType options
* fixed break of continued preprocessor strings with colon
* fixed struct bitfield indentation
* replace PATH_MAX by realpath
* fixed negative integer literal breaks initializer list
* fixed documentation of --delete-empty-lines short option
* fixed project file search
* fixed indent of ObjectiveC statements
* fixed parsing of C# interpolation strings
* fixed break-blocks format after struct
* fixed project file search with wildcard input paths
* better description for stat errors
* applied IT localization patch
* improved DE localization


To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 pkgsrc/devel/astyle/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/devel/astyle/PLIST
cvs rdiff -u -r1.20 -r1.21 pkgsrc/devel/astyle/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/astyle/patches/patch-CMakeLists.txt
cvs rdiff -u -r1.1 -r0 pkgsrc/devel/astyle/patches/patch-build_mac_Makefile
cvs rdiff -u -r1.4 -r0 pkgsrc/devel/astyle/patches/patch-src_astyle__main.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/devel/astyle/Makefile
diff -u pkgsrc/devel/astyle/Makefile:1.23 pkgsrc/devel/astyle/Makefile:1.24
--- pkgsrc/devel/astyle/Makefile:1.23   Sun Jan 26 05:26:22 2020
+++ pkgsrc/devel/astyle/Makefile        Wed May 21 18:30:34 2025
@@ -1,30 +1,37 @@
-# $NetBSD: Makefile,v 1.23 2020/01/26 05:26:22 rillig Exp $
+# $NetBSD: Makefile,v 1.24 2025/05/21 18:30:34 schmonz Exp $
 
-DISTNAME=      astyle_3.1_linux
-PKGNAME=       ${DISTNAME:S/_linux//:S/_/-/}
-CATEGORIES=    textproc devel
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=astyle/}
-
-MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      http://astyle.sourceforge.net/
-COMMENT=       Free, Fast and Small Automatic Formatter for C, C++, C++/CLI, C\#, and Java
-LICENSE=       gnu-lgpl-v3
-
-WRKSRC=                ${WRKDIR}/astyle
-USE_TOOLS+=    gmake
-USE_LANGUAGES= c++
-AUTO_MKDIRS=   yes
-
-.include "../../mk/bsd.prefs.mk"
-.if ${OPSYS} == "Darwin"
-BUILD_DIRS=    build/mac
-.else
-BUILD_DIRS=    build/gcc
-.endif
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/${BUILD_DIRS}/bin/astyle ${DESTDIR}${PREFIX}/bin
-       cd ${WRKSRC}/doc && ${INSTALL_DATA} * ${DESTDIR}${PREFIX}/share/doc/astyle
+DISTNAME=              astyle-3.6.9
+CATEGORIES=            devel textproc
+MASTER_SITES=          http://www.andre-simon.de/zip/
+EXTRACT_SUFX=          .tar.bz2
+
+MAINTAINER=            schmonz%NetBSD.org@localhost
+HOMEPAGE=              http://astyle.sourceforge.net/
+COMMENT=               Automatic formatter for C, C++, C++/CLI, C\#, and Java
+LICENSE=               gnu-lgpl-v3
+
+USE_TOOLS+=            gmake
+USE_LANGUAGES=         c++
+AUTO_MKDIRS=           yes
+
+CMAKE_CONFIGURE_ARGS+= -DBUILD_JAVA_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_SHARED_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DBUILD_STATIC_LIBS=OFF
+CMAKE_CONFIGURE_ARGS+= -DINSTALL_DOC=ON
+
+SUBST_CLASSES+=                paths
+SUBST_STAGE.paths=     pre-configure
+SUBST_FILES.paths=     CMakeLists.txt
+SUBST_VARS.paths=      PKGMANDIR
+
+post-install:
+       ${INSTALL_DATA} ${WRKSRC}/sh-completion/astyle.bash \
+               ${DESTDIR}${PREFIX}/share/bash-completion/completions/astyle
+       ${INSTALL_DATA} ${WRKSRC}/sh-completion/astyle.fish \
+               ${DESTDIR}${PREFIX}/share/fish/vendor_completions.d/
+       ${INSTALL_DATA} ${WRKSRC}/sh-completion/astyle.zsh \
+               ${DESTDIR}${PREFIX}/share/zsh/site-functions/_astyle
 
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/cmake/build.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/astyle/PLIST
diff -u pkgsrc/devel/astyle/PLIST:1.6 pkgsrc/devel/astyle/PLIST:1.7
--- pkgsrc/devel/astyle/PLIST:1.6       Sun Feb 18 04:34:20 2018
+++ pkgsrc/devel/astyle/PLIST   Wed May 21 18:30:34 2025
@@ -1,7 +1,11 @@
-@comment $NetBSD: PLIST,v 1.6 2018/02/18 04:34:20 rillig Exp $
+@comment $NetBSD: PLIST,v 1.7 2025/05/21 18:30:34 schmonz Exp $
 bin/astyle
-share/doc/astyle/astyle.html
-share/doc/astyle/install.html
-share/doc/astyle/news.html
-share/doc/astyle/notes.html
-share/doc/astyle/styles.css
+man/man1/astyle.1
+share/bash-completion/completions/astyle
+share/doc/astyle/html/astyle.html
+share/doc/astyle/html/install.html
+share/doc/astyle/html/news.html
+share/doc/astyle/html/notes.html
+share/doc/astyle/html/styles.css
+share/fish/vendor_completions.d/astyle.fish
+share/zsh/site-functions/_astyle

Index: pkgsrc/devel/astyle/distinfo
diff -u pkgsrc/devel/astyle/distinfo:1.20 pkgsrc/devel/astyle/distinfo:1.21
--- pkgsrc/devel/astyle/distinfo:1.20   Tue Oct 26 10:14:17 2021
+++ pkgsrc/devel/astyle/distinfo        Wed May 21 18:30:34 2025
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.20 2021/10/26 10:14:17 nia Exp $
+$NetBSD: distinfo,v 1.21 2025/05/21 18:30:34 schmonz Exp $
 
-BLAKE2s (astyle_3.1_linux.tar.gz) = 5f8039593fcb142767416fb5a13ebcdd82452cf2869afd9b262218f486507d66
-SHA512 (astyle_3.1_linux.tar.gz) = 2e8f13d291abda66bbba30174c364c81a81a490e0a21376f7da7cf471644c22caa37b9eefb100d093bf26d1a8bfa9d2f14b4c2a9b75b3cb84428b4514e277ff2
-Size (astyle_3.1_linux.tar.gz) = 185589 bytes
-SHA1 (patch-build_mac_Makefile) = ac8b4f69ec2b2f2cb3c87db140c2783b24009e2c
-SHA1 (patch-src_astyle__main.cpp) = 443deb0b27e88f0c3002929aa8a6c5ae23c4ad79
+BLAKE2s (astyle-3.6.9.tar.bz2) = 407302720a5945f957fbe1ec344535f84b0e01189c32b6345cb196a56390d3a1
+SHA512 (astyle-3.6.9.tar.bz2) = 241e64e38089bdb1418cc46e2c7a92c0bd4a42fe2b66480274b2f3e29757e86f53a92ec6e40f88a44bf8f1794c8bee9db84ebd60dfe198d58a14bd5530cf2316
+Size (astyle-3.6.9.tar.bz2) = 217232 bytes
+SHA1 (patch-CMakeLists.txt) = 97aedb491f245b9023b8ea0dac188dbd8de0fa54

Added files:

Index: pkgsrc/devel/astyle/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/devel/astyle/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Wed May 21 18:30:35 2025
+++ pkgsrc/devel/astyle/patches/patch-CMakeLists.txt    Wed May 21 18:30:34 2025
@@ -0,0 +1,49 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2025/05/21 18:30:34 schmonz Exp $
+
+Honor PKGMANDIR.
+
+--- CMakeLists.txt.orig        2025-05-21 18:11:36.359193517 +0000
++++ CMakeLists.txt
+@@ -134,37 +134,11 @@ if(BUILD_SHARED_LIBS OR BUILD_STATIC_LIB
+         install(TARGETS astyle DESTINATION lib)
+     endif()
+ else()
+-    if(SKBUILD)
+-        install(TARGETS astyle DESTINATION "${SKBUILD_SCRIPTS_DIR}")
+-        if(INSTALL_DOC)
+-            install(FILES ${DOCS} DESTINATION "${SKBUILD_DATA_DIR}/share/doc/astyle/html")
+-            install(FILES ${MAN} DESTINATION "${SKBUILD_DATA_DIR}/share/man/man1")
+-        endif()
+-    elseif(WIN32)
+-        set(pf86 "PROGRAMFILES(x86)")
+-        set(prog_files $ENV{${pf86}})
+-        if(NOT ${prog_files})
+-            set(prog_files $ENV{PROGRAMFILES})
+-        endif()
+-        install(TARGETS astyle DESTINATION "${prog_files}/AStyle")
+-        install(FILES ${DOCS} DESTINATION "${prog_files}/AStyle/doc")
+-    elseif(APPLE)
+-        # install to the default /usr/local/bin because of SIP restrictions
+-        install(TARGETS astyle DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+-        if(INSTALL_DOC)
+-            install(FILES ${DOCS} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/astyle/html")
+-        endif()
+-    else()
+-        # change default to /usr/bin, the same as package installs
+-        if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT)
+-            set(CMAKE_INSTALL_PREFIX "/usr")
+-              endif()
+-        install(TARGETS astyle DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
+-        if(INSTALL_DOC)
+-            install(FILES ${DOCS} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/astyle/html")
+-            install(FILES ${MAN} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1")
+-        endif()
+-      endif()
++    install(TARGETS astyle DESTINATION "${CMAKE_INSTALL_PREFIX}/bin")
++    if(INSTALL_DOC)
++        install(FILES ${DOCS} DESTINATION "${CMAKE_INSTALL_PREFIX}/share/doc/astyle/html")
++        install(FILES ${MAN} DESTINATION "${CMAKE_INSTALL_PREFIX}/@PKGMANDIR@/man1")
++    endif()
+ endif()
+ 
+