CVS commit: pkgsrc/textproc/uncrustify

["David A. Holland" <dholland%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   dholland
Date:           Mon Jan 16 01:15:44 UTC 2023

Modified Files:
        pkgsrc/textproc/uncrustify: Makefile distinfo
Added Files:
        pkgsrc/textproc/uncrustify/patches: patch-src_log__rules.cpp

Log Message:
textproc/uncrustify: don't use rindex(); it fails on Solaris.


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/textproc/uncrustify/Makefile
cvs rdiff -u -r1.10 -r1.11 pkgsrc/textproc/uncrustify/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/textproc/uncrustify/patches/patch-src_log__rules.cpp

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

Modified files:

Index: pkgsrc/textproc/uncrustify/Makefile
diff -u pkgsrc/textproc/uncrustify/Makefile:1.11 pkgsrc/textproc/uncrustify/Makefile:1.12
--- pkgsrc/textproc/uncrustify/Makefile:1.11    Tue Nov 24 13:16:43 2020
+++ pkgsrc/textproc/uncrustify/Makefile Mon Jan 16 01:15:44 2023
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2020/11/24 13:16:43 nia Exp $
+# $NetBSD: Makefile,v 1.12 2023/01/16 01:15:44 dholland Exp $
 
 DISTNAME=      uncrustify-0.72.0
+PKGREVISION=   1
 CATEGORIES=    textproc
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=uncrustify/}
 GITHUB_TAG=    ${DISTNAME}

Index: pkgsrc/textproc/uncrustify/distinfo
diff -u pkgsrc/textproc/uncrustify/distinfo:1.10 pkgsrc/textproc/uncrustify/distinfo:1.11
--- pkgsrc/textproc/uncrustify/distinfo:1.10    Tue Oct 26 11:23:37 2021
+++ pkgsrc/textproc/uncrustify/distinfo Mon Jan 16 01:15:44 2023
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2021/10/26 11:23:37 nia Exp $
+$NetBSD: distinfo,v 1.11 2023/01/16 01:15:44 dholland Exp $
 
 BLAKE2s (uncrustify-0.72.0.tar.gz) = e6017f3d413d273b4773832fadf26e7b756b1495fd1b1c8f8bf0f217cfa0058a
 SHA512 (uncrustify-0.72.0.tar.gz) = bfcbdf0d8198e1dd91f1c8283441a56669610a84d55a17cdd504571da09b26fef026fd3f753acd9950e498f574e6771a206c72b76ffdea97747b7a4fdb481862
 Size (uncrustify-0.72.0.tar.gz) = 1530850 bytes
-SHA1 (patch-CMakeLists.txt) = 4715199cfdfceb60828d9996f91bf6a45cb46cd4
+SHA1 (patch-src_log__rules.cpp) = f6d26fb3bed20829c187e1e04db9f2ee35968515

Added files:

Index: pkgsrc/textproc/uncrustify/patches/patch-src_log__rules.cpp
diff -u /dev/null pkgsrc/textproc/uncrustify/patches/patch-src_log__rules.cpp:1.1
--- /dev/null   Mon Jan 16 01:15:44 2023
+++ pkgsrc/textproc/uncrustify/patches/patch-src_log__rules.cpp Mon Jan 16 01:15:44 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_log__rules.cpp,v 1.1 2023/01/16 01:15:44 dholland Exp $
+
+Use standard functions.
+
+--- src/log_rules.cpp~ 2020-11-05 14:53:59.000000000 +0000
++++ src/log_rules.cpp
+@@ -48,7 +48,7 @@ void log_rule3(const char *func, const c
+       }
+    }
+ #else // not WIN32
+-   where = rindex(func, ':');
++   where = strrchr(func, ':');
+ #endif /* ifdef WIN32 */
+ 
+    if (where == nullptr)