head	1.1;
access;
symbols
	pkgsrc-2026Q1:1.1.0.8
	pkgsrc-2026Q1-base:1.1
	pkgsrc-2025Q4:1.1.0.6
	pkgsrc-2025Q4-base:1.1
	pkgsrc-2025Q3:1.1.0.4
	pkgsrc-2025Q3-base:1.1
	pkgsrc-2025Q2:1.1.0.2
	pkgsrc-2025Q2-base:1.1;
locks; strict;
comment	@# @;


1.1
date	2025.05.21.18.30.34;	author schmonz;	state Exp;
branches;
next	;
commitid	zwdr8G3lmrQCUNVF;


desc
@@


1.1
log
@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
@
text
@$NetBSD$

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()
 
 
@