CVS commit: pkgsrc/pkgtools/plist-utils

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb  7 17:05:24 UTC 2024

Modified Files:
        pkgsrc/pkgtools/plist-utils: Makefile
        pkgsrc/pkgtools/plist-utils/files: plist_tree.c

Log Message:
plist-utils: fix regex so that plist-sort starts up and sorts

Bump version


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/pkgtools/plist-utils/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/pkgtools/plist-utils/files/plist_tree.c

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

Modified files:

Index: pkgsrc/pkgtools/plist-utils/Makefile
diff -u pkgsrc/pkgtools/plist-utils/Makefile:1.4 pkgsrc/pkgtools/plist-utils/Makefile:1.5
--- pkgsrc/pkgtools/plist-utils/Makefile:1.4    Fri Feb 23 06:31:34 2018
+++ pkgsrc/pkgtools/plist-utils/Makefile        Wed Feb  7 17:05:24 2024
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2018/02/23 06:31:34 adam Exp $
+# $NetBSD: Makefile,v 1.5 2024/02/07 17:05:24 wiz Exp $
 
-PKGNAME=       plist-utils-20180222
+PKGNAME=       plist-utils-20240207
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost

Index: pkgsrc/pkgtools/plist-utils/files/plist_tree.c
diff -u pkgsrc/pkgtools/plist-utils/files/plist_tree.c:1.5 pkgsrc/pkgtools/plist-utils/files/plist_tree.c:1.6
--- pkgsrc/pkgtools/plist-utils/files/plist_tree.c:1.5  Tue May 11 09:24:17 2021
+++ pkgsrc/pkgtools/plist-utils/files/plist_tree.c      Wed Feb  7 17:05:24 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: plist_tree.c,v 1.5 2021/05/11 09:24:17 wiz Exp $ */
+/* $NetBSD: plist_tree.c,v 1.6 2024/02/07 17:05:24 wiz Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -110,7 +110,7 @@ plist_tree_init(void)
        rb_tree_init(&plist_tree_singleton.plist_vars_tree, &plist_tree_ops);
 
 #define MAX_ERROR_MSG 0x1000
-#define REGEX_STRING_PLIST "\\${PLIST.[^}]*}"
+#define REGEX_STRING_PLIST "\\$\\{PLIST.[^}]*\\}"
 
        if ((ret = regcomp(&plist_tree_singleton.plist_regex_options,
                           REGEX_STRING_PLIST, REG_EXTENDED)) != 0) {