[pkgsrc/trunk]: pkgsrc/pkgtools/rpm2pkg Update "rpm2pkg" package to version 3...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/1437a6011fdd
branches:  trunk
changeset: 579828:1437a6011fdd
user:      tron <tron%pkgsrc.org@localhost>
date:      Wed Sep 08 22:41:39 2010 +0000

description:
Update "rpm2pkg" package to version 3.1.5:
- Use "@pkgdir" instead of "@exec mkdir ..." to create empty directories.
- Don't add "@dirrm" lines for empty directories as they are now deleted
  automatically.

Based on a suggestion by Thomas Klausner in private e-mail.

diffstat:

 pkgtools/rpm2pkg/Makefile        |   4 ++--
 pkgtools/rpm2pkg/files/rpm2pkg.c |  11 +++--------
 2 files changed, 5 insertions(+), 10 deletions(-)

diffs (58 lines):

diff -r a34e8d02e073 -r 1437a6011fdd pkgtools/rpm2pkg/Makefile
--- a/pkgtools/rpm2pkg/Makefile Wed Sep 08 22:06:48 2010 +0000
+++ b/pkgtools/rpm2pkg/Makefile Wed Sep 08 22:41:39 2010 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.51 2010/09/07 17:32:05 tron Exp $
+# $NetBSD: Makefile,v 1.52 2010/09/08 22:41:39 tron Exp $
 
-DISTNAME=      rpm2pkg-3.1.4
+DISTNAME=      rpm2pkg-3.1.5
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r a34e8d02e073 -r 1437a6011fdd pkgtools/rpm2pkg/files/rpm2pkg.c
--- a/pkgtools/rpm2pkg/files/rpm2pkg.c  Wed Sep 08 22:06:48 2010 +0000
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.c  Wed Sep 08 22:41:39 2010 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: rpm2pkg.c,v 1.16 2010/09/07 17:32:05 tron Exp $        */
+/*     $NetBSD: rpm2pkg.c,v 1.17 2010/09/08 22:41:39 tron Exp $        */
 
 /*-
  * Copyright (c) 2001-2010 The NetBSD Foundation, Inc.
@@ -140,7 +140,6 @@
 struct PListEntryStruct {
        PListEntry      *pe_Childs[2];
        int             pe_DirEmpty;
-       mode_t          pe_DirMode;
        unsigned long   pe_INode;
        char            *pe_Link;
        char            pe_Name[1];
@@ -510,9 +509,7 @@
 
 {
        if (Node->pe_DirEmpty) {
-               (void)fprintf(Out, "@exec mkdir -m %o -p %%D/%s\n",
-                    Node->pe_DirMode, Node->pe_Name);
-               (void)fprintf(Out, "@dirrm %s\n", Node->pe_Name);
+               (void)fprintf(Out, "@pkgdir %s\n", Node->pe_Name);
        }
 }
 
@@ -665,8 +662,7 @@
        } else if (errno != ENOENT) {
                Result = false;
        } else if ((Result = (mkdir(Name, S_IRWXU|S_IRWXG|S_IRWXO) == 0))) {
-               InsertPListEntry(Dirs, Name)->pe_DirMode =
-                   S_IRWXU|S_IRWXG|S_IRWXO;
+               (void)InsertPListEntry(Dirs, Name);
        }
 
        *Basename = '/';
@@ -996,7 +992,6 @@
                                if (!OldDir) {
                                        Dir = InsertPListEntry(&Dirs, Name);
                                        Dir->pe_DirEmpty = true;
-                                       Dir->pe_DirMode = Mode;
                                }
                                break;
                        }