[pkgsrc/trunk]: pkgsrc/pkgtools/plist-utils plist-utils: updated to 20180222

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/418cc2fedeff
branches:  trunk
changeset: 375846:418cc2fedeff
user:      adam <adam%pkgsrc.org@localhost>
date:      Fri Feb 23 06:31:34 2018 +0000

description:
plist-utils: updated to 20180222

20180222:
Also sort the first line (@comment $NetBSD$) as it should be on top.

diffstat:

 pkgtools/plist-utils/Makefile           |   4 ++--
 pkgtools/plist-utils/files/plist_tree.c |   6 +++---
 pkgtools/plist-utils/files/sort.c       |  10 ++--------
 3 files changed, 7 insertions(+), 13 deletions(-)

diffs (84 lines):

diff -r 5730c02d0966 -r 418cc2fedeff pkgtools/plist-utils/Makefile
--- a/pkgtools/plist-utils/Makefile     Fri Feb 23 06:25:23 2018 +0000
+++ b/pkgtools/plist-utils/Makefile     Fri Feb 23 06:31:34 2018 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2017/09/30 13:23:05 adam Exp $
+# $NetBSD: Makefile,v 1.4 2018/02/23 06:31:34 adam Exp $
 
-PKGNAME=       plist-utils-20170813
+PKGNAME=       plist-utils-20180222
 CATEGORIES=    pkgtools
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
diff -r 5730c02d0966 -r 418cc2fedeff pkgtools/plist-utils/files/plist_tree.c
--- a/pkgtools/plist-utils/files/plist_tree.c   Fri Feb 23 06:25:23 2018 +0000
+++ b/pkgtools/plist-utils/files/plist_tree.c   Fri Feb 23 06:31:34 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: plist_tree.c,v 1.3 2017/09/30 13:23:06 adam Exp $ */
+/* $NetBSD: plist_tree.c,v 1.4 2018/02/23 06:31:34 adam Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: plist_tree.c,v 1.3 2017/09/30 13:23:06 adam Exp $");
+__RCSID("$NetBSD: plist_tree.c,v 1.4 2018/02/23 06:31:34 adam Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -128,7 +128,7 @@
 char *
 get_key(const char *entry)
 {
-       char *copy, *s;
+       char *copy;
        size_t n = 0;
        regmatch_t rm[10];
        int ret;
diff -r 5730c02d0966 -r 418cc2fedeff pkgtools/plist-utils/files/sort.c
--- a/pkgtools/plist-utils/files/sort.c Fri Feb 23 06:25:23 2018 +0000
+++ b/pkgtools/plist-utils/files/sort.c Fri Feb 23 06:31:34 2018 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: sort.c,v 1.1 2016/10/01 18:37:15 kamil Exp $ */
+/* $NetBSD: sort.c,v 1.2 2018/02/23 06:31:34 adam Exp $ */
 
 /*-
  * Copyright (c) 2016 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: sort.c,v 1.1 2016/10/01 18:37:15 kamil Exp $");
+__RCSID("$NetBSD: sort.c,v 1.2 2018/02/23 06:31:34 adam Exp $");
 
 #include <err.h>
 #include <fcntl.h>
@@ -50,7 +50,6 @@
        int iflag = 0;
        char *buffer;
        FILE *stream;
-       char *firstline;
 
        setprogname(argv[0]);
 
@@ -84,10 +83,6 @@
        }
 
        /* Read entries and put into tree */
-       /* The first line is special */
-       if ((buffer = plist_getline(stream)) != NULL) {
-               firstline = buffer;
-       }
 
        while ((buffer = plist_getline(stream)) != NULL) {
                plist_tree_insert(buffer);
@@ -107,7 +102,6 @@
                stream = stdout;
        }
 
-       fprintf(stream, "%s\n", firstline);
        plist_tree_dump(stream);
 
        return EXIT_SUCCESS;